From b66676de854e4f0cbb4bd9933f643953bf2ebcf9 Mon Sep 17 00:00:00 2001 From: shortcutme Date: Sun, 20 Jan 2019 03:16:37 +0100 Subject: [PATCH] Support absolute path and {data_dir} variable for trackers_file --- src/Config.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/Config.py b/src/Config.py index 70262fde..cbe9a666 100644 --- a/src/Config.py +++ b/src/Config.py @@ -290,7 +290,14 @@ class Config(object): self.trackers = self.arguments.trackers[:] try: - for line in open(self.start_dir + "/" + self.trackers_file): + if self.trackers_file.startswith("/"): # Absolute + trackers_file_path = self.trackers_file + elif self.trackers_file.startswith("{data_dir}"): # Relative to data_dir + trackers_file_path = self.trackers_file.replace("{data_dir}", self.data_dir) + else: # Relative to zeronet.py + trackers_file_path = self.start_dir + "/" + self.trackers_file + + for line in open(trackers_file_path): tracker = line.strip() if "://" in tracker and tracker not in self.trackers: self.trackers.append(tracker)