rtorrent_xmlrpc 0.1 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e970b5dddb523638d1ea5f441ae458ecae5922aa
-  data.tar.gz: 68b65a6be40657e357d2f12165b278a8a84a6750
+  metadata.gz: aec5bd8704d971c6eed048549bcb34ab77c1f203
+  data.tar.gz: dcb43f75567b59bb2d7527765f8466e2e19d7553
 SHA512:
-  metadata.gz: 3126a3f7e45654edafa139b673867e4b6413f955994597defc9269f14509a29c701a31b52cd6d8e954a74132111ee7ae8c449640c984e233a1c0a9057eea510f
-  data.tar.gz: c0fd3a6a085cf20e679faf37232a2a53a594dfff3d11639a4101f9f3bd86a352fffd0c148b01e80ddb844a9e725a5abda904a78d0ca05277b9dc2a3bc33195cd
+  metadata.gz: 774572a3be0c2293acb2bf20808ebef6260f120905e1e36816b6bfa7cfe674c61274a806378af820984fa8912c8f80b809bdc4600b31f72ef29f9040f6ccc5fb
+  data.tar.gz: df05f889605f03f46efa6b4c739c2dd78c3cca46cbc55aa50bb570c2218897fc7c41be5db6cb5690c567a9940667d9303f467d1ca016555a7cb682bb52d3d23c

data/Gemfile.lock

@@ -3,6 +3,7 @@ PATH
   specs:
     rtorrent_xmlrpc (0.1)
       colorize (~> 0.7, >= 0.7.7)
+      filesize (~> 0.1, >= 0.1.0)
       hashie (~> 3.4, >= 3.4.2)
       thor (~> 0.19, >= 0.19.1)
 
@@ -10,6 +11,7 @@ GEM
   remote: https://rubygems.org/
   specs:
     colorize (0.7.7)
+    filesize (0.1.0)
     hashie (3.4.2)
     rake (10.4.2)
     thor (0.19.1)

data/lib/rtorrent_xmlrpc.rb

@@ -1,45 +1,117 @@
 require 'colorize'
+require 'filesize'
 require 'hashie'
 require 'xmlrpc/client'
 
 module RTorrent
 
   class Torrent
+
+    # Attributes
     attr_accessor :hash, :name, :completed, :base_filename, :base_path, :is_multi_file, :tied_to_file
-    attr_reader :labels
+    attr_reader :down_total, :labels, :priority, :ratio, :size, :up_total
 
-    def has_label(label)
-      @labels.include? label.to_s
+    def down_total=(down_total) # :nodoc:
+      @down_total = Filesize.new(down_total)
     end
 
-    def labels=(labels)
+    def labels=(labels) # :nodoc:
       @labels = labels.split(',')
+      @labels.map! { |label| label.chomp }
+    end
+
+    def labels_str
+      @labels.join(', ')
+    end
+
+    def priority=(priority) # :nodoc:
+      begin
+        @priority = priority.to_i
+      rescue
+        @priority = 2
+      end
+    end
+
+    # Return priority converted to a human readable string
+    def priority_str
+      case @priority
+      when 0
+        "Off"
+      when 1
+        "Low"
+      when 2
+        "Normal"
+      when 3
+        "High"
+      else
+        "Unknown"
+      end
+    end
+
+    def ratio=(ratio) # :nodoc:
+      begin
+        @ratio = ratio.to_f
+      rescue
+        @ratio = 0.0
+      end
+    end
+
+    def size=(size) # :nodoc:
+      @size = Filesize.new(size)
+    end
+
+    def up_total=(up_total) # :nodoc:
+      @up_total = Filesize.new(up_total)
     end
 
+    # Return hash of all values in Torrent
     def to_h
       {
-        hash: @hash,
-        name: @name,
-        labels: @labels,
-        completed: @completed,
         base_filename: @base_filename,
         base_path: @base_path,
+        completed: @completed,
+        hash: @hash,
         is_multi_file: @is_multi_file,
+        labels: @labels,
+        name: @name,
+        priority: @priority,
+        ratio: @ratio,
+        size: @size,
         tied_to_file: @tied_to_file,
       }
     end
 
+    # Single line header
+    def self.header
+      "hash : name : size : down : up : ratio : labels"
+    end
+
+    # All torrent data in a single string for output to screen
+    def to_s
+      "#{self.hash} : #{self.name} : #{self.size.pretty} : #{self.down_total.pretty} : #{self.up_total.pretty} : #{self.ratio} : #{self.labels_str}"
+    end
+
+    # All torrent data dumped to screen in color
     def pp
       puts "-------------- ".red
-      puts "         hash: ".blue + @hash.green
-      puts "         name: ".blue + @name.green
-      puts "       labels: ".blue + @labels.join(', ').green
-      puts "    completed: ".blue + @completed.to_s.green
-      puts "base_filename: ".blue + @base_filename.green
-      puts "    base_path: ".blue + @base_path.green
-      puts "is_multi_file: ".blue + @is_multi_file.to_s.green
-      puts " tied_to_file: ".blue + @tied_to_file.green
+      puts "         hash: ".blue + self.hash.green
+      puts "         name: ".blue + self.name.green
+      puts "         size: ".blue + self.size.pretty.green
+      puts "   downloaded: ".blue + self.down_total.pretty.green
+      puts "     uploaded: ".blue + self.up_total.pretty.green
+      puts "        ratio: ".blue + self.ratio.to_s.green
+      puts "     priority: ".blue + self.priority_str.green
+      puts "       labels: ".blue + self.labels_str.green
+      puts "    completed: ".blue + self.completed.to_s.green
+    end
+
+    # FILTERS
+
+    # Test if torrent has a specific label
+    def has_label?(label)
+      @labels.include? label.to_s
     end
+
   end
 
   class XMLRPC
@@ -85,7 +157,25 @@ module RTorrent
     def fetch_torrents
       self.connect unless @status == :connected
       @torrents = []
-      @server.call('d.multicall', 'main', 'd.hash=', 'd.name=', 'd.custom1=', 'd.complete=', 'd.base_filename=', 'd.base_path=', 'd.is_multi_file=', 'd.tied_to_file=').each do |stats|
+      args = [
+        'd.multicall',
+        'main',
+        'd.hash=',
+        'd.name=',
+        'd.custom1=',
+        'd.complete=',
+        'd.base_filename=',
+        'd.base_path=',
+        'd.is_multi_file=',
+        'd.tied_to_file=',
+        'd.get_size_bytes=',
+        'd.get_down_total=',
+        'd.get_up_total=',
+        'd.get_ratio=',
+        'd.get_priority=',
+      ]
+      #@server.call('d.multicall', 'main', 'd.hash=', 'd.name=', 'd.custom1=', 'd.complete=', 'd.base_filename=', 'd.base_path=', 'd.is_multi_file=', 'd.tied_to_file=', 'd.get_size').each do |stats|
+      @server.call(*args).each do |stats|
         torrent = RTorrent::Torrent.new
         torrent.hash = stats[0]
         torrent.name = stats[1]
@@ -95,6 +185,11 @@ module RTorrent
         torrent.base_path = stats[5]
         torrent.is_multi_file = stats[6] == 1 ? true: false
         torrent.tied_to_file = stats[7]
+        torrent.size = stats[8]
+        torrent.down_total = stats[9]
+        torrent.up_total = stats[10]
+        torrent.ratio = stats[11].to_f / 1000
+        torrent.priority = stats[12]
         @torrents << torrent
       end
     end
@@ -131,7 +226,7 @@ module RTorrent
     # Get a list of torrents with label
     def with_label(label)
       result = []
-      @torrents.each { |torrent| result << torrent if torrent.has_label(label) }
+      @torrents.each { |torrent| result << torrent if torrent.has_label? label }
       return result
     end
   end

data/rtorrent_xmlrpc.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.name        = 'rtorrent_xmlrpc'
-  s.version     = '0.1'
-  s.date        = '2015-07-02'
+  s.version     = '0.1.1'
+  s.date        = '2015-07-03'
   s.summary     = 'A library and tool to query an rtorrent xmlrpc service.'
   s.authors     = ['Zan Loy']
   s.email       = 'zan.loy@gmail.com'
@@ -12,6 +12,7 @@ Gem::Specification.new do |s|
 
   s.add_dependency 'colorize', '~> 0.7', '>= 0.7.7'
   s.add_dependency 'hashie', '~> 3.4', '>= 3.4.2'
+  s.add_dependency 'filesize', '~> 0.1', '>= 0.1.0'
   s.add_dependency 'thor', '~> 0.19', '>= 0.19.1'
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rtorrent_xmlrpc
 version: !ruby/object:Gem::Version
-  version: '0.1'
+  version: 0.1.1
 platform: ruby
 authors:
 - Zan Loy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-02 00:00:00.000000000 Z
+date: 2015-07-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
@@ -50,6 +50,26 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.4.2
+- !ruby/object:Gem::Dependency
+  name: filesize
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.1.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.1.0
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement