transmission-rss 0.1.13 → 0.1.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a8eb08d11496d24bd539bd17237ea5aa523b362a
-  data.tar.gz: 26f4c37a9e38353be0cf07dd3e58aa4f8e64a9be
+  metadata.gz: 920904c2e1205bfbfa74c6baacc111aa545c55d9
+  data.tar.gz: 1c3c0d44afa9284d4720b7226f9efefa91387427
 SHA512:
-  metadata.gz: 6b26fdbcee2bf111a750a1aab971414e9c9ea28caea33a759c1e31b7bd7055a8048d5d710ed80d45f432a59ddf905f1647392cb6999c28f48994f8a89947da65
-  data.tar.gz: 93196eb479cbcedd731f2db63aae7e5c1da222f31b9dcd28ee8ffee5b330acd501bb7304b101236b1885cbbcafc1768035fd3a6cab9c6bbd447111ee76acc73a
+  metadata.gz: efa71a1a7bca7c4a303380311d9611818cc63ea1b366f5489fb2bca248e4d2503141cae312645e268ae51d36674cdf7fcd000349cc27bef5721f4f617edb44fd
+  data.tar.gz: 6ea5f5a54e3120b4cd5ca03fa821c73cefc6f645fe51964783c036acdb86940b9235fb1ad29b16dee69f5ff393e513c15be4ca92e739d9cc60ead79ce1120267

data/README.md

@@ -0,0 +1,78 @@
+transmission-rss
+================
+
+transmission-rss is basically a workaround for transmission's lack of the
+ability to monitor RSS feeds and automatically add enclosed torrent links.
+
+It works with transmission-daemon and transmission-gtk (if the web frontend
+is enabled in the settings dialog). Sites like showrss.karmorra.info and
+ezrss.it or self-hosted seriesly instances are suited well as feed sources.
+
+A tool called transmission-add-file is also included for mass adding of
+torrent files.
+
+As it's done with poems, I devote this very artful and romantic piece of
+code to the single most delightful human being: Ann.
+
+Installation
+------------
+
+### Latest stable version from rubygems.org
+
+    gem install transmission-rss
+
+### From source
+
+    git clone git://git.orgizm.net/transmission-rss.git
+    cd transmission-rss
+    gem build transmission-rss.gemspec
+    gem install transmission-rss-*.gem
+
+Configuration
+-------------
+
+A yaml formatted config file is expected at `/etc/transmission-rss.conf`.
+
+### Minimal example
+
+It should at least contain a list of feeds:
+
+    feeds:
+      - http://example.com/feed1
+      - http://example.com/feed2
+
+### All available options
+
+The following configuration file example contains every existing option
+(although `update_interval`, `add_paused` and `server` are default values
+and could be omitted). The default `log_target` is STDERR. `privileges` is
+not defined by default, so the script runs as current user/group.
+
+    feeds:
+      - http://example.com/feed1
+      - http://example.com/feed2
+
+    update_interval: 600
+
+    add_paused: false
+
+    server:
+      host: localhost
+      port: 9091
+
+    log_target: /var/log/transmissiond-rss.log
+
+    privileges:
+      user: nobody
+      group: nobody
+
+    fork: false
+
+    pid_file: false
+
+TODO
+----
+
+* Better library abilities.
+* Option to stop seeding after full download.
+* Configurable log level.

data/bin/transmission-rss

@@ -131,7 +131,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 { client.add_torrent torrent_file, :url, config.add_paused }
+  client.add_torrent torrent_file, :url, config.add_paused
 end
 
 # Save PID.

data/lib/transmission-rss.rb

@@ -1,7 +1,7 @@
 $:.unshift(File.dirname(__FILE__))
 
 module TransmissionRSS
-	VERSION = '0.1.13'
+	VERSION = '0.1.14'
 end
 
 Dir.glob($:.first + '/**/*.rb').each do |lib|

data/lib/transmission-rss/aggregator.rb

@@ -67,10 +67,14 @@ class TransmissionRSS::Aggregator
 
           # The link is not in +@seen+ Array.
           unless seen? link
-            on_new_item link
             @log.debug 'on_new_item event ' + link
-
-            add_seen link
+            begin
+              on_new_item link
+            rescue Errno::ECONNREFUSED
+#             @log.debug 'not added to seenfile'
+            else
+              add_seen link
+            end
           end
         end
       end

data/lib/transmission-rss/client.rb

@@ -1,49 +1,14 @@
 require 'net/http'
 require 'json'
-require 'timeout'
 require 'base64'
 
-# TODO
-#  * Why the hell do timeouts in get_session_id and add_torrent not work?!
-
 # Class for communication with transmission utilizing the RPC web interface.
 class TransmissionRSS::Client
-  def initialize(host, port)
-    @host = host
-    @port = port
-
+  def initialize(host = 'localhost', port = 9091, timeout: 5)
+    @host, @port, @timeout = host, port, timeout
     @log = Log.instance
   end
 
-  # Get transmission session id by simple GET.
-  def get_session_id
-    get = Net::HTTP::Get.new '/transmission/rpc'
-
-#   retries = 3
-#   begin
-#     Timeout::timeout(5) do
-        response = Net::HTTP.new(@host, @port).start do |http|
-          http.request get
-        end
-#     end
-#   rescue Timeout::Error
-#     puts('timeout error exception') if($verbose)
-#     if(retries > 0)
-#       retries -= 1
-#       puts('getSessionID timeout. retry..') if($verbose)
-#       retry
-#     else
-#       $stderr << "timeout http://#{@host}:#{@port}/transmission/rpc"
-#     end
-#   end
-
-    id = response.header['x-transmission-session-id']
-
-    @log.debug 'got session id ' + id
-
-    id
-  end
-
   # POST json packed torrent add command.
   def add_torrent(file, type, paused = false)
     hash = {
@@ -57,7 +22,7 @@ class TransmissionRSS::Client
       when :url
         hash.arguments.filename = file
       when :file
-        hash.arguments.metainfo = Base64.encode64 File.readlines(file).join
+        hash.arguments.metainfo = Base64.encode64(File.read(file))
       else
         raise ArgumentError.new 'type has to be :url or :file.'
     end
@@ -71,26 +36,38 @@ class TransmissionRSS::Client
 
     post.body = hash.to_json
 
-#   retries = 3
-#   begin
-#     Timeout::timeout(5) do
-        response = Net::HTTP.new(@host, @port).start do |http|
-          http.request post
-        end
-#     end
-#   rescue Timeout::Error
-#     puts('timeout error exception') if($verbose)
-#     if(retries > 0)
-#       retries -= 1
-#       puts('addTorrent timeout. retry..') if($verbose)
-#       retry
-#     else
-#       $stderr << "timeout http://#{@host}:#{@port}/transmission/rpc"
-#     end
-#   end
+    response = request post
 
     result = JSON.parse(response.body).result
 
     @log.debug 'add_torrent result: ' + result
   end
+
+  # Get transmission session id.
+  def get_session_id
+    get = Net::HTTP::Get.new '/transmission/rpc'
+    response = request get
+
+    id = response.header['x-transmission-session-id']
+
+    @log.debug 'got session id ' + id
+
+    id
+  end
+
+  private
+
+  def request(data)
+    Timeout::timeout(@timeout) do
+      Net::HTTP.new(@host, @port).start do |http|
+        http.request data
+      end
+    end
+  rescue Errno::ECONNREFUSED
+    @log.debug 'connection refused'
+    raise
+  rescue Timeout::Error
+    @log.debug 'connection timeout'
+    raise
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: transmission-rss
 version: !ruby/object:Gem::Version
-  version: 0.1.13
+  version: 0.1.14
 platform: ruby
 authors:
 - henning mueller
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-19 00:00:00.000000000 Z
+date: 2014-03-08 00:00:00.000000000 Z
 dependencies: []
 description: |-
   transmission-rss is basically a workaround for
@@ -21,7 +21,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- README.rdoc
+- README.md
 - bin/transmission-add-file
 - bin/transmission-rss
 - lib/transmission-rss.rb
@@ -51,7 +51,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Adds torrents from rss feeds to transmission web frontend.

data/README.rdoc

@@ -1,79 +0,0 @@
-= transmission-rss
-
-transmission-rss is basically a workaround for transmission's lack of the
-ability to monitor RSS feeds and automatically add enclosed torrent links.
-
-It works with transmission-daemon and transmission-gtk (if the web frontend
-is enabled in the settings dialog). Sites like showrss.karmorra.info and
-ezrss.it are suited well as feed sources.
-
-For the GTK configuration editor, the Ruby libglade2 bindings are necessary
-(but not included in the gem dependencies). On Arch Linux, install
-ruby-libglade from AUR.
-
-A tool called transmission-add-file is also included for mass adding of
-torrent files.
-
-As it's done with poems, I devote this very artful and romantic piece of
-code to the single most delightful human being: Ann.
-
-== Installation
-
-=== Latest stable version from rubygems.org
-
- gem install transmission-rss
-
-=== From source
-
- git clone git://git.orgizm.net/transmission-rss.git
- cd transmission-rss
- gem build transmission-rss.gemspec
- gem install transmission-rss-*.gem
-
-== Configuration
-
-A yaml formatted config file is expected at +/etc/transmission-rss.conf+.
-
-=== Minimal example
-
-It should at least contain a list of feeds:
-
- feeds:
-   - http://example.com/feed1
-   - http://example.com/feed2
-
-=== All available options
-
-The following configuration file example contains every existing option
-(although +update_interval+, +add_paused+ and +server+ are default values
-and could be omitted). The default +log_target+ is STDERR. +privileges+ is
-not defined by default, so the script runs as current user/group.
-
- feeds:
-   - http://example.com/feed1
-   - http://example.com/feed2
-
- update_interval: 600
-
- add_paused: false
-
- server:
-   host: localhost
-   port: 9091
-
- log_target: /var/log/transmissiond-rss.log
-
- privileges:
-   user: nobody
-   group: nobody
-
- fork: false
-
- pid_file: false
-
-== TODO
-
-* Better library abilities.
-* Timeout and error handling in +Aggregator+ and +Client+.
-* Option to stop seeding after full download.
-* Configurable log level.