From 71806e6f95a3ac03cc9c1ad0a4640defd993b25b Mon Sep 17 00:00:00 2001 From: shortcutme Date: Tue, 10 Jul 2018 03:33:32 +0200 Subject: [PATCH] Trackers loaded from trackers_file will be appended to trackers instead of replacing it --- src/Config.py | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/src/Config.py b/src/Config.py index 36fa6b67..bc5d82a1 100644 --- a/src/Config.py +++ b/src/Config.py @@ -269,10 +269,19 @@ class Config(object): return self.parser def loadTrackersFile(self): - self.trackers = [] - for tracker in open(self.trackers_file): - if "://" in tracker: - self.trackers.append(tracker.strip()) + if not self.trackers_file: + return None + + self.trackers = self.arguments.trackers[:] + + try: + for line in open(self.trackers_file): + tracker = line.strip() + if "://" in tracker and tracker not in self.trackers: + self.trackers.append(tracker) + except Exception as err: + print "Error loading trackers files: %s" % err + # Find arguments specified for current action def getActionArguments(self):