leecher 0.1.0 → 0.2.1

data/bin/leecher

@@ -62,7 +62,6 @@ module Leecher
       [
        [:username, "your username on the website?", :required],
        [:password, ".. and the password for that user?", :password],
-       [:log_fn, "filename to log to:", File.join(@config_dirname, "log")],
        [:host, "where does the amqp queue live?", "nzb.trim.za.net"],
        [:aria2_bin, "which aria2 must I use?", %x{which aria2c}.strip()],
        [:aria2_dir, "what whould you like your default download directory to be?", Dir.pwd],
@@ -172,6 +171,9 @@ module Leecher
       raise log.fatal("First fork failed") if (pid = Kernel.fork()) == -1
       Kernel.exit!(RC_OK) unless pid.nil?
       Process.setsid()
+      File.open(File.join(@config_dirname, "pid"), "w") do |f|
+        f.puts(Process.pid)
+      end
       Dir.chdir(config[:chdir]) if config.has_key? :chdir
       File.umask(config[:umask]) if config.has_key? :umask
       [

data/config/client.yml

@@ -3,7 +3,7 @@
 :metalink_queue_name: metalink
 :log:
   :level: :info
-  :filename: <%= log_fn %>
+  :filename: <%= File.join(config_dirname, "leecher.log") %>
 :bunny_opts:
   :host: <%= host %>
   :port: 5672
@@ -12,8 +12,8 @@
   :pass: <%= password %>
   :ssl: false
   :verify_ssl: false
-  :logfile: false
-  :logfile: false
+  :logfile: <%= File.join(config_dirname, "bunny.log") %>
+  :logging: false
   :frame_max: 131072
   :channel_max: 0
   :heartbeat: 300

data/leecher.gemspec

@@ -22,4 +22,5 @@ Gem::Specification.new do |s|
   s.add_development_dependency(%q<rspec>, [">=2"])
   s.add_runtime_dependency(%q<bunny>)
   s.add_runtime_dependency(%q<erubis>)
+  s.add_runtime_dependency(%q<yajl-ruby>)
 end

data/lib/leecher/client.rb

@@ -4,7 +4,8 @@ module Leecher
 
     require "bunny"
     require "leecher/shellout"
-    require 'xmlrpc/client'
+    require "xmlrpc/client"
+    require "yajl"
     
     include Leecher::Shellout
 
@@ -50,7 +51,6 @@ module Leecher
 
     def run()
       @bunny = make_bunny(self.bunny_opts)
-      @bunny.start()
 
       @graceful_shutdown = false
       @dont_kill_me = false
@@ -94,7 +94,6 @@ module Leecher
           # Start again.
           log.debug("Reconnecting to rabbitmq")
           @bunny = make_bunny(self.bunny_opts)
-          @bunny.start()
         rescue Exception => e
           log.error([e.class.name, e.message].join(": "))
           e.backtrace.each do |line|
@@ -105,7 +104,10 @@ module Leecher
     end
 
     def make_bunny(bunny_opts)
-      Bunny.new(bunny_opts)
+      b = Bunny.new(bunny_opts)
+      b.start()
+      b.qos()
+      b
     end
 
     def get_queue(bunny, *queue_joinable_name)
@@ -119,25 +121,51 @@ module Leecher
       
       next_queue_message(q) do |msg|
         @dont_kill_me = true
-        
-        log.info("Will call aria2.addUri #{msg.inspect()}")
-        
-        #FIXME is it possible something can go wrong but not throw an exception?
+
+        # FIXME: is it possible something can go wrong but not throw an exception?
         begin
-          status = call_rpc("aria2.addUri", [msg])
-          log.info("Added uri to aria with gid: #{status}")
-          return true
+          uris, options = Yajl::Parser.parse(msg)
+          call_aria(uris, options)
+          true
         rescue Exception => e
           log.error("Failed to add uri to aria2c: #{e.message}")
-          return false
+          false
+        ensure
+          @dont_kill_me = false
+        end
+      end
+    end
+
+    def call_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)
+      log.info("Added uri to aria with gid: #{status}")
+    end
+
+    def rewrite_aria_dir_opt(options)
+      # Attempt to rewrite +dir+ to a relative path
+      if (dir = options.delete("dir"))
+        begin
+          global_opts = call_rpc("aria2.getGlobalOption")
+          global_dir = global_opts.delete("dir")
+          options["dir"] = File.join(global_dir, dir)
+        rescue Exception => e
+          log.error("Couldn't get aria2 global options")
         end
       end
-    ensure
-      @dont_kill_me = false
     end
 
     def next_queue_message(q, &block)
-      q.subscribe() do |msg|
+      # +:timeout+: Sometimes it happens that our connection is stale (e.g. DSL
+      # drops and comes back) but the connection never drops. Rabbitmq
+      # kicks us off after 15 min. Thus, use a timeout of 15 minutes
+      # so that, if lightning strikes, worst case is we're 15 minutes
+      # behind.
+      # +:ack+: Acks are sent by +queue.ack+, which is sent via the
+      # subscribe block automatically if the option is turned on.
+      q.subscribe(:timeout => 900,
+                  :ack => true) do |msg|
         payload = msg[:payload]
         case payload
         when :queue_empty
@@ -169,6 +197,7 @@ module Leecher
           raise e
         else
           retried = true
+          log.debug("It appears aria isn't running. Attempting to start it up by calling: #{make_aria_exec}")
           shellout(make_aria_exec, nil, nil, nil)
           sleep 10
           retry
@@ -186,7 +215,7 @@ module Leecher
     end
 
     def make_aria_exec
-      args = aria2_opts[:args]
+      args = aria2_opts[:args].dup
 
       if aria2_opts.has_key?(:config)
         args.push([

data/lib/leecher/version.rb

@@ -1,3 +1,3 @@
 module Leecher
-  VERSION = "0.1.0"
+  VERSION = "0.2.1"
 end

data/spec/client_spec.rb

@@ -27,7 +27,7 @@ describe Leecher::Client do
     @c.metalink_queue_name.should == "metalink"
   end
 
-  describe "#next_queue_message" do
+  context "next_queue_message" do
     
     it "should only return when something is on the queue" do
       bunny = double("bunny")
@@ -40,7 +40,7 @@ describe Leecher::Client do
     end
   end
 
-  describe "#drain_metalink_queue" do
+  context "drain_metalink_queue" do
 
     before do
       @q = double("q")
@@ -51,10 +51,13 @@ describe Leecher::Client do
 
     
     it "should rpc to aria2" do
+      uris = ["http://some/url"]
+      options = {}
       @c.stub(:next_queue_message).
-        and_yield("http://some/url")
+        and_yield(Yajl::Encoder.encode([uris, options]))
       rpc_server = double("rpc_server")
-      rpc_server.stub(:call).
+      rpc_server.should_receive(:call).
+        with("aria2.addUri", uris, options).
         and_return(true)
       @c.stub(:rpc_server).
         and_return(rpc_server)
@@ -63,7 +66,7 @@ describe Leecher::Client do
 
     it "should return according to the success of the rpc" do
       @c.stub(:next_queue_message).
-        and_yield("http://some/url")
+        and_yield(Yajl::Encoder.encode([[], {}]))
       rpc_server = double("rpc_server")
       @c.stub(:rpc_server).
         and_return(rpc_server)
@@ -74,5 +77,22 @@ describe Leecher::Client do
         and_raise(RuntimeError)
       @c.drain_metalink_queue(@q).should be_false
     end
+
+    it "should rewrite the dir option" do
+      uris = ["http://some/url"]
+      options = { "dir" => "foo" }
+      @c.stub(:next_queue_message).
+        and_yield(Yajl::Encoder.encode([uris, options]))
+      rpc_server = double("rpc_server")
+      rpc_server.should_receive(:call).
+        with("aria2.getGlobalOption").
+        and_return({"dir" => "/tmp"})
+      rpc_server.should_receive(:call).
+        with("aria2.addUri", uris, {"dir" => "/tmp/foo"}).
+        and_return(true)
+      @c.stub(:rpc_server).
+        and_return(rpc_server)
+      @c.drain_metalink_queue(@q).should be_true
+    end
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: leecher
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 21
   prerelease: 
   segments: 
   - 0
+  - 2
   - 1
-  - 0
-  version: 0.1.0
+  version: 0.2.1
 platform: ruby
 authors: 
 - Marc Bowes
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-09 00:00:00 +02:00
+date: 2011-05-26 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -60,6 +60,20 @@ dependencies:
         version: "0"
   type: :runtime
   version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: yajl-ruby
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id004
 description: A server populates a queue, this client downloads those files
 email: 
 - marcbowes+leecher@gmail.com