Changeset 755

Timestamp:

09/24/09 20:40:58 (12 months ago)

Author:

paranoidi

Message:

New plugins: OutputSABzbd ModuleSort. Few tweaks here and there.

Location:

trunk

Files:

• flexget/feed.py (modified) (3 diffs)
• flexget/plugins/module_preset.py (modified) (2 diffs)
• flexget/plugins/module_sort_by.py (added)
• flexget/plugins/output_exec.py (modified) (1 diff)
• flexget/plugins/output_sabnzbd.py (added)
• tests/__init__.py (modified) (1 diff)

trunk/flexget/feed.py

@@ -116 +116 @@
             self.rejected.append(entry)
             self.verbose_details('Rejected %s' % entry['title'], reason)
+            log.debug('Rejected %s %s' % (entry['title'], reason))
         # TODO: HACK?
         if entry in self.accepted:
@@ -195 +196 @@
         """Execute plugin events if plugin is configured for this feed."""
         methods = get_methods_by_event(event)
-        log.log(5, 'Event %s methods %s' % (event, methods))
+        #log.log(5, 'Event %s methods %s' % (event, methods))
 
         for method in methods:
@@ -258 +259 @@
                     self.verbose_progress('Feed %s produced %s entries.' % (self.name, len(self.entries)))
             if event == 'filter':
-                self.verbose_progress('Feed %s accepted: %s (failed: %s rejected: %s undecided: %s)' % \
-                                      (self.name, len(self.accepted), len(self.failed), \
-                                       len(self.rejected), len(self.entries)-len(self.accepted)))
+                self.verbose_progress('Feed %s accepted: %s (rejected: %s undecided: %s failed: %s )' % \
+                                      (self.name, len(self.accepted), len(self.rejected), \
+                                       len(self.entries)-len(self.accepted), len(self.failed)))
             # if abort flag has been set feed should be aborted now
             if self.__abort:

trunk/flexget/plugins/module_preset.py

@@ -32 +32 @@
         if isinstance(config, basestring):
             config = [config]
-        # handles 'preset: no' form to turn off global preset on this feed
-        elif isinstance(config, bool):
+        elif isinstance(config, bool): # handles 'preset: no' form to turn off preset on this feed
             if not config:
-                config = []
-            else:
-                config = ['global']
+                return
+        
+        # add global in except when disabled with no_global
+        if 'no_global' in config:
+            config.remove('no_global')
+            if 'global' in config:
+                config.remove('global')
+        elif not 'global' in config:
+            log.debug('adding default global')
+            config.append('global')
                 
         log.log(5, 'presets: %s' % config)
@@ -44 +50 @@
             log.debug('Merging preset %s into feed %s' % (preset, feed.name))
             if not preset in feed.manager.config:
-                if preset=='global': continue
+                if preset == 'global': 
+                    continue
                 raise PluginError('Unable to set preset %s for %s' % (preset, feed.name), log)
             # merge

trunk/flexget/plugins/output_exec.py

@@ -2 +2 @@
 import logging
 from flexget.plugin import *
-
-__pychecker__ = 'unusednames=parser'
 
 log = logging.getLogger('exec')

trunk/tests/__init__.py

@@ -241 +241 @@
         assert self.feed.find_entry(title='dupe1') and self.feed.find_entry(title='dupe2'), 'disable_builtins is not working?'
 
-#class TestManager(FlexGetBase):
-#    def setUp(self):
-#        # just load with some conf
-#        self.config = 'regexp.yml'
-#        FlexGetBase.setUp(self, os.path.dirname(__file__))
-#        
-#    def testFailed(self):
-#        pass
-#        """
-#        e = Entry()
-#        e['title'] = 'test'
-#        e['url'] = 'http://localhost/mock'
-#        self.manager.add_failed(e)
-#        assert len(self.manager.shelve_session['failed']) == 1, 'failed to add'
-#        e = Entry()
-#        e['title'] = 'test 2'
-#        e['url'] = 'http://localhost/mock'
-#        self.manager.add_failed(e)
-#        assert len(self.manager.shelve_session['failed']) == 2, 'failed to add again'
-#        self.manager.add_failed(e)
-#        assert len(self.manager.shelve_session['failed']) == 2, 'failed to filter already added'
-#        """
+
+class TestPreset(FlexGetBase):
+    __yaml__ = """
+        global:
+          input_mock:
+            - {title: 'global', url: 'http://localhost/global'}
+            
+        movies:
+          input_mock:
+            - {title: 'movies', url: 'http://localhost/movies'}
+    
+        feeds:
+          test1:
+            preset: movies
+
+          test2:
+            preset: no
+            
+          test3:
+            preset:
+              - movies
+              - no_global
+    """
+    
+    def testPreset1(self):
+        self.execute_feed('test1')
+        assert self.feed.find_entry(title='global'), 'test1, preset global not applied'
+        assert self.feed.find_entry(title='movies'), 'test1, preset movies not applied'
+
+    def testPreset2(self):
+        self.execute_feed('test2')
+        self.dump()
+        assert not self.feed.find_entry(title='global'), 'test2, preset global applied'
+        assert not self.feed.find_entry(title='movies'), 'test2, preset movies applied'
+
+    def testPreset3(self):
+        self.execute_feed('test3')
+        assert not self.feed.find_entry(title='global'), 'test3, preset global applied'
+        assert self.feed.find_entry(title='movies'), 'test3, preset movies not applied'
         
 class TestInputHtml(FlexGetBase):