Support absolute path and {data_dir} variable for trackers_file

This commit is contained in:
shortcutme 2019-01-20 03:16:37 +01:00
parent c7a468eb14
commit b66676de85
No known key found for this signature in database
GPG key ID: 5B63BAE6CB9613AE

View file

@ -290,7 +290,14 @@ class Config(object):
self.trackers = self.arguments.trackers[:] self.trackers = self.arguments.trackers[:]
try: 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() tracker = line.strip()
if "://" in tracker and tracker not in self.trackers: if "://" in tracker and tracker not in self.trackers:
self.trackers.append(tracker) self.trackers.append(tracker)