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

Rev3165, Avoid UI block when rubilding a merger site

Browse source
This commit is contained in:
shortcutme 2017-12-12 11:06:32 +01:00
parent e86375f721
commit 8ab7d26cd1
No known key found for this signature in database
GPG key ID: 5B63BAE6CB9613AE
2 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
plugins/MergerSite/MergerSitePlugin.py
View file

@ -258,6 +258,7 @@ class SiteStoragePlugin(object):
for address, merged_type in merged_db.iteritems() for address, merged_type in merged_db.iteritems()
if merged_type in merger_types if merged_type in merger_types
] ]
found = 0
for merged_site in merged_sites: for merged_site in merged_sites:
self.log.debug("Loading merged site: %s" % merged_site) self.log.debug("Loading merged site: %s" % merged_site)
merged_type = merged_db[merged_site.address] merged_type = merged_db[merged_site.address]
@ -280,6 +281,9 @@ class SiteStoragePlugin(object):
yield merged_inner_path, merged_site.storage.getPath(file_inner_path) yield merged_inner_path, merged_site.storage.getPath(file_inner_path)
else: else:
merged_site.log.error("[MISSING] %s" % file_inner_path) merged_site.log.error("[MISSING] %s" % file_inner_path)
found += 1
if found % 100 == 0:
time.sleep(0.000001) # Context switch to avoid UI block
# Also notice merger sites on a merged site file change # Also notice merger sites on a merged site file change
def onUpdated(self, inner_path, file=None): def onUpdated(self, inner_path, file=None):

2
src/Config.py
View file

@ -10,7 +10,7 @@ class Config(object):
def __init__(self, argv): def __init__(self, argv):
self.version = "0.6.0" self.version = "0.6.0"
self.rev = 3164 self.rev = 3165
self.argv = argv self.argv = argv
self.action = None self.action = None
self.config_file = "zeronet.conf" self.config_file = "zeronet.conf"