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

Calculate diff right befor publish

Browse source
This commit is contained in:
HelloZeroNet 2016-04-07 10:34:30 +02:00
parent a397253695
commit 6e65169a9d
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/Ui/UiWebsocket.py
View file

@ -318,10 +318,9 @@ class UiWebsocket(object):
self.site.saveSettings() self.site.saveSettings()
self.site.announce() self.site.announce()
diffs = self.site.content_manager.getDiffs(inner_path)
event_name = "publish %s %s" % (self.site.address, inner_path) event_name = "publish %s %s" % (self.site.address, inner_path)
called_instantly = RateLimit.isAllowed(event_name, 30) called_instantly = RateLimit.isAllowed(event_name, 30)
thread = RateLimit.callAsync(event_name, 30, self.site.publish, 5, inner_path, diffs=diffs) # Only publish once in 30 seconds to 5 peer thread = RateLimit.callAsync(event_name, 30, self.doSitePublish, inner_path) # Only publish once in 30 seconds
notification = "linked" not in dir(thread) # Only display notification on first callback notification = "linked" not in dir(thread) # Only display notification on first callback
thread.linked = True thread.linked = True
if called_instantly: # Allowed to call instantly if called_instantly: # Allowed to call instantly
@ -336,6 +335,9 @@ class UiWebsocket(object):
# At the end display notification # At the end display notification
thread.link(lambda thread: self.cbSitePublish(to, thread, notification, callback=False)) thread.link(lambda thread: self.cbSitePublish(to, thread, notification, callback=False))
def doSitePublish(self, inner_path):
diffs = self.site.content_manager.getDiffs(inner_path)
return self.site.publish(limit=5, inner_path=inner_path, diffs=diffs)
# Callback of site publish # Callback of site publish
def cbSitePublish(self, to, thread, notification=True, callback=True): def cbSitePublish(self, to, thread, notification=True, callback=True):
@ -386,7 +388,6 @@ class UiWebsocket(object):
if self.site.storage.isFile(inner_path+"-old"): if self.site.storage.isFile(inner_path+"-old"):
self.site.storage.delete(inner_path+"-old") self.site.storage.delete(inner_path+"-old")
self.site.storage.rename(inner_path, inner_path+"-old") self.site.storage.rename(inner_path, inner_path+"-old")
self.log.debug("%s renamed to %s" % (inner_path, inner_path+"-old"))
self.site.storage.write(inner_path, content) self.site.storage.write(inner_path, content)
except Exception, err: except Exception, err: