transmission-rss 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ac9f76bca685a810ed32c80d1e43b7252d10a0088d33d4826d5b4e6c1496d753
-  data.tar.gz: b400a88f22877be316284d9edc0a3f13b73c014f16557adacaf2dc7fd9bc4004
+  metadata.gz: 6f26bb03512a57f35a06bfccceb95883c33b7338af3d00420a017d4b64f80a5d
+  data.tar.gz: 6ab7a09ef74a105b0621325fc2d07562c3f9f6d960ac6ddddb1bd08b0e82c07a
 SHA512:
-  metadata.gz: 5c34f47be84831505bfdeacf16ec7ea07b38b520e86b0c25222583a667edc956a4846394355949780151cd26f180bfeac26583f437c5f2f4c7a641c7a2e748b3
-  data.tar.gz: 27952ef90a8ca35e7fc1897a36610dc93c735d50be9a3f926821af141f2a241a85f6dbc5d19e45d0e42960f9579a1c1f7b0f6a2e434a81a0025edd04b5231d4a
+  metadata.gz: 96941ea4244382e2410e90b087262894441bfaa8c8f6236807c03396d2218ea692446b85c96db52607ce196757e5a230e8730ce366f97d5c39c78632648f16b9
+  data.tar.gz: c7fa37fb891daf7d9afd40f178ec0cf2aba1e7db3d067fa5ca3ffd657577653356ca9f5423a7351e137529416b967f97ded8b63a5b84d8b82b5b2e40b1b2163a

data/README.md

@@ -23,26 +23,36 @@ code to the single most delightful human being: Ann.
 The minimum supported Ruby version is 2.1. (You will need `rbenv` if your
 os does not support Ruby >= 2.1, e.g. on Debian wheezy.)
 
+**Note, that this README is for the current development branch!** You can find
+a link to a suitable README for your version
+[on the releases page](https://github.com/nning/transmission-rss/releases).
+
 Installation
 ------------
 
 ### Latest stable version from rubygems.org
 
-    gem install transmission-rss
+```sh
+gem install transmission-rss
+```
 
 ### From source
 
-    git clone https://github.com/nning/transmission-rss
-    cd transmission-rss
-    bundle
-    gem build transmission-rss.gemspec
-    gem install transmission-rss-*.gem
+```sh
+git clone https://github.com/nning/transmission-rss
+cd transmission-rss
+bundle
+gem build transmission-rss.gemspec
+gem install transmission-rss-*.gem
+```
 
 ### Via Docker
 
-    docker run -t \
-      -v $(pwd)/transmission-rss.conf:/etc/transmission-rss.conf \
-      nning2/transmission-rss:v1.0.0
+```sh
+docker run -t \
+  -v $(pwd)/transmission-rss.conf:/etc/transmission-rss.conf \
+  nning2/transmission-rss:v1.0.0
+```
 
 Configuration
 -------------
@@ -60,36 +70,49 @@ have to explicitly specify the others like `log.level`. (True for categories
 
 It should at least contain a list of feeds:
 
-    feeds:
-      - url: http://example.com/feed1
-      - url: http://example.com/feed2
+```yaml
+feeds:
+  - url: http://example.com/feed1
+  - url: http://example.com/feed2
+```
 
 Feed item titles can be filtered by a regular expression:
 
-    feeds:
-      - url: http://example.com/feed1
-        regexp: foo
-      - url: http://example.com/feed2
-        regexp: (foo|bar)
+```yaml
+feeds:
+  - url: http://example.com/feed1
+    regexp: foo
+  - 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
+
+```yaml
+feeds:
+  - url: http://example.com/feed1
+    download_path: /home/user/Downloads
+```
 
 Setting the seed ratio limit is supported per feed:
 
-    feeds:
-      - url: http://example.com/feed1
-        seed_ratio_limit: 0
+
+```yaml
+feeds:
+  - url: http://example.com/feed1
+    seed_ratio_limit: 0
+```
 
 Configurable certificate validation, good for self-signed certificates. Default
 is true:
 
-    feeds:
-      - url: http://example.com/feed1
-        validate_cert: false
+
+```yaml
+feeds:
+  - url: http://example.com/feed1
+    validate_cert: false
+```
 
 ### All available options
 
@@ -102,62 +125,65 @@ transmission is configured for HTTP basic authentication.
 
 See `./transmission-rss.conf.example` for more documentation.
 
-    feeds:
-      - url: http://example.com/feed1
-      - url: http://example.com/feed2
-      - url: http://example.com/feed3
-        regexp: match1
-      - url: http://example.com/feed4
-        regexp: (match1|match2)
-      - url: http://example.com/feed5
-        download_path: /home/user/Downloads
-      - url: http://example.com/feed6
-        seed_ratio_limit: 1
-      - url: http://example.com/feed7
-        regexp:
-          - match1
-          - match2
-      - url: http://example.com/feed8
-        regexp:
-          - matcher: match1
-            download_path: /home/user/match1
-          - matcher: match2
-            download_path: /home/user/match2
-      - url: http://example.com/feed9
-        validate_cert: false
-
-    update_interval: 600
-
-    add_paused: false
-
-    server:
-      host: localhost
-      port: 9091
-      tls: false
-      rpc_path: /transmission/rpc
-
-    login:
-      username: transmission
-      password: transmission
-
-    log:
-      target: /var/log/transmissiond-rss.log
-      level: debug
-
-    privileges:
-      user: nobody
-      group: nobody
-
-    client:
-      timeout: 5
-
-    fork: false
-
-    single: false
-
-    pid_file: false
-
-    seen_file: ~/.config/transmission/seen
+
+```yaml
+feeds:
+  - url: http://example.com/feed1
+  - url: http://example.com/feed2
+  - url: http://example.com/feed3
+    regexp: match1
+  - url: http://example.com/feed4
+    regexp: (match1|match2)
+  - url: http://example.com/feed5
+    download_path: /home/user/Downloads
+  - url: http://example.com/feed6
+    seed_ratio_limit: 1
+  - url: http://example.com/feed7
+    regexp:
+      - match1
+      - match2
+  - url: http://example.com/feed8
+    regexp:
+      - matcher: match1
+        download_path: /home/user/match1
+      - matcher: match2
+        download_path: /home/user/match2
+  - url: http://example.com/feed9
+    validate_cert: false
+
+update_interval: 600
+
+add_paused: false
+
+server:
+  host: localhost
+  port: 9091
+  tls: false
+  rpc_path: /transmission/rpc
+
+login:
+  username: transmission
+  password: transmission
+
+log:
+  target: /var/log/transmissiond-rss.log
+  level: debug
+
+privileges:
+  user: nobody
+  group: nobody
+
+client:
+  timeout: 5
+
+fork: false
+
+single: false
+
+pid_file: false
+
+seen_file: ~/.config/transmission/seen
+```
 
 Daemonized Startup
 ------------------
@@ -168,17 +194,19 @@ The following content can be saved into
 `/etc/systemd/system/transmission-rss.service` to create a systemd unit.
 Remember checking the path in `ExecStart`.
 
-    [Unit]
-    Description=Transmission RSS daemon.
-    After=network.target transmission-daemon.service
+```ini
+[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
+[Service]
+Type=forking
+ExecStart=/usr/local/bin/transmission-rss -f
+ExecReload=/bin/kill -s HUP $MAINPID
 
-    [Install]
-    WantedBy=multi-user.target
+[Install]
+WantedBy=multi-user.target
+```
 
 The unit files are reloaded by `systemctl daemon-reload`. You can then start
 transmission-rss by running `systemctl start transmission-rss`. Starting on

data/lib/transmission-rss.rb

@@ -5,6 +5,7 @@ end
 
 require 'transmission-rss/core_ext/Array'
 require 'transmission-rss/core_ext/Object'
+require 'transmission-rss/core_ext/URI'
 
 Dir.glob($:.first + '/**/*.rb').each do |lib|
 	require lib

data/lib/transmission-rss/aggregator.rb

@@ -44,15 +44,8 @@ module TransmissionRSS
         @feeds.each do |feed|
           @log.debug('aggregate ' + feed.url)
 
-          options = {allow_redirections: :safe}
-
-          unless feed.validate_cert
-            @log.debug('aggregate certificate validation: false')
-            options[:ssl_verify_mode] = OpenSSL::SSL::VERIFY_NONE
-          end
-
           begin
-            content = open(feed.url, options).read
+            content = fetch(feed)
           rescue StandardError => e
             @log.debug("retrieval error (#{e.class}: #{e.message})")
             next
@@ -62,7 +55,7 @@ module TransmissionRSS
           # Ruby 1.9.3.
           content = decompress(content) if RUBY_VERSION == '1.9.3'
           begin
-            items = RSS::Parser.parse(content, false).items
+            items = parse(content)
           rescue StandardError => e
             @log.debug("parse error (#{e.class}: #{e.message})")
             next
@@ -85,6 +78,25 @@ module TransmissionRSS
 
     private
 
+    def fetch(feed)
+      options = {
+        allow_redirections: :safe,
+        'User-Agent' => 'transmission-rss'
+      }
+
+      unless feed.validate_cert
+        @log.debug('aggregate certificate validation: false')
+        options[:ssl_verify_mode] = OpenSSL::SSL::VERIFY_NONE
+      end
+
+      # open for URIs is obsolete, URI.open does not work in 2.4
+      URI.send(:open, feed.url, options).read
+    end
+
+    def parse(content)
+      RSS::Parser.parse(content, false).items
+    end
+
     def decompress(string)
       Zlib::GzipReader.new(StringIO.new(string)).read
     rescue Zlib::GzipFile::Error, Zlib::Error

data/lib/transmission-rss/client.rb

@@ -48,7 +48,7 @@ module TransmissionRSS
 
       case type
         when :url
-          file = URI.encode(file) if URI.decode(file) == file
+          file = URI.escape(file) if URI.unescape(file) == file
           arguments.filename = file
         when :file
           arguments.metainfo = Base64.encode64(File.read(file))

data/lib/transmission-rss/core_ext/URI.rb

@@ -0,0 +1,9 @@
+module URI
+  def self.escape(*arg)
+    URI::DEFAULT_PARSER.escape(*arg)
+  end
+
+  def self.unescape(*arg)
+    URI::DEFAULT_PARSER.unescape(*arg)
+  end
+end

data/lib/transmission-rss/feed.rb

@@ -9,7 +9,7 @@ module TransmissionRSS
       when Hash
         @config = config
 
-        @url = URI.encode(config['url'] || config.keys.first)
+        @url = URI.escape(config['url'] || config.keys.first)
 
         @download_path = config['download_path']
         @validate_cert = config['validate_cert'].nil? || config['validate_cert']

data/lib/transmission-rss/version.rb

@@ -1,3 +1,3 @@
 module TransmissionRSS
-  VERSION = '1.1.0'
+  VERSION = '1.2.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: transmission-rss
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - henning mueller
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-30 00:00:00.000000000 Z
+date: 2020-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: open_uri_redirections
@@ -72,6 +72,7 @@ files:
 - lib/transmission-rss/core_ext/Array.rb
 - lib/transmission-rss/core_ext/Hash.rb
 - lib/transmission-rss/core_ext/Object.rb
+- lib/transmission-rss/core_ext/URI.rb
 - lib/transmission-rss/feed.rb
 - lib/transmission-rss/log.rb
 - lib/transmission-rss/seen_file.rb
@@ -96,7 +97,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Adds torrents from rss feeds to transmission web frontend.