oci/zeronet
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

AnnounceShare compatibility with refactored port checker

Browse source
This commit is contained in:
shortcutme 2019-01-20 19:12:11 +01:00
parent 8384c2cba3
commit da538f6424
No known key found for this signature in database
GPG key ID: 5B63BAE6CB9613AE
1 changed files with 15 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
plugins/AnnounceShare/AnnounceSharePlugin.py
View file

@ -9,22 +9,13 @@ import gevent
from Config import config from Config import config
from Plugin import PluginManager from Plugin import PluginManager
from util import helper from util import helper
import util
class TrackerStorage(object): class TrackerStorage(object):
def __init__(self): def __init__(self):
self.log = logging.getLogger("TrackerStorage") self.log = logging.getLogger("TrackerStorage")
self.file_path = "%s/trackers.json" % config.data_dir self.file_path = "%s/trackers.json" % config.data_dir
self.file_content = self.load() self.load()
trackers = self.getTrackers()
self.log.debug("Loaded %s shared trackers" % len(trackers))
for address, tracker in trackers.items():
tracker["num_error"] = 0
if not address.startswith("zero://"):
del trackers[address]
self.time_discover = 0.0 self.time_discover = 0.0
atexit.register(self.save) atexit.register(self.save)
@ -89,7 +80,7 @@ class TrackerStorage(object):
} }
return trackers return trackers
def load(self): def getFileContent(self):
if not os.path.isfile(self.file_path): if not os.path.isfile(self.file_path):
open(self.file_path, "w").write("{}") open(self.file_path, "w").write("{}")
return self.getDefaultFile() return self.getDefaultFile()
@ -99,6 +90,16 @@ class TrackerStorage(object):
self.log.error("Error loading trackers list: %s" % err) self.log.error("Error loading trackers list: %s" % err)
return self.getDefaultFile() return self.getDefaultFile()
def load(self):
self.file_content = self.getFileContent()
trackers = self.getTrackers()
self.log.debug("Loaded %s shared trackers" % len(trackers))
for address, tracker in trackers.items():
tracker["num_error"] = 0
if not address.startswith("zero://"):
del trackers[address]
def save(self): def save(self):
s = time.time() s = time.time()
helper.atomicWrite(self.file_path, json.dumps(self.file_content, indent=2, sort_keys=True)) helper.atomicWrite(self.file_path, json.dumps(self.file_content, indent=2, sort_keys=True))
@ -169,13 +170,14 @@ class FileRequestPlugin(object):
@PluginManager.registerTo("FileServer") @PluginManager.registerTo("FileServer")
class FileServerPlugin(object): class FileServerPlugin(object):
def openport(self, *args, **kwargs): def portCheck(self, *args, **kwargs):
res = super(FileServerPlugin, self).openport(*args, **kwargs) res = super(FileServerPlugin, self).portCheck(*args, **kwargs)
if res and not config.tor == "always" and "Bootstrapper" in PluginManager.plugin_manager.plugin_names: if res and not config.tor == "always" and "Bootstrapper" in PluginManager.plugin_manager.plugin_names:
my_tracker_address = "zero://%s:%s" % (config.ip_external, config.fileserver_port) my_tracker_address = "zero://%s:%s" % (config.ip_external, config.fileserver_port)
tracker_storage.onTrackerFound(my_tracker_address, my=True) tracker_storage.onTrackerFound(my_tracker_address, my=True)
return res return res
@PluginManager.registerTo("ConfigPlugin") @PluginManager.registerTo("ConfigPlugin")
class ConfigPlugin(object): class ConfigPlugin(object):
def createArguments(self): def createArguments(self):