Merge branch 'plugin' into domainsocket

[xmlrtorrent.git] / xmlrtorrent.pl

diff --git a/xmlrtorrent.pl b/xmlrtorrent.pl
index 5896a25..53dd4e6 100644 (file)
--- a/xmlrtorrent.pl
+++ b/xmlrtorrent.pl
@@ -26,9 +26,6 @@ my $rtorrent;
 my @outputstack = (undef);
 
 my $PARAMS = {
-    'XMLURL' => 'http://localhost/RPC2',
-    'USERNAME' => '',
-    'PASSWORD' => '',
     '_QUEUE' => {},
 };
 
@@ -121,35 +118,6 @@ sub write_debug {
     }
 }
 
-# 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];
@@ -255,13 +223,12 @@ sub cmd_remote {
         } 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'},
+                           $_->{'UP_RATE'},
+                           $_->{'DOWN_RATE'});
             }
         }
     }