rootor 0.0.3 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 57aee2a2fc75e6e60f56c0b230be423638bfd7ac
-  data.tar.gz: 8fd467e368e92eb606ab32eeef49db41c56968ca
+  metadata.gz: 15dbfbc038a84afc383b11e112467a3f5d3f5072
+  data.tar.gz: 89932a88882db6259bfd2e2444bd420d55947272
 SHA512:
-  metadata.gz: 5593f543852bbd6bf7f21df24d881de7f582a40f391ecd208f32e50daa9165d0ddbed59ca1baf300476d468679e9d1952f8914070ee84610534f9aff99ac4f1d
-  data.tar.gz: 667a992e97d9756a8ddf7026f27e0d9f1f299fe5961ef81985aa2076d9df8009a6185a24bf1476d1993ba0847d74579bf07f86c8c267bcef77dad45957bc3eba
+  metadata.gz: a14bcc0d475658c04e37417f4c74a8eea1500c02169f5ca8c99ffbfabba936a402e92dd0e317e0a47c1213bb9dcd52396d1a8ceab5e9144ee4e5829a2373615f
+  data.tar.gz: '099c11134037670eed044c029fecf31b89d6cb201f3054e32a8740d44e7ca989e1584891dcc963e3ad43dcfa888f01e54c58f8a64ab234f4e7a57b3b618f1edb'

data/README.md

@@ -1,13 +1,29 @@
-Rootor is an `xmlrpc` ruby frontend.
-
+Rootor is an `xmlrpc` rtorrent ruby frontend.
+```bash
+gem install rootor
 ```
+
+
+```ruby
 require 'rootor'
 
 r = Rootor.new('https://<user>:<password>@<server>:<port>/<xmlrpc>')
 
-r.torrents
+puts r.torrents.length
+
+r.load_from_file('<file.torrent>')
 ```
 
-links
+Reference 
 ---
 https://github.com/mdevaev/emonoda/wiki/rTorrent-XMLRPC-Reference
+
+http://elektito.com/2016/02/10/rtorrent-xmlrpc/
+
+https://github.com/rakshasa/rtorrent/wiki/rTorrent-0.9-Comprehensive-Command-list-(WIP)
+
+https://github.com/rakshasa/rtorrent/wiki
+
+https://github.com/Novik/ruTorrent/blob/master/js/rtorrent.js
+
+https://github.com/rafipiccolo/node-rtorrent/blob/master/index.js

data/lib/client.rb

@@ -1,7 +1,16 @@
 class Client < XMLRPC::Client
-  def fetch(queries)
-    call_async('d.multicall', 'main', *render_queries(queries)).map do |t|
-      Torrent.new(t, queries)
+  def fetch
+    d_objects = call_async('d.multicall', 'main', *render_downloads_queries).map do |t|
+      Hash[QUERIES[:downloads].keys.zip(t)]
+    end
+
+    t_commands = render_trackers_commands(d_objects.map { |d| d[:hash] })
+    t_objects  = multicall_async(*t_commands).map do |r|
+      Hash[QUERIES[:trackers].keys.zip(r.first)]
+    end
+
+    d_objects.zip(t_objects).map do |d, t|
+      Torrent.new(d.merge(t))
     end
   end
 
@@ -11,7 +20,15 @@ class Client < XMLRPC::Client
 
   private
 
-  def render_queries(queries)
-    queries.map { |k, v| "d.#{v[:call]}=" }
+  def render_downloads_queries
+    QUERIES[:downloads].map { |_, v| "d.#{v[:call]}=" }
+  end
+
+  def render_trackers_commands(hashes)
+    calls = QUERIES[:trackers].map { |_, v| "t.#{v[:call]}=" }
+
+    hashes.map do |h|
+      ['t.multicall', h, '', *calls]
+    end
   end
 end

data/lib/queries.rb

@@ -0,0 +1,30 @@
+QUERIES = {
+  downloads: {
+    hash:        { call: 'hash', kind: :str },
+    name:        { call: 'name', kind: :str },
+    path:        { call: 'base_path', kind: :str },
+    file_name:   { call: 'base_filename', kind: :str },
+    created_at:  { call: 'creation_date', kind: :time },
+    finished_at: { call: 'timestamp.finished', kind: :time },
+    message:     { call: 'message', kind: :str },
+    status:      { call: 'connection_current', kind: :str },
+    is_active:   { call: 'is_active', kind: :bool },
+    is_open:     { call: 'is_open', kind: :bool },
+    size:        { call: 'size_bytes', kind: :file },
+    uploaded:    { call: 'up.total', kind: :file },
+    downloaded:  { call: 'down.total', kind: :file },
+    ratio:       { call: 'ratio', kind: :ratio },
+    up_rate:     { call: 'up.rate', kind: :rate },
+    down_rate:   { call: 'down.rate', kind: :rate },
+    is_private:  { call: 'is_private', kind: :bool },
+  },
+  trackers:  {
+    tracker_url:           { call: 'url', type: :str },
+    tracker_type:          { call: 'type', type: :str },
+    tracker_group:         { call: 'group', type: :str },
+    tracker_success_count: { call: 'success_counter', type: :int },
+    tracker_failed_count:  { call: 'failed_counter', type: :int },
+  }
+}.freeze
+
+FLAT_QUERIES = QUERIES[:downloads].merge(QUERIES[:trackers]).freeze

data/lib/rootor.rb

@@ -2,49 +2,32 @@ require 'xmlrpc/client'
 require 'filesize'
 require_relative 'client'
 require_relative 'torrent'
+require_relative 'queries'
 
 class Rootor
   attr_accessor :client, :torrents
 
-  QUERIES = {
-    id:                 { call: 'hash', kind: :str },
-    name:               { call: 'name', kind: :str },
-    path:               { call: 'get_base_path', kind: :str },
-    creation_date:      { call: 'creation_date', kind: :date },
-    message:            { call: 'message', kind: :str },
-    connection_current: { call: 'connection_current', kind: :str },
-    is_active:          { call: 'is_active', kind: :bool },
-    is_open:            { call: 'is_open', kind: :bool },
-    size:               { call: 'size_bytes', kind: :file },
-    uploaded:           { call: 'get_up_total', kind: :file },
-    downloaded:         { call: 'bytes_done', kind: :file },
-    ratio:              { call: 'get_ratio', kind: :ratio },
-    up_rate:            { call: 'get_up_rate', kind: :rate },
-    down_rate:          { call: 'get_down_rate', kind: :rate },
-  }
-
-  def initialize(xmlrpc_url, queries = QUERIES)
-    @queries = queries
-    @client = Client.new2(xmlrpc_url)
-    @torrents = @client.fetch(@queries)
+  def initialize(xmlrpc_url)
+    @client   = Client.new2(xmlrpc_url)
+    @torrents = refresh!
   end
 
-  def refresh
-    @torrents = @client.fetch(@queries)
+  def refresh!
+    @torrents = @client.fetch
   end
 
   def serialized_torrents
-    serialize(@torrents)
+    @torrents.map(&:serialize)
+  end
+
+  def pretty_serialized_torrents
+    @torrents.map(&:pretty_serialize)
   end
 
   def find(str)
-    return [] if (str.empty? || !str.instance_of?(String))
+    return [] if str.empty? || !str.instance_of?(String)
     @torrents.map do |t|
-      begin
-        t if t.serialize.values.any? { |tt| tt.downcase.include? str.downcase }
-      rescue
-        nil
-      end
+      t if t.serialize.values.any? { |tt| tt.downcase.include? str.downcase } rescue nil
     end.compact
   end
 
@@ -55,10 +38,4 @@ class Rootor
   def load_from_file(path)
     load_from_raw(File.read(path))
   end
-
-  private
-
-  def serialize(torrents)
-    torrents.map(&:serialize)
-  end
 end

data/lib/torrent.rb

@@ -1,38 +1,54 @@
 class Torrent
-  def initialize(data, queries)
-    @data = data
-    @queries = queries
+  def initialize(raw_hash)
+    @raw_hash = raw_hash
     serialize.each do |k, v|
-      self.instance_variable_set "@#{k.to_s}", v
-      self.class.__send__(:attr_accessor, k)
+      instance_variable_set "@#{k}", v
+      self.class.__send__(:attr_reader, k)
     end
   end
 
-  def serialize
-    Hash[
-      @data.each_with_index.map do |value, index|
+  def serialize(pretty: false)
+    serialized_queries = Hash[
+      @raw_hash.map do |k, v|
         [
-          @queries.keys[index],
-          mutate(@queries[@queries.keys[index]][:kind], value)
+          k,
+          mutate(FLAT_QUERIES[k][:kind], v, pretty: pretty)
         ]
       end
     ]
+
+    serialized_queries.merge(
+      {
+        tracker: URI(serialized_queries[:tracker_url]).host
+      }
+    )
+  end
+
+  def pretty_serialize
+    serialize(pretty: true)
   end
 
   private
 
-  def mutate(kase, data)
+  def mutate(kase, data, pretty:)
     case kase
-    when :file, :rate
-      Filesize.from("#{data} B")
-    when :date
-      Time.at(data)
-    when :ratio
-      data.to_f/1000
-    when :bool
-      !!data
-    else
-      data
+      when :file
+        filesize = Filesize.from("#{data} B")
+        pretty ? filesize.pretty : filesize
+      when :rate
+        filesize = Filesize.from("#{data} B")
+        pretty ? "#{filesize.pretty}/s" : filesize
+      when :time
+        time = Time.at(data)
+        pretty ? time.to_s : time
+      when :ratio
+        data.to_f / 1000
+      when :int
+        data.to_i
+      when :bool
+        !!data
+      else
+        data
     end
   end
 end

metadata

@@ -1,10 +1,10 @@
 --- !ruby/object:Gem::Specification
 name: rootor
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.5
 platform: ruby
 authors:
-- lightbright
+- graham otte
 autorequire: 
 bindir: bin
 cert_chain: []
@@ -24,7 +24,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: ''
+description: 
 email: graham.otte@gmail.com
 executables: []
 extensions: []
@@ -32,9 +32,10 @@ extra_rdoc_files: []
 files:
 - README.md
 - lib/client.rb
+- lib/queries.rb
 - lib/rootor.rb
 - lib/torrent.rb
-homepage: http://what.com
+homepage: 
 licenses:
 - MIT
 metadata: {}
@@ -54,8 +55,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
-summary: XMLRPC interface
+summary: XMLRPC ruby interface
 test_files: []