transmission-rss 0.1.24 → 0.1.25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2c005330a93788580fcba9c51ea29b470e57e2c9
-  data.tar.gz: 6b708fa837943e8a18dbf6cd562e4150d020f6ab
+  metadata.gz: fa641fabb07e0f42ffb837d7c89fe363d6a39512
+  data.tar.gz: b0824327608585661139d792dd5273ec72e39069
 SHA512:
-  metadata.gz: f74bf5288da8eba637d85e1fc5f4da5ceb71679db3ab663b9fa748a151e0f6920c7aa3254b27992885e8078270f34638c385bb3ba222c2e7d8b982bfcf515a44
-  data.tar.gz: ad84d3c2b0d3c9885e2f58551b59afc0b37b9d78949974582141ee44564c8f4025d0326d4072be97c2a095e0b4a9be03111c06a7f0da81d36afd92a617b50983
+  metadata.gz: 72965be8fee0e2b989bcb55c2973aff2784d4a0f170e342455225abc83d6cf620d5cb0665e1adc1690d2795d6047cdbbc033f4f34f23f879686144d640dda867
+  data.tar.gz: a647e5865cdae78072bb8d8401cd87abc2db1057914e52d75e62a5cffc9ab6500505cacfeae46725fefee7b267fd53c9d2a3cf9414e975aa76bb5ffdd3472cc6

data/README.md

@@ -43,17 +43,23 @@ instead of `~/.config`).
 It should at least contain a list of feeds:
 
     feeds:
-      - http://example.com/feed1
-      - http://example.com/feed2
+      - url: http://example.com/feed1
+      - url: http://example.com/feed2
 
 Feed item titles can be filtered by a regular expression:
 
     feeds:
-      - http://example.com/feed1:
+      - url: http://example.com/feed1
         regexp: foo
-      - http://example.com/feed2:
+      - url: http://example.com/feed2
         regexp: (foo|bar)
 
+Feeds can also be configured to download files to specific directory:
+
+    feeds:
+      - url: http://example.com/feed1:
+        download_path: /home/user/Downloads
+
 ### All available options
 
 The following configuration file example contains every existing option
@@ -64,12 +70,14 @@ user/group. `login` is also not defined by default. It has to be defined, if
 transmission is configured for HTTP basic authentication.
 
     feeds:
-      - http://example.com/feed1
-      - http://example.com/feed2
-      - http://example.com/feed3:
+      - url: http://example.com/feed1
+      - url: http://example.com/feed2
+      - url: http://example.com/feed3
         regexp: match1
-      - http://example.com/feed4:
+      - url: http://example.com/feed4
         regexp: (match1|match2)
+      - url: http://example.com/feed4
+        download_path: /home/user/Downloads
 
     update_interval: 600
 
@@ -103,12 +111,12 @@ Remember checking the path in `ExecStart`.
     [Unit]
     Description=Transmission RSS daemon.
     After=network.target transmission-daemon.service
-    
+
     [Service]
     Type=forking
     ExecStart=/usr/local/bin/transmission-rss -f
     ExecReload=/bin/kill -s HUP $MAINPID
-    
+
     [Install]
     WantedBy=multi-user.target
 

data/bin/transmission-add-file

@@ -78,7 +78,7 @@ log.debug(config)
 client = Client.new(config.server.host, config.server.port)
 
 ARGV.each do |torrent_file|
-  client.add_torrent(torrent_file, :file, config.add_paused)
+  client.add_torrent(torrent_file, :file, paused: config.add_paused)
 end
 
 log.close

data/bin/transmission-rss

@@ -150,8 +150,8 @@ aggregator = Aggregator.new(config.feeds, seen_file: config.seen_file)
 client = Client.new(config.server.host, config.server.port, config.login)
 
 # Callback for a new item on one of the feeds.
-aggregator.on_new_item do |torrent_file|
-  client.add_torrent(torrent_file, :url, config.add_paused)
+aggregator.on_new_item do |torrent_file, feed|
+  client.add_torrent(torrent_file, :url, paused: config.add_paused, download_path: feed.download_path)
 end
 
 # Save PID.

data/lib/transmission-rss/aggregator.rb

@@ -18,14 +18,7 @@ module TransmissionRSS
       seen_file = options[:seen_file]
 
       # Prepare Array of feeds URLs.
-      @feeds = feeds.map { |x| x.is_a?(Hash) ? x.keys.first : x }
-
-      # Prepare Hash of feed URL => Regexp filter.
-      @filters = feeds.select { |x| x.is_a? Hash }
-      @filters = @filters.map do |x|
-        [x.keys.first, Regexp.new(x['regexp'], Regexp::IGNORECASE)]
-      end
-      @filters = Hash[@filters]
+      @feeds = feeds.map { |config| TransmissionRSS::Feed.new(config) }
 
       # Nothing seen, yet.
       @seen = []
@@ -60,12 +53,11 @@ module TransmissionRSS
       @log.debug('aggregator start')
 
       while true
-        @feeds.each do |url|
-          url = URI.encode(url)
-          @log.debug('aggregate ' + url)
+        @feeds.each do |feed|
+          @log.debug('aggregate ' + feed.url)
 
           begin
-            content = open(url, allow_redirections: :safe).read
+            content = open(feed.url, allow_redirections: :safe).read
           rescue Exception => e
             @log.debug("retrieval error (#{e.class}: #{e.message})")
             next
@@ -74,7 +66,6 @@ module TransmissionRSS
           # gzip HTTP Content-Encoding is not automatically decompressed in
           # Ruby 1.9.3.
           content = decompress(content) if RUBY_VERSION == '1.9.3'
-
           begin
             items = RSS::Parser.parse(content, false).items
           rescue Exception => e
@@ -84,7 +75,7 @@ module TransmissionRSS
 
           items.each do |item|
             link = item.enclosure.url rescue item.link
-   
+
             # Item contains no link.
             next if link.nil?
 
@@ -94,17 +85,15 @@ module TransmissionRSS
             # The link is not in +@seen+ Array.
             unless seen?(link)
               # Skip if filter defined and not matching.
-              if @filters.include?(url)
-                unless item.title[@filters[url]]
-                  add_seen(link)
-                  next
-                end
+              unless feed.matches_regexp?(item.title)
+                add_seen(link)
+                next
               end
 
               @log.debug('on_new_item event ' + link)
 
               begin
-                on_new_item(link)
+                on_new_item(link, feed)
               rescue Client::Unauthorized, Errno::ECONNREFUSED, Timeout::Error
                 # Do not add to seen file.
               else

data/lib/transmission-rss/client.rb

@@ -17,11 +17,12 @@ module TransmissionRSS
     end
 
     # POST json packed torrent add command.
-    def add_torrent(file, type, paused = false)
+    def add_torrent(file, type, options = {})
       hash = {
         'method' => 'torrent-add',
         'arguments' => {
-          'paused' => paused
+          'paused' => options[:paused],
+          'download-dir' => options[:download_path]
         }
       }
 

data/lib/transmission-rss/feed.rb

@@ -0,0 +1,20 @@
+module TransmissionRSS
+  class Feed
+    attr_reader :url, :regexp, :download_path
+
+    def initialize(config = {})
+      case config
+      when Hash
+        @url = URI.encode(config['url'] || config.keys.first)
+        @regexp = Regexp.new(config['regexp'], Regexp::IGNORECASE) if config['regexp']
+        @download_path = config['download_path']
+      else
+        @url = config.to_s
+      end
+    end
+
+    def matches_regexp?(title)
+      @regexp.nil? || !(title =~ @regexp).nil?
+    end
+  end
+end

data/lib/transmission-rss/version.rb

@@ -1,3 +1,3 @@
 module TransmissionRSS
-  VERSION = '0.1.24'
+  VERSION = '0.1.25'
 end

data/transmission-rss.conf.example

@@ -6,12 +6,14 @@
 # List of feeds to watch.
 
 feeds:
-  - http://example.com/feed1
-  - http://example.com/feed2
-  - http://example.com/feed3:
+  - url: http://example.com/feed1
+  - url: http://example.com/feed2
+  - url: http://example.com/feed3
     regexp: match1
-  - http://example.com/feed4:
+  - url: http://example.com/feed4
     regexp: (match1|match2)
+  - url: http://example.com/feed4
+    download_path: /home/user/Downloads
 
 # Feed probing interval in seconds. Default is 600.
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: transmission-rss
 version: !ruby/object:Gem::Version
-  version: 0.1.24
+  version: 0.1.25
 platform: ruby
 authors:
 - henning mueller
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-24 00:00:00.000000000 Z
+date: 2015-10-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: open_uri_redirections
@@ -49,6 +49,7 @@ files:
 - lib/transmission-rss/callback.rb
 - lib/transmission-rss/client.rb
 - lib/transmission-rss/config.rb
+- lib/transmission-rss/feed.rb
 - lib/transmission-rss/hash.rb
 - lib/transmission-rss/log.rb
 - lib/transmission-rss/version.rb