rtorrent_xmlrpc 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7c86aceddbf9e09b916268983bd63cf5a474cf77
-  data.tar.gz: df956f3f1c72817153881436aa1efe9bfb0218a2
+  metadata.gz: 4ae000db9daac6192dce5cf98cc2c8d974d42b7c
+  data.tar.gz: 584a8a6dead03963572ef365a663a74443e84955
 SHA512:
-  metadata.gz: 703f7b8e98876f2f64597f2bbf5cecc122afb70ff94c6f59e7e6316c385cdc2b7dbb3fbd85c30adea9563dffdd49280870f5fcf2dc09b7996fa2d6f5f7a8a0bd
-  data.tar.gz: bb82d0251aebab977ecdd49458d143b18c7f23c2e4191282fea4064f94a9f7d2895b5d7c1228d6db395bfa9d0be0c0da5569efdb33d1166df1777e1e6cb557f9
+  metadata.gz: 38942789a53713954eada8eec5e817a834b3b980aac312c21ecebd0d6b476e089089e9a202e85a9567d89447c48b005d9d7471c8f2bc98014ac56178485cac14
+  data.tar.gz: 13e72a2aaee74129a9f2f661965159dd581b5b2910487018460f4e43ada857a58e9ddc85a828b500475e17e7bf81ade9a533d2214a97378ce1614b5db06853c1

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rtorrent_xmlrpc (0.1.1)
+    rtorrent_xmlrpc (0.2.0)
       colorize (~> 0.7, >= 0.7.7)
       filesize (~> 0.1, >= 0.1.0)
       hashie (~> 3.4, >= 3.4.2)

data/bin/rtorrent_xmlrpc

@@ -1,11 +1,14 @@
 #!/usr/bin/env ruby
 
 require 'hashie'
+require 'json'
 require 'rtorrent_xmlrpc'
 require 'thor'
 
 class RTorrent_XMLRPC < Thor
 
+  class_option '--json', type: :boolean
+
   def initialize(*args)
     super
     # Read in config file
@@ -26,7 +29,11 @@ class RTorrent_XMLRPC < Thor
 
   no_tasks do
     def print(torrents)
-      torrents.each { |torrent| torrent.pp }
+      if options[:json]
+        puts torrents.to_json
+      else
+        torrents.each { |torrent| torrent.pp }
+      end
     end
   end
 
@@ -52,7 +59,7 @@ class RTorrent_XMLRPC < Thor
 
   desc "complete", "Print all torrents that are complete."
   def complete
-    self.print @xmlrpc.completed
+    self.print @xmlrpc.torrents.completed
   end
 
   desc "incomplete", "Print all incomplete torrents."
@@ -62,7 +69,7 @@ class RTorrent_XMLRPC < Thor
 
   desc "labeled LABEL", "Print all torrents with label"
   def labeled(label)
-    self.print @xmlrpc.with_label label
+    self.print @xmlrpc.torrents.with_label label
   end
 
   desc "files HASH", "Print the torrent information with files."

data/lib/rtorrent_xmlrpc/torrent.rb

@@ -1,5 +1,6 @@
 require 'colorize'
 require 'filesize'
+require 'json'
 require 'xmlrpc/client'
 
 module RTorrent
@@ -15,6 +16,10 @@ module RTorrent
     attr_accessor :base_filename, :base_path, :completed, :files, :hash, :is_multi_file, :name, :tied_to_file
     attr_reader :down_total, :labels, :priority, :ratio, :size, :up_total
 
+    def completed?
+      self.completed
+    end
+
     def down_total=(down_total) # :nodoc:
       @down_total = Filesize.new(down_total)
     end
@@ -74,6 +79,7 @@ module RTorrent
         base_filename: @base_filename,
         base_path: @base_path,
         completed: @completed,
+        files: @files,
         hash: @hash,
         is_multi_file: @is_multi_file,
         labels: @labels,
@@ -85,14 +91,9 @@ module RTorrent
       }
     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
+    # Convert object to string as json
     def to_s
-      "#{self.hash} : #{self.name} : #{self.size.pretty} : #{self.down_total.pretty} : #{self.up_total.pretty} : #{self.ratio} : #{self.labels_str}"
+      self.to_h.to_json
     end
 
     # All torrent data dumped to screen in color

data/lib/rtorrent_xmlrpc/torrents.rb

@@ -0,0 +1,20 @@
+module RTorrent
+
+  class Torrents < Array
+    def completed
+      result = Torrents.new
+      self.each do |torrent|
+        result << torrent if torrent.completed?
+      end
+      return result
+    end
+    def with_label(label)
+      result = Torrents.new
+      self.each do |torrent|
+        result << torrent if torrent.has_label? label
+      end
+      return result
+    end
+  end
+
+end

data/lib/rtorrent_xmlrpc/xmlrpc.rb

@@ -1,5 +1,6 @@
 require 'hashie'
 require 'rtorrent_xmlrpc/torrent'
+require 'rtorrent_xmlrpc/torrents'
 require 'xmlrpc/client'
 
 module RTorrent
@@ -22,7 +23,7 @@ module RTorrent
       self.password = password
       self.path = path
       self.use_ssl = use_ssl
-      @torrents = []
+      @torrents = Torrents.new
       @status = :initialized
     end
 
@@ -59,10 +60,7 @@ module RTorrent
     # Grab list of torrents from server
     def fetch_torrents
       self.connect unless @status == :connected
-      @torrents = []
-      #@server.call('d.multicall', 'main', 'd.hash=').each do |result|
-      #  @torrents << RTorrent::Torrent.new(@server, result.first)
-      #end
+      @torrents = Torrents.new
       args = [
         'd.multicall',
         'main',
@@ -115,26 +113,6 @@ module RTorrent
       @server.call('d.stop', hash)
     end
 
-    # Get a list of completed torrents
-    def completed
-      result = []
-      @torrents.each { |torrent| result << torrent if torrent.completed }
-      return result
-    end
-
-    # Get a list of incomplete torrents
-    def incomplete
-      result = []
-      @torrents.each { |torrent| result << torrent unless torrent.completed }
-      return result
-    end
-
-    # Get a list of torrents with label
-    def with_label(label)
-      result = []
-      @torrents.each { |torrent| result << torrent if torrent.has_label? label }
-      return result
-    end
   end
 
 end

data/rtorrent_xmlrpc.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = 'rtorrent_xmlrpc'
-  s.version     = '0.2.0'
+  s.version     = '0.2.1'
   s.date        = '2015-07-03'
   s.summary     = 'A library and tool to query an rtorrent xmlrpc service.'
   s.description = 'This is a library to get torrent information from a remote rtorrent server.'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rtorrent_xmlrpc
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Zan Loy
@@ -103,6 +103,7 @@ files:
 - bin/rtorrent_xmlrpc
 - lib/rtorrent_xmlrpc.rb
 - lib/rtorrent_xmlrpc/torrent.rb
+- lib/rtorrent_xmlrpc/torrents.rb
 - lib/rtorrent_xmlrpc/xmlrpc.rb
 - methods.txt
 - rtorrent_xmlrpc.conf.sample