transmission-connect 0.3.0 → 0.3.4

data/Gemfile

@@ -4,7 +4,7 @@ source "http://rubygems.org"
 #   gem "activesupport", ">= 2.3.5"
 
 gem 'json'
-gem 'transmission-client', '>=0.0.3', :git => "git://github.com/Daem0n/transmission-client.git"
+gem 'transmission-client', '>=0.0.5', :git => "git://github.com/Daem0n/transmission-client.git"
 
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.

data/Gemfile.lock

@@ -1,8 +1,8 @@
 GIT
   remote: git://github.com/Daem0n/transmission-client.git
-  revision: b0ec8d4e14c212eb833746b430522487547ae91c
+  revision: c653e014b8c1c9c25d93adf05c60ed212667120d
   specs:
-    transmission-client (0.0.3)
+    transmission-client (0.0.5)
       em-http-request
 
 GEM
@@ -34,4 +34,4 @@ DEPENDENCIES
   json
   rcov
   shoulda
-  transmission-client (>= 0.0.3)!
+  transmission-client (>= 0.0.5)!

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.3.4

data/bin/transmission.rb

@@ -3,12 +3,22 @@
 require 'rubygems'
 require 'yaml'
 require 'transmission-client'
-require '../lib/transmission-connect'
+require 'lib/transmission-connect'
 
-CONFIG = "../config/transmission.yml"
-result = []
+CONFIG = "config/transmission.yml"
+@exit = false
 
-while true
+trap("INT") do
+  EventMachine::stop_event_loop
+  @exit = true
+end
+
+trap("TERM") do
+  EventMachine::stop_event_loop
+  @exit = true
+end
+
+while !@exit
   begin
     EventMachine.run do
       transmission = Configuration.new(YAML.load_file(CONFIG))
@@ -22,7 +32,11 @@ while true
           client.session_stats
         end
       end
+      EventMachine::start_server "127.0.0.1", 2456, TransmissionServer do |server|
+        server.connectors = transmission
+      end
     end
-  rescue
+  rescue Exception => e
+    puts "Error: #{e.message}"
   end
 end

data/lib/transmission-connect.rb

@@ -1 +1,2 @@
-require File.dirname(__FILE__) + '/transmission-connect/configuration'
+require File.dirname(__FILE__) + '/transmission-connect/configuration'
+require File.dirname(__FILE__) + '/transmission-connect/server'

data/lib/transmission-connect/configuration.rb

@@ -48,36 +48,61 @@ class Configuration
   end
 
   class Client
+#    HOST = 'http://127.0.0.1:3000'
+    HOST = 'http://peerlize.hitlan.ru'
     FIELDS = ['downloadDir', 'error', 'errorString', 'eta', 'hashString', 'id', 'name', 'peersConnected', 'peersKnown', 'peersSendingToUs', 'percentDone', 'rateDownload', 'rateUpload', 'recheckProgress', 'startDate', 'status', 'totalSize', 'torrentFile']
-    attr_reader :interval
+    attr_reader :interval, :host, :port, :transmission
+    attr_accessor :peer_port, :download_dir
     def initialize(args)
       @host = args.delete(:host) || '127.0.0.1'
       @port = args.delete(:port) || 9091
       @username = args[:username]
       @password = args[:password]
       @interval = args.delete(:interval) || 5
+      @up = args.delete(:up) || false
+      @down = args.delete(:down) || false
       @transmission = Transmission::Client.new(@host, @port, @username, @password)
+      @transmission.session do |session|
+        self.peer_port = session.peer_port
+        self.download_dir = session.download_dir
+      end
     end
 
     def report
       @transmission.torrents(FIELDS) do |torrents|
-        result = {:host => "#{@host}:#{@port}"}
+        result = {:client => options}
         torrents.each do |torrent|
-          puts 'torrent'
           result[torrent.hashString.to_sym] = torrent.attributes
         end
-        EM::HttpRequest.new('http://127.0.0.1:3000/transmission/').post :query => {:torrents => result.to_json}
+        EM::HttpRequest.new("#{HOST}/transmission/").post :body => {:torrents => result.to_json}
       end
     end
 
     def session_stats
       @transmission.session_stat do |ss|
-        puts 'session'
-        result = ss.attributes.merge({:host => "#{@host}:#{@port}"})
-        EM::HttpRequest.new('http://127.0.0.1:3000/transmission/stat').post :query => {:session_stat => result.to_json}
+        result = ss.attributes.merge(:client => options)
+        EM::HttpRequest.new("#{HOST}/transmission/stat").post :body => {:session_stat => result.to_json}
       end
     end
 
+    def up?
+      @up
+    end
+
+    def down?
+      @down
+    end
+
+    def options
+      @options ||= {
+          :port => peer_port,
+          :up => up?,
+          :down => down?,
+          :download_dir => download_dir,
+          :host => @host
+      }
+    end
+
   end
 
 end

data/lib/transmission-connect/server.rb

@@ -0,0 +1,27 @@
+module TransmissionServer
+  attr_accessor :connectors
+
+  def receive_data data
+    query = JSON.parse(data)
+    case query['command']
+      when 'add'
+        respond = 'Add: '  + query['uri']
+        target = query['client']
+        ## Add magnet link to download client
+        session = @connectors.find{|client| client.host == target['host'] and client.peer_port == target['port']}
+        if session
+          session.transmission.add_torrent_by_file(query['uri'])
+          session.transmission.add_tracker(query['hash'], 'http://retracker.local/announce') if query['hash']
+        end
+      when 'move'
+        respond = 'move'
+        ## Move torrent from download to upload client
+      else
+        respond = 'Illegal operation'
+    end
+    puts respond
+    send_data respond
+    close_connection_after_writing
+  end
+
+end

data/transmission-connect.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{transmission-connect}
-  s.version = "0.3.0"
+  s.version = "0.3.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Dmitry Brazhkin"]
-  s.date = %q{2011-04-19}
+  s.date = %q{2011-04-21}
   s.description = %q{Simple connector to transmission bittorrent client by HTTP-RPC}
   s.email = %q{dbrazhkin@gmail.com}
   s.executables = ["transmission.rb"]
@@ -30,6 +30,7 @@ Gem::Specification.new do |s|
     "lib/transmission-connect.rb",
     "lib/transmission-connect/client.rb",
     "lib/transmission-connect/configuration.rb",
+    "lib/transmission-connect/server.rb",
     "test/helper.rb",
     "test/test_client.rb",
     "test/test_transmission-connect.rb",
@@ -51,14 +52,14 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<json>, [">= 0"])
-      s.add_runtime_dependency(%q<transmission-client>, [">= 0.0.3"])
+      s.add_runtime_dependency(%q<transmission-client>, [">= 0.0.5"])
       s.add_development_dependency(%q<shoulda>, [">= 0"])
       s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.5.2"])
       s.add_development_dependency(%q<rcov>, [">= 0"])
     else
       s.add_dependency(%q<json>, [">= 0"])
-      s.add_dependency(%q<transmission-client>, [">= 0.0.3"])
+      s.add_dependency(%q<transmission-client>, [">= 0.0.5"])
       s.add_dependency(%q<shoulda>, [">= 0"])
       s.add_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
@@ -66,7 +67,7 @@ Gem::Specification.new do |s|
     end
   else
     s.add_dependency(%q<json>, [">= 0"])
-    s.add_dependency(%q<transmission-client>, [">= 0.0.3"])
+    s.add_dependency(%q<transmission-client>, [">= 0.0.5"])
     s.add_dependency(%q<shoulda>, [">= 0"])
     s.add_dependency(%q<bundler>, ["~> 1.0.0"])
     s.add_dependency(%q<jeweler>, ["~> 1.5.2"])

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: transmission-connect
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 27
   prerelease: 
   segments: 
   - 0
   - 3
-  - 0
-  version: 0.3.0
+  - 4
+  version: 0.3.4
 platform: ruby
 authors: 
 - Dmitry Brazhkin
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-19 00:00:00 Z
+date: 2011-04-21 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   version_requirements: &id001 !ruby/object:Gem::Requirement 
@@ -37,12 +37,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 25
+        hash: 21
         segments: 
         - 0
         - 0
-        - 3
-        version: 0.0.3
+        - 5
+        version: 0.0.5
   name: transmission-client
   prerelease: false
   type: :runtime
@@ -129,6 +129,7 @@ files:
 - lib/transmission-connect.rb
 - lib/transmission-connect/client.rb
 - lib/transmission-connect/configuration.rb
+- lib/transmission-connect/server.rb
 - test/helper.rb
 - test/test_client.rb
 - test/test_transmission-connect.rb