rpc.rb in transmission-rpc-ruby-0.2.0

- old
+ new

@@ -7,23 +7,19 @@
 
     def initialize(options = {})
       @connector = Connector.new options
     end
 
-    def get_session(options = {})
-      fields = Transmission::Arguments::SessionGet.new(options[:fields])
-      arguments = {fields: fields.to_arguments}
+    def get_session(fields = nil)
+      fields = Transmission::Fields::SessionGet.new(fields)
+      arguments = {fields: fields.to_fields}
       @connector.post method: 'session-get', arguments: arguments
     end
 
-    def set_session(arguments)
-      @connector.post method: 'session-set', arguments: arguments
-    end
-
-    def get_session_stats(options = {})
-      fields = Transmission::Arguments::SessionStats.new(options[:fields])
-      arguments = {fields: fields.to_arguments}
+    def get_session_stats(fields = nil)
+      fields = Transmission::Fields::SessionStats.new(fields)
+      arguments = {fields: fields.to_fields}
       @connector.post method: 'session-stats', arguments: arguments
     end
 
     def close_session
       @connector.post method: 'session-close'
@@ -35,74 +31,82 @@
 
     def blocklist
       @connector.post method: 'blocklist-update'
     end
 
-    def get_torrent(ids = nil, options = {})
-      fields = Transmission::Arguments::TorrentGet.new(options[:fields])
-      arguments = {fields: fields.to_arguments}
-      arguments[:ids] = ids if ids.is_a?(Array)
-      @connector.post method: 'torrent-get', arguments: arguments
+    def free_space
+      @connector.post method: 'free-space'
     end
 
-    def set_torrent
-      @connector.post method: 'torrent-set'
+    def get_torrent(ids, fields = nil)
+      fields = Transmission::Fields::TorrentGet.new(fields)
+      arguments = {fields: fields.to_fields}
+      arguments[:ids] = ids if ids.is_a? Array
+      @connector.post method: 'torrent-get', arguments: arguments
     end
 
-    def add_torrent(arguments = {})
-      @connector.post method: 'torrent-add', arguments: arguments
+    def set_torrent(ids, arguments)
+      arguments[:ids] = ids
+      arguments = Transmission::Arguments::TorrentSet.new(arguments)
+      @connector.post method: 'torrent-set', arguments: arguments.to_arguments
     end
 
-    def remove_torrent(ids, delete_local_data = false)
-      @connector.post method: 'torrent-remove', arguments: {ids: ids, 'delete-local-data' => delete_local_data}
+    def set_session(arguments)
+      arguments = Transmission::Arguments::SessionSet.new(arguments)
+      @connector.post method: 'session-set', arguments: arguments.to_arguments
     end
 
-    def free_space
-      @connector.post method: 'free-space'
+    def add_torrent(arguments)
+      arguments = Transmission::Arguments::TorrentAdd.new(arguments)
+      @connector.post method: 'torrent-add', arguments: arguments.to_arguments
     end
 
-    def start_torrent
-
+    def remove_torrent(ids, delete_local_data = false)
+      @connector.post method: 'torrent-remove', arguments: {ids: ids, 'delete-local-data' => delete_local_data}
     end
 
-    def start_torrent_now
-
+    def start_torrent(ids)
+      @connector.post method: 'torrent-start', arguments: id_arguments(ids)
     end
 
-    def stop_torrent
-
+    def start_torrent_now(ids)
+      @connector.post method: 'torrent-start-now', arguments: id_arguments(ids)
     end
 
-    def verify_torrent
-
+    def stop_torrent(ids)
+      @connector.post method: 'torrent-stop', arguments: id_arguments(ids)
     end
 
-    def re_announce
-
+    def verify_torrent(ids)
+      @connector.post method: 'torrent-verify', arguments: id_arguments(ids)
     end
 
-    def set_torrent_location
-
+    def re_announce_torrent(ids)
+      @connector.post method: 'torrent-reannounce', arguments: id_arguments(ids)
     end
 
-    def rename_torrent_path
-
+    def move_up_torrent(ids)
+      @connector.post method: 'queue-move-up', arguments: id_arguments(ids)
     end
 
-    def move_up_torrent
-
+    def move_down_torrent(ids)
+      @connector.post method: 'queue-move-down', arguments: id_arguments(ids)
     end
 
-    def move_down_torrent
-
+    def move_top_torrent(ids)
+      @connector.post method: 'queue-move-top', arguments: id_arguments(ids)
     end
 
-    def move_top_torrent
-
+    def move_bottom_torrent(ids)
+      @connector.post method: 'queue-move-bottom', arguments: id_arguments(ids)
     end
 
-    def move_bottom_torrent
+    private
 
+    def id_arguments(ids)
+      arguments = {}
+      arguments[:ids] = ids if ids.is_a? Array
+      arguments
     end
 
   end
 end
\ No newline at end of file