Merge branch 'dev'

Author: jerrymakesjelly

.travis.yml

@@ -1,18 +1,20 @@
 language: python
 python:
-  - "3.3"
   - "3.4"
   - "3.5"
   - "3.6"
-  - "3.6-dev" # Python 3.6 development branch
+  - "3.7"
+dist: xenial
+sudo: true
 # Command to install dependencies
 install:
   - pip install requests pyyaml enum34
-  - pip install pytest pytest-cov codacy-coverage
+  - pip install --upgrade pytest 
+  - pip install pytest-cov codacy-coverage
   - pip install setuptools
 # Command to run tests
 script:
-  - py.test --cov-report=xml --cov=./
+  - py.test -s --cov-report=xml --cov
   - python setup.py install
   - autoremove-torrents -c pytest/test_main/config.yml -v
 # Command after success

README.rst

@@ -103,6 +103,11 @@ Screenshot
 
 Changelog
 ----------
+**Mon, 10 Jan 2019**: Version 1.2.5.
+
+    * Fixed bug: Incorrect number of torrents in multiple strategies (`Issue #10 <https://github.com/jerrymakesjelly/autoremove-torrents/issues/10>`_, thanks to @momokoo for the report and PR).
+    * Fixed bug: Incorrect number of torrents in qBittorrent (`Issue #13 <https://github.com/jerrymakesjelly/autoremove-torrents/issues/13>`_).
+
 **Thu, 31 May 2018**: Version 1.2.4.
 
     * Fixed startup failure.
@@ -143,7 +148,7 @@ Depend on users' feedback.
 
 * Add remove condition: Max/Min average UL/DL speed
 
-If you have any problem, please submit `Issues`_.
+If you have any problem, please submit `issues`_.
 
-.. _Issues: https://github.com/jerrymakesjelly/autoremove-torrents/issues
+.. _issues: https://github.com/jerrymakesjelly/autoremove-torrents/issues
 

autoremovetorrents/filter/tracker.py

@@ -13,7 +13,8 @@ def apply(self, torrents):
             for tracker in torrent.tracker: # For each tracker
                 tracker = urllib.parse.urlparse(tracker).netloc
                 if self._all or tracker in self._accept:
-                    result.append(torrent)
+                    if torrent not in result:
+                        result.append(torrent)
                 if tracker in self._reject:
                     result.remove(torrent)
                     break # Reject this seed

autoremovetorrents/strategy.py

@@ -42,8 +42,18 @@ def _apply_filters(self):
             {'all':self._all_trackers, 'ac':'trackers', 're':'excluded_trackers'}, # Tracker filter
             {'all':self._all_status, 'ac':'status', 're':'excluded_status'} # Status filter
         ]
+        filter_name = ['Category', 'Tracker', 'Status']
         filter_obj = [CategoryFilter, TrackerFilter, StatusFilter]
         for i in range(0, len(filter_conf)):
+            # Logging
+            self._logger.debug('Filter `%s` is working to process %d torrent(s): Accept All: %s, Accept: %s, Reject: %s.' \
+                % (
+                    filter_name[i],
+                    len(self.remain_list),
+                    'Yes' if filter_conf[i]['all'] else 'No',
+                    str(len(self._conf[filter_conf[i]['ac']])) if filter_conf[i]['ac'] in self._conf else 'Not Specified',
+                    str(len(self._conf[filter_conf[i]['re']])) if filter_conf[i]['re'] in self._conf else 'Not Specified',
+                ))
             # Apply each filter
             self.remain_list = filter_obj[i](
                 filter_conf[i]['all'],
@@ -65,15 +75,26 @@ def _apply_conditions(self):
         for i in range(0, len(condition_field)):
             # Apply each condition
             if condition_field[i] in self._conf:
+                # Logging
+                self._logger.debug('Remove condition `%s` was specified to process %d torrent(s).' \
+                    % (condition_field[i], len(self.remain_list)))
+                # Applying condition processor
                 cond = condition_obj[i](self._conf[condition_field[i]])
                 cond.apply(self.remain_list)
+                # Logging
+                self._logger.debug('The following %d torrent(s) would be remained.' % len(cond.remain))
+                for torrent in cond.remain:
+                    self._logger.debug(torrent)
+                self._logger.debug('The follwing %d torrent(s) would be removed.' % len(cond.remove))
+                for torrent in cond.remove:
+                    self._logger.debug(torrent)
+                # Output
                 self.remain_list = cond.remain
                 self.remove_list.extend(cond.remove)
 
     # Execute this strategy
     def execute(self, torrents):
         self._logger.info('Running strategy %s...' % self._name)
-
         self.remain_list = torrents
         # Apply Filters
         self._apply_filters()
@@ -86,7 +107,7 @@ def execute(self, torrents):
             self._logger.info('To be deleted:')
             for torrent in self.remove_list:
                 self._logger.info(torrent)
-        #self._logger.info('To be remained:')
+        #self._logger.debug('To be remained:')
         #for torrent in self.remain_list:
-        #    self._logger.info(torrent)
+        #    self._logger.debug(torrent)
         #return self.remove_list

autoremovetorrents/task.py

@@ -96,9 +96,10 @@ def _get_torrents(self):
     # Apply strategies
     def _apply_strategies(self):
         for strategy_name in self._strategies:
+            self._logger.debug('Strategy `%s` was specified to process %d torrent(s).' \
+                % (strategy_name, len(self._torrents)))
             strategy = Strategy(strategy_name, self._strategies[strategy_name])
             strategy.execute(self._torrents)
-            self._torrents = strategy.remain_list
             self._remove.extend(strategy.remove_list)
 
     # Remove torrents
@@ -119,3 +120,11 @@ def execute(self):
         self._apply_strategies()
         if self._enabled_remove:
             self._remove_torrents()
+
+    # Get remaining torrents (for tester)
+    def get_remaining_torrents(self):
+        return self._torrents
+
+    # Get removed torrents (for tester)
+    def get_removed_torrents(self):
+        return self._remove

pytest/test_tasks/cases/test_qbittorrent.yml

@@ -5,5 +5,15 @@ task:
   password: $(QBITTORRENT_PASSWORD)
   delete_data: true
   strategies:
-    test_strategies:
-      nothing: true
+    strategy_1:
+      categories:
+        - cata1
+      ratio: 0.009
+    strategy_2:
+      categories:
+        - cata2
+      seeding_time: 86400
+view: true
+result:
+  num-of-remaining: 0
+  num-of-removed: QBITTORRENT_TORRENT_NUM

pytest/test_tasks/cases/test_transmission.yml

@@ -5,4 +5,8 @@ task:
   delete_data: true
   strategies:
     test_strategies:
-      nothing: true
+      create_time: 86400
+view: true
+result:
+  num-of-remaining: 0
+  num-of-removed: TRANSMISSION_TORRENT_NUM

pytest/test_tasks/cases/test_utorrent.yml

@@ -3,3 +3,7 @@ task:
   host: $(UTORRENT_HOST)
   username: $(UTORRENT_USERNAME)
   password: $(UTORRENT_PASSWORD)
+view: true
+result:
+  num-of-remaining: UTORRENT_TORRENT_NUM
+  num-of-removed: 0

pytest/test_tasks/test_tasks.py

@@ -36,14 +36,28 @@ def test_task(env_dist):
             lg.info('Loading file: %s' % file)
             with open(file_path, encoding='utf-8') as f:
                 conf = yaml.safe_load(f)
+            # Replace system environment variables
+            keys = ['num-of-remaining', 'num-of-removed']
+            if 'result' in conf:
+                for key in keys:
+                    if key in conf['result'] and isinstance(conf['result'][key], str) \
+                        and conf['result'][key] in env_dist:
+                        conf['result'][key] = env_dist[conf['result'][key]]
 
             # Make take and run
             try:
-                task = Task(file, conf['task'])
+                if 'view' in conf:
+                    task = Task(file, conf['task'], not conf['view'])
+                else:
+                    task = Task(file, conf['task'])
                 task.execute()
                 if 'exceptions' in conf and len(conf['exceptions']) > 0:
                     raise AssertionError("It didn't raise exceptions as expected")
-            except Exception:
+                if 'result' in conf:
+                    if len(task.get_removed_torrents()) != int(conf['result']['num-of-removed']):
+                        raise AssertionError('The actual number of removed seeds does not match the assumption: %d != %d.' \
+                            % (len(task.get_remaining_torrents()), int(conf['result']['num-of-removed'])))
+            except Exception as e:
                 # Check if the excpetion is expected
                 found = False
                 for e in exception_map:
@@ -53,4 +67,4 @@ def test_task(env_dist):
                             found = True
                             break # An expected exception
                 if not found:
-                    raise AssertionError() # Unexpected exception
+                    raise e # Unexpected exception