Merge pull request #132 from nning/feature/exclude-filters

Add exclude filters

lib/transmission-rss/aggregator.rb

@@ -111,14 +111,14 @@ def process_link(feed, item)
 
       # 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?(seen_value)
         # Skip if filter defined and not matching.
-        unless feed.matches_regexp?(item.title)
+        unless feed.matches_regexp?(item.title) && !feed.exclude?(item.title)
           @seen.add(seen_value)
           return
         end

lib/transmission-rss/feed.rb

@@ -4,6 +4,7 @@ class Feed
 
     def initialize(config = {})
       @download_paths = {}
+      @excludes = {}
 
       case config
       when Hash
@@ -19,7 +20,7 @@ def initialize(config = {})
 
         @regexp = build_regexp(matchers)
 
-        initialize_download_paths(config['regexp'])
+        initialize_download_paths_and_excludes(config['regexp'])
       else
         @config = {}
         @url = config.to_s
@@ -43,21 +44,31 @@ def matches_regexp?(title)
       @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)
       matchers = Array(matchers).map { |m| to_regexp(m) }
       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
 

transmission-rss.conf.example

@@ -27,6 +27,7 @@ feeds:
     regexp:
       - matcher: match1
         download_path: /home/user/match1
+        exclude: dontmatch
       - matcher: match2
         download_path: /home/user/match2
   - url: http://example.com/feed8