transmission-rss 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5d767ee42ccfae63d8fe0dcbd4646c2b76e92afd
-  data.tar.gz: aad93524c03fc281512d4279e5cce49877f6e41e
+  metadata.gz: 395d3f0f34878429129d601628fe37e5d7753e1f
+  data.tar.gz: 76b962020543b7ec0c62a1d76d940f8dcc7c167f
 SHA512:
-  metadata.gz: f3d62fe42f81e4c3fe76254411e7cba5ed5ffa305f06116326449348b26ff8857f645ade5479aacd90908995438829ccb5ca0cae8b4f5cb429ebff4eb7f6c51d
-  data.tar.gz: a2326919928da2f78a315f0bc022f32236fe2c44420b28f1e7c6333e8cfb55488537efcc1994ade7ae852b3392bec7a088bc53bba92663418b4595f717719549
+  metadata.gz: 20f3bb43fb943b3085d17caa7e77251de1e0d63b04e43cd7653cd768de5d2a4179f3a158b3e9c5a1a93f8fdec1fb108130565622a4e2fbca8480b347a14160eb
+  data.tar.gz: 4e18d699f2c9dac769b01c5c38d8e16ac840ea26332318dc02cbc8a6e8e9c8298a4caa7184f1f48b8fded259a517149f7847e14f68c054acce378aa600f6aa67

data/README.md

@@ -32,7 +32,7 @@ Installation
 
     git clone https://github.com/nning/transmission-rss
     cd transmission-rss
-	bundle
+    bundle
     gem build transmission-rss.gemspec
     gem install transmission-rss-*.gem
 
@@ -66,6 +66,12 @@ Feeds can also be configured to download files to specific directory:
       - 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
+
 ### All available options
 
 The following configuration file example contains every existing option
@@ -84,6 +90,8 @@ transmission is configured for HTTP basic authentication.
         regexp: (match1|match2)
       - url: http://example.com/feed4
         download_path: /home/user/Downloads
+      - url: http://example.com/feed4
+        seed_ratio_limit: 1
       - url: http://example.com/feed4
         regexp:
           - match1
@@ -91,9 +99,9 @@ transmission is configured for HTTP basic authentication.
       - url: http://example.com/feed5
         regexp:
           - matcher: match1
-		  	download_path: /home/user/match1
+            download_path: /home/user/match1
           - matcher: match2
-		  	download_path: /home/user/match2
+            download_path: /home/user/match2
 
     update_interval: 600
 
@@ -104,9 +112,9 @@ transmission is configured for HTTP basic authentication.
       port: 9091
       rpc_path: /transmission/rpc
 
-	login:
-	  username: transmission
-	  password: transmission
+    login:
+      username: transmission
+      password: transmission
 
     log_target: /var/log/transmissiond-rss.log
 
@@ -118,7 +126,7 @@ transmission is configured for HTTP basic authentication.
 
     pid_file: false
 
-	seen_file: ~/.config/transmission/seen
+    seen_file: ~/.config/transmission/seen
 
 Daemonized Startup
 ------------------

data/bin/transmission-rss

@@ -99,6 +99,7 @@ if !(custom_config || ENV['HOME'].nil?)
 end
 
 # Print current config.
+log.debug('version ' + VERSION)
 log.debug(config)
 
 # Fork value from command line.
@@ -145,7 +146,10 @@ client = Client.new(config.server, config.login)
 
 # Callback for a new item on one of the feeds.
 aggregator.on_new_item do |torrent_file, feed, download_path|
-  client.add_torrent(torrent_file, :url, paused: config.add_paused, download_path: download_path)
+  client.add_torrent(torrent_file, :url,
+    paused: config.add_paused,
+    download_path: download_path,
+    seed_ratio_limit: feed.config.seed_ratio_limit)
 end
 
 # Callback for changes to the config.

data/lib/transmission-rss/client.rb

@@ -20,51 +20,69 @@ module TransmissionRSS
       @log      = TransmissionRSS::Log.instance
     end
 
-    # POST json packed torrent add command.
-    def add_torrent(file, type, options = {})
-      hash = {
-        'method' => 'torrent-add',
-        'arguments' => {
-          'paused' => options[:paused],
-          'download-dir' => options[:download_path]
+    def rpc(method, arguments)
+      sid = get_session_id
+      raise Unauthorized unless sid
+
+      post = Net::HTTP::Post.new \
+        @rpc_path,
+        {
+          'Content-Type' => 'application/json',
+          'X-Transmission-Session-Id' => sid
         }
+
+      add_basic_auth(post)
+      post.body = {method: method, arguments: arguments}.to_json
+
+      JSON.parse(request(post).body)
+    end
+
+    # POST json packed torrent add command.
+    def add_torrent(file, type = :url, options = {})
+      arguments = {
+        'paused' => options[:paused],
+        'download-dir' => options[:download_path]
       }
 
       case type
         when :url
-          hash.arguments.filename = file
+          arguments.filename = file
         when :file
-          hash.arguments.metainfo = Base64.encode64(File.read(file))
+          arguments.metainfo = Base64.encode64(File.read(file))
         else
           raise ArgumentError.new('type has to be :url or :file.')
       end
 
-      sid = get_session_id
-      raise Unauthorized unless sid
-
-      post = Net::HTTP::Post.new \
-        @rpc_path,
-        {
-          'Content-Type' => 'application/json',
-          'X-Transmission-Session-Id' => sid
-        }
+      response = rpc('torrent-add', arguments)
+      id = get_id_from_response(response)
 
-      auth(post)
+      log_message = 'torrent-add result: ' + response.result
+      log_message << ' (id ' + id.to_s + ')' if id
+      @log.debug(log_message)
 
-      post.body = hash.to_json
+      if id && options[:seed_ratio_limit]
+        set_torrent(id, {
+          'seedRatioLimit': options[:seed_ratio_limit].to_f,
+          'seedRatioMode': 1
+        })
+      end
 
-      response = request(post)
+      response
+    end
 
-      result = JSON.parse(response.body).result
+    def set_torrent(id, arguments = {})
+      arguments.ids = [id]
+      response = rpc('torrent-set', arguments)
+      @log.debug('torrent-set result: ' + response.result)
 
-      @log.debug('add_torrent result: ' + result)
+      response
     end
 
     # Get transmission session id.
     def get_session_id
       get = Net::HTTP::Get.new(@rpc_path)
 
-      auth(get)
+      add_basic_auth(get)
 
       response = request(get)
 
@@ -82,9 +100,19 @@ module TransmissionRSS
 
     private
 
-    def auth(request)
-      unless @login.nil?
-        request.basic_auth(@login['username'], @login['password'])
+    def add_basic_auth(request)
+      return if @login.nil?
+      request.basic_auth(@login['username'], @login['password'])
+    end
+
+    def get_id_from_response(response)
+      response.arguments.first.last.id
+    rescue
+    end
+
+    def http_request(data)
+      Net::HTTP.new(@host, @port).start do |http|
+        http.request(data)
       end
     end
 
@@ -93,7 +121,7 @@ module TransmissionRSS
 
       Timeout.timeout(@timeout) do
         @log.debug("request #@host:#@port")
-        http_get(data)
+        http_request(data)
       end
     rescue Errno::ECONNREFUSED
       @log.debug('connection refused')
@@ -108,11 +136,5 @@ module TransmissionRSS
 
       raise
     end
-
-    def http_get(data)
-      Net::HTTP.new(@host, @port).start do |http|
-        http.request(data)
-      end
-    end
   end
 end

data/lib/transmission-rss/feed.rb

@@ -1,12 +1,14 @@
 module TransmissionRSS
   class Feed
-    attr_reader :url, :regexp
+    attr_reader :url, :regexp, :config
 
     def initialize(config = {})
       @download_paths = {}
 
       case config
       when Hash
+        @config = config
+
         @url = URI.encode(config['url'] || config.keys.first)
 
         @download_path = config['download_path']

data/lib/transmission-rss/version.rb

@@ -1,3 +1,3 @@
 module TransmissionRSS
-  VERSION = '0.2.0'
+  VERSION = '0.2.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: transmission-rss
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - henning mueller
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-13 00:00:00.000000000 Z
+date: 2016-12-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: open_uri_redirections
@@ -96,7 +96,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.3
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Adds torrents from rss feeds to transmission web frontend.