transmission-rss 0.1.6 → 0.1.7

data/bin/transmission-add-file

@@ -0,0 +1,86 @@
+#!/usr/bin/env ruby
+
+require 'getoptlong'
+
+$:.unshift(File.dirname(__FILE__) + '/../lib')
+require 'transmission-rss'
+
+include TransmissionRSS
+
+# Default config file path.
+config_file = '/etc/transmission-rss.conf'
+
+# Shows a summary of the command line options.
+def usage_message( config_file )
+  $stderr << "#{File.basename($0)} [options]
+Adds torrents from rss feeds to transmission web frontend.
+
+  -c <file>   Custom config file path. Default: #{config_file}
+  -h          This help.
+
+"
+  exit(1)
+end
+
+# Define command-line options.
+options = GetoptLong.new(
+  [ '-c', GetoptLong::REQUIRED_ARGUMENT ],
+  [ '-h', GetoptLong::NO_ARGUMENT ]
+)
+
+# Parse given options.
+options.each do |option, argument|
+  case(option)
+    when '-c'
+      config_file = argument
+    when '-e'
+      edit_config = true
+    when '-f'
+      dofork = true
+    when '-h'
+      usage_message(config_file)
+  end
+end
+
+# Seems to be necessary when called from gem installation.
+# Otherwise Config is somehow mixed up with RbConfig.
+config = TransmissionRSS::Config.instance
+
+# Default configuration.
+config.load({
+  'feeds' => [],
+  'update_interval' => 600,
+  'add_paused' => false,
+  'server' => {
+    'host' => 'localhost',
+    'port' => 9091
+  },
+  'log_target' => $stderr,
+  'privileges' => {}
+})
+
+# Initialize a log instance and configure it.
+log = Log.instance
+log.target = config.log_target
+log.level = Logger::DEBUG
+log.formatter = proc do |sev, time, prog, msg|
+  "#{time.to_i}(#{sev.downcase}) #{msg}\n"
+end
+
+# Load config file (default or given by argument).
+begin
+  config.load(config_file)
+  log.target = config.log_target
+rescue Errno::ENOENT
+  log.error(config_file + ' not found')
+end
+log.debug(config)
+
+# Initialize communication to transmission.
+client = Client.new(config.server.host, config.server.port)
+
+ARGV.each do |torrent_file|
+  client.add_torrent(torrent_file, :file, config.add_paused)
+end
+
+log.close

data/bin/transmission-rss

@@ -142,7 +142,7 @@ aggregator.feeds.concat(config.feeds)
 # Callback for a new item on one of the feeds.
 aggregator.on_new_item do |torrent_file|
   Thread.start do
-    client.add_torrent(torrent_file, config.add_paused)
+    client.add_torrent(torrent_file, :url, config.add_paused)
   end
 end
 

data/lib/transmission-rss.rb

@@ -1,7 +1,7 @@
 $:.unshift(File.dirname(__FILE__))
 
 module TransmissionRSS
-	VERSION = '0.1.6'
+	VERSION = '0.1.7'
 end
 
 dir = 'transmission-rss'

data/lib/transmission-rss/client.rb

@@ -1,6 +1,7 @@
 require 'net/http'
 require 'json'
 require 'timeout'
+require 'base64'
 
 # TODO
 #  * Why the hell do timeouts in get_session_id and add_torrent not work?!
@@ -46,7 +47,25 @@ class TransmissionRSS::Client
   end
 
   # POST json packed torrent add command.
-  def add_torrent(torrent_file, paused = false)
+  def add_torrent(file, type, paused = false)
+    hash = {
+      "method" => "torrent-add",
+      "arguments" => {
+        "paused" => paused
+      }
+    }
+
+    case type
+      when :url
+        hash.arguments.filename = file
+      when :file
+        hash.arguments.metainfo = Base64.encode64(
+          File.readlines(file).join
+        )
+      else
+        raise ArgumentError.new('type has to be :url or :file.')
+    end
+
     post = Net::HTTP::Post.new(
       '/transmission/rpc',
       initheader = {
@@ -55,13 +74,7 @@ class TransmissionRSS::Client
       }
     )
 
-    post.body = {
-      "method" => "torrent-add",
-      "arguments" => {
-        "paused" => paused,
-        "filename" => torrent_file
-      }
-    }.to_json
+    post.body = hash.to_json
 
 #   retries = 3
 #   begin

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 6
-  version: 0.1.6
+  - 7
+  version: 0.1.7
 platform: ruby
 authors: 
 - henning mueller
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-06 00:00:00 +01:00
+date: 2011-10-15 00:00:00 +02:00
 default_executable: 
 dependencies: []
 
@@ -25,23 +25,25 @@ description: |-
 email: henning@orgizm.net
 executables: 
 - transmission-rss
+- transmission-add-file
 extensions: []
 
 extra_rdoc_files: []
 
 files: 
 - bin/transmission-rss
-- lib/transmission-rss/config-editor/main.glade
+- bin/transmission-add-file
+- lib/transmission-rss.rb
+- lib/transmission-rss/aggregator.rb
+- lib/transmission-rss/client.rb
+- lib/transmission-rss/config-editor.rb
+- lib/transmission-rss/config-editor/listbox-original.rb
 - lib/transmission-rss/config-editor/listbox.rb
+- lib/transmission-rss/config-editor/main.glade
 - lib/transmission-rss/config-editor/main.rb
-- lib/transmission-rss/config-editor/listbox-original.rb
-- lib/transmission-rss/client.rb
-- lib/transmission-rss/log.rb
-- lib/transmission-rss/aggregator.rb
-- lib/transmission-rss/hash.rb
 - lib/transmission-rss/config.rb
-- lib/transmission-rss/config-editor.rb
-- lib/transmission-rss.rb
+- lib/transmission-rss/hash.rb
+- lib/transmission-rss/log.rb
 - README.rdoc
 has_rdoc: true
 homepage: