leecher 0.2.2 → 0.2.3

data/bin/leecher

@@ -42,6 +42,24 @@ module Leecher
           @foreground = v
         end
 
+        o.on("-q", "--print-queue",
+             "Print the active queue") do |v|
+          do_print_queue()
+          Kernel.exit!(RC_OK)
+        end
+
+        o.on("-p", "--pause",
+             "Pause downloads") do |v|
+          do_pause()
+          Kernel.exit!(RC_OK)
+        end
+
+        o.on("-r", "--unpause",
+             "Unpause downloads") do |v|
+          do_unpause()
+          Kernel.exit!(RC_OK)
+        end
+
         o.separator("")
         o.on("-h", "--help", "You're reading it :-)") do
           puts o
@@ -91,6 +109,58 @@ module Leecher
       log.info("Looking good, now take us for a real spin!")
     end
 
+    # Somewhat lifted from
+    # http://sourceforge.net/apps/trac/aria2/browser/trunk/doc/xmlrpc/aria2mon
+    def do_print_queue()
+      config = load_config(@config_dirname)
+      client = make_client(config, @log)
+      log.info("Asking aria2 about it's active downloads ..")
+      active = client.call_rpc("aria2.tellActive")
+      active.each do |entry|
+        gid = entry["gid"]
+        complete, total, speed = [
+                                  "completedLength",
+                                  "totalLength",
+                                  "downloadSpeed",
+                                 ].map do |field|
+          entry[field].to_i
+        end
+        remaining = total - complete
+        eta_str = if speed == 0
+                    "N/A"
+                  else
+                    remsec = remaining/speed
+                    hr = remsec/3600
+                    remsec = remsec%3600
+                    min = remsec/60
+                    remsec = remsec%60
+                    result = ""
+                    result += "#{hr}h" if hr > 0
+                    result += "#{min}m" if min > 0
+                    result += "#{remsec}s"
+                  end
+        no_files = entry["files"].size
+        first_file = entry["files"].first["uris"].first["uri"]
+        log.info("##{gid}: #{no_files} file(s) (currently: #{File.basename(first_file)}). "\
+                 "#{complete}/#{total} (#{"%.2f" % (complete.to_f * 100 / total)}%). "\
+                 "ETA: #{eta_str}")
+      end
+    end
+
+    def do_pause()
+      config = load_config(@config_dirname)
+      client = make_client(config, @log)
+      log.info("Asking aria2 to pause ..")
+      log.debug(client.call_rpc("aria2.pauseAll"))
+    end
+
+    def do_unpause()
+      config = load_config(@config_dirname)
+      client = make_client(config, @log)
+      log.info("Asking aria2 to pause ..")
+      log.debug(client.call_rpc("aria2.unpauseAll"))
+    end
+
     def get_user_input(question, default)
       default_text = case default
                      when :required, :password; nil
@@ -136,12 +206,7 @@ module Leecher
         log.info("Fading into the ether ..")
         make_daemon(config[:daemon])
       end
-      client = Leecher::Client.new(config[:username],
-                                   config[:password],
-                                   config[:metalink_queue_name],
-                                   config[:bunny_opts],
-                                   config[:aria2_opts],
-                                   @log)
+      client = make_client(config, @log)
       client.run()
       Kernel.exit(RC_OK)
     end
@@ -188,6 +253,15 @@ module Leecher
          end
       end
     end
+
+    def make_client(config, log)
+      Leecher::Client.new(config[:username],
+                          config[:password],
+                          config[:metalink_queue_name],
+                          config[:bunny_opts],
+                          config[:aria2_opts],
+                          log)
+    end
   end
 end
 

data/lib/leecher/client.rb

@@ -118,7 +118,7 @@ module Leecher
         # FIXME: is it possible something can go wrong but not throw an exception?
         begin
           uris, options = Yajl::Parser.parse(msg)
-          call_aria(uris, options)
+          enqueue_with_aria(uris, options)
           true
         rescue Exception => e
           log.error("Failed to add uri to aria2c: #{e.message}")
@@ -129,7 +129,7 @@ module Leecher
       end
     end
 
-    def call_aria(uris, options)
+    def enqueue_with_aria(uris, options)
       rewrite_aria_dir_opt(options)
       log.info("Will call aria2.addUri(#{uris.inspect()}, #{options.inspect()})")
       status = call_rpc("aria2.addUri", uris, options)

data/lib/leecher/version.rb

@@ -1,3 +1,3 @@
 module Leecher
-  VERSION = "0.2.2"
+  VERSION = "0.2.3"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: leecher
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: 
   segments: 
   - 0
   - 2
-  - 2
-  version: 0.2.2
+  - 3
+  version: 0.2.3
 platform: ruby
 authors: 
 - Marc Bowes
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-30 00:00:00 +02:00
+date: 2011-08-22 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency