torrent_rss 0.1.0 → 0.2.0

data/README.md

@@ -25,10 +25,31 @@ new entries to download to a specific folder.  By default, it will look for a co
 `~/.torrent_rss`.  This configuration file is written using [TOML](https://github.com/mojombo/toml), and
 includes the destination directory and the array of RSS feeds to query.
 
-TorrentRSS also supports command-line flags that override anything set in `~/.torrent_rss`. Options:
+Example:
+
+``` toml
+directory = "/opt/torrents"
+feeds = [
+  "http://example.com/torrent.rss",
+  "http://example2.com/doesnt/need/rss/extension"
+]
+```
+
+TorrentRSS also supports command-line flags that override anything set in its configuration file. By 
+default, that file is located at `~/.torrent_rss`, but can be overridden with the `--config` flag.
+
+Options:
   -f, [--feeds=one two three]  # Array of Feed URLs to parse and download from
   -d, [--directory=DIRECTORY]  # Directory to download torrent files from
+  -c, [--config=CONFIG]        # Specify the configuration file for TorrentRSS.
+                               # Default: ~/.torrent_rss
 
 Downloaded items have their IDs MD5'd and logged in `~/.torrent_rss_log` to prevent redownloading.
 
+*torrent_rss monitor*
+
+Do you want to continuously monitor RSS feeds instead of periodically running `torrent_rss fetch`? Then
+you want the `torrent_rss monitor` utility. The monitor will check every 60 seconds if new torrents are
+ready for download.  When passed the -d option, it will fork and detach as a daemon.
+
 Questions? Issues? Want to contribute? Pull requests and issues welcome.

data/lib/torrent_rss/cli.rb

@@ -7,14 +7,47 @@ module TorrentRSS
     desc 'fetch', 'parses RSS feeds and downloads any new torrent files'
     method_option :feeds, aliases: '-f', type: :array, desc: 'Array of Feed URLs to parse and download from'
     method_option :directory, aliases: '-d', desc: 'Directory to download torrent files from'
+    method_option :config, aliases: '-c', desc: 'Specify the configuration file.', default: '~/.torrent_rss'
+    method_option :verbose, type: :boolean, aliases: '-v', desc: 'Output verbosely'
     def fetch
+      Config.config_file = options[:config]
       feed_urls = options[:feeds] || Config.feeds || []
       directory = options[:directory] || Config.directory || '.'
 
       feed_urls.each do |url|
         feed = Feed.new url
-        feed.fetch! directory: directory
+        verbose "Fetching for url #{url}"
+        feed.fetch! directory: directory, verbose: options[:verbose]
       end
     end
+
+    desc 'monitor', 'continually monitors RSS feeds for changes to downloads'
+    method_option :daemonize, aliases: '-d', type: :boolean, default: false, banner: 'Daemonize the monitoring process'
+    def monitor
+      Signal.trap('INT') { puts 'shutting down' ; exit }
+
+      if options[:daemonize]
+        pid = fork do
+          looped_fetch 
+        end
+
+        Process.detach pid
+      else
+        looped_fetch
+      end
+    end
+
+    private
+    def looped_fetch
+      loop do
+        invoke :fetch
+        verbose "sleeping 60s until next fetch..."
+        sleep 60
+      end
+    end
+
+    def verbose message
+      puts message if options[:verbose] 
+    end
   end
 end

data/lib/torrent_rss/config.rb

@@ -3,6 +3,7 @@ require 'toml'
 module TorrentRSS
   class Config
     class << self
+      attr_accessor :config_file
       def directory
         config_data['directory']
       end
@@ -16,16 +17,12 @@ module TorrentRSS
       end
 
       def read_config
-        if File.exists? config_path
-          TOML.load_file  config_path
+        if File.exists? config_file
+          TOML.load_file  config_file
         else
           {}
         end
       end
-
-      def config_path
-        File.expand_path "~/.torrent_rss"
-      end
     end
   end
 end

data/lib/torrent_rss/feed.rb

@@ -8,10 +8,16 @@ module TorrentRSS
     def fetch! options = {}
       @directory = options[:directory]
       parsed_feed.entries.each do |entry|
+        puts "Parsing #{entry.entry_id}" if options[:verbose]
         if new_entry? entry
+          puts "Entry #{entry.entry_id} is new! Downloading..." if options[:verbose]
           torrent = Torrent.from_entry entry
-          torrent.download @directory
-          EntryLog.add entry.entry_id
+          if torrent.download @directory
+            puts "Entry #{entry.entry_id} downloaded to #{@directory}!" if options[:verbose]
+            EntryLog.add entry.entry_id
+          else
+            puts "Entry #{entry.entry_id} could not be downloaded" if options[:verbose]
+          end
         end
       end
     end
@@ -23,5 +29,9 @@ module TorrentRSS
     def parsed_feed
       @feed ||= Feedzirra::Feed.fetch_and_parse @url
     end
+
+    def verbose message
+      puts message if options[:verbose] 
+    end
   end
 end

data/lib/torrent_rss/version.rb

@@ -1,3 +1,3 @@
 module TorrentRSS
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: torrent_rss
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-01 00:00:00.000000000 Z
+date: 2013-05-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday