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

Move site add to separate function

Browse source
This commit is contained in:
shortcutme 2019-09-28 17:01:37 +02:00
parent 6bb929a896
commit b21b885aa9
No known key found for this signature in database
GPG key ID: 5B63BAE6CB9613AE
1 changed files with 22 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
src/Site/SiteManager.py
View file

@ -152,6 +152,27 @@ class SiteManager(object):
return site return site
def add(self, address, all_file=False, settings=None):
from .Site import Site
self.sites_changed = int(time.time())
# Try to find site with differect case
for recover_address, recover_site in list(self.sites.items()):
if recover_address.lower() == address.lower():
return recover_site
if not self.isAddress(address):
return False # Not address: %s % address
self.log.debug("Added new site: %s" % address)
config.loadTrackersFile()
site = Site(address, settings=settings)
self.sites[address] = site
if not site.settings["serving"]: # Maybe it was deleted before
site.settings["serving"] = True
site.saveSettings()
if all_file: # Also download user files on first sync
site.download(check_size=True, blind_includes=True)
return site
# Return or create site and start download site files # Return or create site and start download site files
def need(self, address, all_file=True, settings=None): def need(self, address, all_file=True, settings=None):
if self.isDomain(address): if self.isDomain(address):
@ -159,27 +180,9 @@ class SiteManager(object):
if address_resolved: if address_resolved:
address = address_resolved address = address_resolved
from .Site import Site
site = self.get(address) site = self.get(address)
if not site: # Site not exist yet if not site: # Site not exist yet
self.sites_changed = int(time.time()) site = self.add(address, all_file=all_file, settings=settings)
# Try to find site with differect case
for recover_address, recover_site in list(self.sites.items()):
if recover_address.lower() == address.lower():
return recover_site
if not self.isAddress(address):
return False # Not address: %s % address
self.log.debug("Added new site: %s" % address)
config.loadTrackersFile()
site = Site(address, settings=settings)
self.sites[address] = site
if not site.settings["serving"]: # Maybe it was deleted before
site.settings["serving"] = True
site.saveSettings()
if all_file: # Also download user files on first sync
site.download(check_size=True, blind_includes=True)
return site return site
def delete(self, address): def delete(self, address):