transmission-rss 1.2.1 → 1.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e93a561f40bd628318cf507101b393624547251369fc6cc0557f280afaabf194
-  data.tar.gz: f743d335aac56c1130ae2fd6c85f6d6a2f8ee0cd91ad8128df0309d97b880de9
+  metadata.gz: 48c08a8eb75a7ce3cfebf177e7aab2c0e90306ade0ba55160f3a15aeedf564ec
+  data.tar.gz: c438995f60f9ebb6bf4f58545872e2e951fb73fdffe8ea291cc134982b4102d5
 SHA512:
-  metadata.gz: af81937243076628a610f49f6f28dfccbfeba3377964705c976e870f1e9c496ae9c03c50d16fb834823ccb258ccbe78bafd33502670e49900935ab1f0971d81f
-  data.tar.gz: c0e00180d4c23177d92d004ca08a8b53a40cb22bd09e6e3231acc7f0b60865c1750e236f72bcbc58aa1935193dd6364e82ef8ff408c1edc7af41c99e12e299b1
+  metadata.gz: ec075911c8d8580a1717f70e960fba7962467ba1f51dad18a9a515b29c8442be4c22d5c5a868f879b97268fd1e5ee1cbf6b961738a5a9577798c420590827703
+  data.tar.gz: d8376330285b34ea11186bef4b74dc39e6ace47b27c5cee36647d595d0d7533619828625ffe52ca310aba3cdd0aa6a24caa15327a77a0e33b07771861dd8404d

data/README.md

@@ -51,7 +51,7 @@ gem install transmission-rss-*.gem
 ```sh
 docker run -t \
   -v $(pwd)/transmission-rss.conf:/etc/transmission-rss.conf \
-  nning2/transmission-rss:v1.0.0
+  nning2/transmission-rss:v1.2.1
 ```
 
 Configuration
@@ -114,6 +114,15 @@ feeds:
     validate_cert: false
 ```
 
+Using the GUID instead of the link for tracking seen torrents is also available,
+useful for changing URLs such as Prowlarr's proxy links. Default is false:
+
+```yaml
+feeds:
+  - url: http://example.com/feed1
+    seen_by_guid: true
+```
+
 ### All available options
 
 The following configuration file example contains every existing option
@@ -150,6 +159,7 @@ feeds:
         download_path: /home/user/match2
   - url: http://example.com/feed9
     validate_cert: false
+    seen_by_guid: true
 
 update_interval: 600
 

data/bin/transmission-rss

@@ -133,7 +133,8 @@ unless config.privileges.empty?
     ':' +
     config.privileges.group
 else
-  log.debug('no privilege dropping')
+  user = Etc.getpwuid(Process.euid).name
+  log.debug('no privilege dropping, running as user ' + user)
 end
 
 # Warn if no feeds are given.

data/lib/transmission-rss/aggregator.rb

@@ -112,11 +112,14 @@ module TransmissionRSS
       # Link is not a String directly.
       link = link.href if link.class != String
 
+      # Determine whether to use guid or link as seen hash
+      seen_value = feed.seen_by_guid ? (item.guid.content rescue item.guid || link).to_s : link
+
       # The link is not in +@seen+ Array.
-      unless @seen.include?(link)
+      unless @seen.include?(seen_value)
         # Skip if filter defined and not matching.
-        unless feed.matches_regexp?(item.title)
-          @seen.add(link)
+        unless feed.matches_regexp?(item.title) && !feed.exclude?(item.title)
+          @seen.add(seen_value)
           return
         end
 
@@ -129,7 +132,7 @@ module TransmissionRSS
         rescue Client::Unauthorized, Errno::ECONNREFUSED, Timeout::Error
           @log.debug('not added to seen file ' + link)
         else
-          @seen.add(link)
+          @seen.add(seen_value)
         end
       end
 

data/lib/transmission-rss/client.rb

@@ -64,10 +64,16 @@ module TransmissionRSS
       @log.debug(log_message)
 
       if id && options[:seed_ratio_limit]
-        set_torrent(id, {
-          'seedRatioLimit' => options[:seed_ratio_limit].to_f,
-          'seedRatioMode' => 1
-        })
+        if options[:seed_ratio_limit].to_f < 0
+          set_torrent(id, {
+            'seedRatioMode' => 2
+          })
+        else
+          set_torrent(id, {
+            'seedRatioLimit' => options[:seed_ratio_limit].to_f,
+            'seedRatioMode' => 1
+          })
+        end
       end
 
       response

data/lib/transmission-rss/feed.rb

@@ -1,18 +1,18 @@
 module TransmissionRSS
   class Feed
-    attr_reader :url, :regexp, :config, :validate_cert
+    attr_reader :url, :regexp, :config, :validate_cert, :seen_by_guid
 
     def initialize(config = {})
       @download_paths = {}
+      @excludes = {}
 
       case config
       when Hash
         @config = config
 
-        @url = URI.escape(config['url'] || config.keys.first)
+        @url = URI.escape(URI.unescape(config['url'] || config.keys.first))
 
         @download_path = config['download_path']
-        @validate_cert = config['validate_cert'].nil? || config['validate_cert']
 
         matchers = Array(config['regexp']).map do |e|
           e.is_a?(String) ? e : e['matcher']
@@ -20,11 +20,14 @@ module TransmissionRSS
 
         @regexp = build_regexp(matchers)
 
-        initialize_download_paths(config['regexp'])
+        initialize_download_paths_and_excludes(config['regexp'])
       else
         @config = {}
         @url = config.to_s
       end
+
+      @validate_cert = @config['validate_cert'].nil? || !!@config['validate_cert']
+      @seen_by_guid = !!@config['seen_by_guid']
     end
 
     def download_path(title = nil)
@@ -41,6 +44,14 @@ module TransmissionRSS
       @regexp.nil? || !(title =~ @regexp).nil?
     end
 
+    def exclude?(title)
+      @excludes.each do |regexp, exclude|
+        return true if title =~ to_regexp(exclude)
+      end
+
+      return false
+    end
+
     private
 
     def build_regexp(matchers)
@@ -48,14 +59,16 @@ module TransmissionRSS
       matchers.empty? ? nil : Regexp.union(matchers)
     end
 
-    def initialize_download_paths(regexps)
+    def initialize_download_paths_and_excludes(regexps)
       return unless regexps.is_a?(Array)
 
       regexps.each do |regexp|
         matcher = regexp['matcher']
         path    = regexp['download_path']
+        exclude = regexp['exclude']
 
         @download_paths[matcher] = path if matcher && path
+        @excludes[matcher] = exclude if matcher && exclude
       end
     end
 

data/lib/transmission-rss/version.rb

@@ -1,3 +1,3 @@
 module TransmissionRSS
-  VERSION = '1.2.1'
+  VERSION = '1.2.3'
 end

data/transmission-rss.conf.example

@@ -27,10 +27,12 @@ feeds:
     regexp:
       - matcher: match1
         download_path: /home/user/match1
+        exclude: dontmatch
       - matcher: match2
         download_path: /home/user/match2
   - url: http://example.com/feed8
     validate_cert: false
+    seen_by_guid: true
 
 # 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: 1.2.1
+  version: 1.2.3
 platform: ruby
 authors:
 - henning mueller
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-11-15 00:00:00.000000000 Z
+date: 2022-11-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rss
@@ -117,7 +117,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: Adds torrents from rss feeds to transmission web frontend.