my @outputstack = (undef);
my $PARAMS = {
- 'XMLURL' => 'http://localhost/RPC2',
- 'USERNAME' => '',
- 'PASSWORD' => '',
'_QUEUE' => {},
};
my @text = @_;
my $output = $outputstack[0];
- $text[0] = '%%mxmlrtorrent: %%n' . $text[0];
+ my $format = '%%mxmlrtorrent: %%n' . shift(@text);
+
+ # escape % in parameters from irssi
+ s/%/%%/g foreach @text;
if (defined($output) and ref($output)) {
- $output->print(sprintf(shift(@text), @text), MSGLEVEL_CLIENTCRAP);
+ $output->print(sprintf($format, @text), MSGLEVEL_CLIENTCRAP);
} else {
- Irssi::print(sprintf(shift(@text), @text));
+ Irssi::print(sprintf($format, @text));
}
}
}
}
-# This is shamelessly stolen from pythons urlgrabber
-sub format_number {
- my $number = shift;
- my $SI = shift || 0;
- my @symbols = ('', 'k', 'M', 'G', 'T', 'P', 'E', 'Z', 'Y');
- my $step = $SI?1000:1024;
- my $thresh = 999;
- my $depth = 0;
- my $max_depth = $#symbols;
- my $format;
-
- while (($number > $thresh) and ($depth < $max_depth)) {
- $depth += 1;
- $number /= $step;
- }
-
- if ($number =~ /^[+-]?\d+$/) {
- # Integer.
- $format = '%i%s';
- } elsif ($number < 9.95) {
- $format = '%.1f%s';
- } else {
- $format = '%.0f%s';
- }
- return sprintf($format, $number, $symbols[$depth]);
-}
-
-
-
sub check_for_link {
my ($signal,$parammessage,$paramchannel,$paramnick,$paramserver) = @_;
my $server = $signal->[$paramserver];
my $message = ($parammessage == -1) ? '' : $signal->[$parammessage];
my $nick = ($paramnick == -1)?defined($server)?$server->{'nick'}:'':$signal->[$paramnick];
my $g;
- my $m;
my $p;
my $witem;
} else {
$witem = Irssi::window_item_find($target);
}
-
+
# Look if we should ignore this line
if ($message =~ m,(?:\s|^)/nosave(?:\s|$),) {
return;
}
-
+
push_output($witem);
# Look if there is a torrent link in there
- $message =~ m,(http://\S*\.(?:torrent|penis)),;
- $m = $1;
- while (defined($m)) {
- write_debug('Torrent-URL: %s', $m);
- $torrentlist{$torrentindex++} = {'CHANNEL' => $target, 'NICK' => $nick, 'URL' => $m};
-
- # Remove the matched part from the message and try again (there may be
- # more!)
- $message =~ s/$m//;
-
- $message =~ m|(http://.*\.torrent)|;
- $m = $1;
+
+ while ($message =~ m,(http://\S*\.(?:torrent|penis)),g) {
+ write_debug('Torrent-URL: %s', $1);
+ $torrentlist{$torrentindex++} = {'CHANNEL' => $target, 'NICK' => $nick, 'URL' => $1};
}
pop_output();
$u = $torrentlist{$id}->{'URL'};
write_debug('Sending %s to rtorrent', $u);
- unless(defined($rtorrent->load_start($u))) {
+ unless(defined($rtorrent->load_start($talker, $u))) {
write_irssi('%%RError sending URL %s: %s', $u, $rtorrent->errstr());
} else {
write_irssi('%s enqueued', $u);
my $rqueue;
if (('list' eq $subcmd) or !defined($subcmd)) {
- unless(defined($rqueue = $rtorrent->download_list())) {
+ unless(defined($rqueue = $rtorrent->download_list($talker))) {
write_irssi('Error getting list of downloads: %s', $rtorrent->errstr());
return;
}
- write_irssi('List of rempote torrents');
+ write_irssi('List of remote torrents');
if (0 == scalar(@{$rqueue})) {
write_irssi(' (no torrents in remote queue)');
} else {
foreach (@{$rqueue}) {
write_irssi(' %s%s: %sB/%sB done (%d%%), %sB/s up, %sB/s down',
- $_->[6]?'*':' ',
- $_->[0],
- format_number($_->[2]),
- format_number($_->[1]),
- ($_->[2]*100)/$_->[1],
- format_number($_->[3]),
- format_number($_->[4]));
+ $_->{'ACTIVE'}?'*':' ',
+ $_->{'NAME'},
+ $_->{'BYTES_DONE'},
+ $_->{'SIZE_BYTES'},
+ $_->{'BYTES_DONE'}*100/$_->{'SIZE_BYTES'},
+ $_->{'UP_RATE'},
+ $_->{'DOWN_RATE'});
}
}
}
my $target = shift;
my $key = shift;
my $val = shift;
+ my $p;
- if ('global' eq $target) {
- if(exists($PARAMS->{$key})) {
- $conf->{'xmlrtorrent'}->{$key} = $val;
- if ('XMLURL' eq $key) {
- unless(defined($rtorrent = xmlrtorrent->new(
- 'XMLURL' => $conf->{'xmlrtorrent'}->{'XMLURL'},
- 'USERNAME' => $conf->{'xmlrtorrent'}->{'USERNAME'},
- 'USERNAME' => $conf->{'xmlrtorrent'}->{'PASSWORD'}))) {
- write_irssi('Could not initialize XMLRPC instance');
- return;
- }
- }
- } else {
- write_irssi('Key %s does not exist', $key);
+ foreach $p (@talkers) {
+ if ($p->{'NAME'} eq $target) {
+ $p->setval($key, $val);
+ return;
}
}
+ write_irssi('No such module');
}
-
sub cmd_show {
my $target = shift;
my $p;
my $e;
+
+ if (defined($target)) {
+ foreach $p (@talkers) {
+ if ($p->{'NAME'} eq $target) {
+ write_irssi($p->getconfstr());
+ return;
+ }
+ }
+ write_irssi('No such module');
+ } else {
+ write_irssi('Loaded talkers:');
+ foreach $p (@talkers) {
+ write_irssi(' %s', $p->{'NAME'});
+ };
+ }
}
sub cmd_help {
my $target = shift;
my $p;
- write_irssi(<<'EOT');
+ if (defined($target)) {
+ foreach $p (@talkers) {
+ if ($p->{'NAME'} eq $target) {
+ write_irssi($p->gethelpstr());
+ return;
+ }
+ }
+ write_irssi('No such module');
+ } else {
+ write_irssi(<<'EOT');
Supported commands:
save: save the current configuration
- help: display this help or module specific help
+ help [modulename]: display this help or module specific help
+ show [modulename]: show loaded modules or the current parameters of a module
talker [modulename]: display or set the talker to use
debug: enable debugging messages
nodebug: disable debugging messages
EOT
+;
+ }
}
sub cmd_talker {
foreach $p (@talkers) {
if (($p->{'NAME'} eq $target) && ($p->{'TYPE'} eq 'talker')) {
$talker = $p;
- $conf->{'videosite'}->{'talker'} = $target;
+ $conf->{'xmlrtorrent'}->{'talker'} = $target;
return;
}
}
write_irssi('No such talker');
} else {
- write_irssi('Current talker: %s', $conf->{'videosite'}->{'talker'});
+ write_irssi('Current talker: %s', $conf->{'xmlrtorrent'}->{'talker'});
}
}
$talker = $p;
}
}
- write_debug(undef, 'Selected %s as talker', $talker->{'NAME'});
- $conf->{'videosite'}->{'talker'} = $talker->{'NAME'};
+ write_debug('Selected %s as talker', $talker->{'NAME'});
+ $conf->{'xmlrtorrent'}->{'talker'} = $talker->{'NAME'};
+ # Loop through all plugins and load the config
+ foreach $p (@talkers) {
+ $conf->{'xmlrtorrent'}->{'config'}->{$p->{'NAME'}} = $p->mergeconfig($conf->{'xmlrtorrent'}->{'config'}->{$p->{'NAME'}});
+ }
# Restore the queue
%torrentlist = %{$conf->{'xmlrtorrent'}->{'_QUEUE'}};
%torrentlist = map { my $a = substr($_, 1); ("$a" => $torrentlist{$_}) } keys(%torrentlist);
$torrentindex = max(keys(%torrentlist)) + 1;
- unless(defined($rtorrent = xmlrtorrent->new(
- 'XMLURL' => $conf->{'xmlrtorrent'}->{'XMLURL'},
- 'USERNAME' => $conf->{'xmlrtorrent'}->{'USERNAME'},
- 'USERNAME' => $conf->{'xmlrtorrent'}->{'PASSWORD'}))) {
+ unless(defined($rtorrent = xmlrtorrent->new())) {
write_irssi('Could not initialize XMLRPC instance');
return;
}
git://git.camperquake.de / xmlrtorrent.git / blobdiff