mj-saunders
/
epicyon
forked from indymedia/epicyon
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Save newswire state at time of vote changes

main
Bob Mottram 2020-10-09 10:13:16 +01:00
parent 344617f8c9
commit f405dbead3
2 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
daemon.py
View File

@ -4721,6 +4721,12 @@ class PubServer(BaseHTTPRequestHandler):
if 'vote:' + nickname not in newswire[dateStr][2]: if 'vote:' + nickname not in newswire[dateStr][2]:
newswire[dateStr][2].append('vote:' + nickname) newswire[dateStr][2].append('vote:' + nickname)
filename = newswire[dateStr][3] filename = newswire[dateStr][3]
try:
newswireStateFilename = \
baseDir + '/accounts/.newswirestate.json'
saveJson(newswire, newswireStateFilename)
except Exception as e:
print('ERROR saving newswire state, ' + str(e))
if filename: if filename:
saveJson(newswire[dateStr][2], saveJson(newswire[dateStr][2],
filename + '.votes') filename + '.votes')
@ -4762,6 +4768,12 @@ class PubServer(BaseHTTPRequestHandler):
if 'vote:' + nickname in newswire[dateStr][2]: if 'vote:' + nickname in newswire[dateStr][2]:
newswire[dateStr][2].remove('vote:' + nickname) newswire[dateStr][2].remove('vote:' + nickname)
filename = newswire[dateStr][3] filename = newswire[dateStr][3]
try:
newswireStateFilename = \
baseDir + '/accounts/.newswirestate.json'
saveJson(newswire, newswireStateFilename)
except Exception as e:
print('ERROR saving newswire state, ' + str(e))
if filename: if filename:
saveJson(newswire[dateStr][2], saveJson(newswire[dateStr][2],
filename + '.votes') filename + '.votes')

8
newsdaemon.py
View File

@ -146,7 +146,7 @@ def runNewswireDaemon(baseDir: str, httpd,
translate: {}) -> None: translate: {}) -> None:
"""Periodically updates RSS feeds """Periodically updates RSS feeds
""" """
newswireFilename = baseDir + '/accounts/.currentnewswire.json' newswireStateFilename = baseDir + '/accounts/.newswirestate.json'
# initial sleep to allow the system to start up # initial sleep to allow the system to start up
time.sleep(50) time.sleep(50)
@ -167,13 +167,13 @@ def runNewswireDaemon(baseDir: str, httpd,
continue continue
if not httpd.newswire: if not httpd.newswire:
if os.path.isfile(newswireFilename): if os.path.isfile(newswireStateFilename):
httpd.newswire = loadJson(newswireFilename) httpd.newswire = loadJson(newswireStateFilename)
mergeWithPreviousNewswire(httpd.newswire, newNewswire) mergeWithPreviousNewswire(httpd.newswire, newNewswire)
httpd.newswire = newNewswire httpd.newswire = newNewswire
saveJson(httpd.newswire, newswireFilename) saveJson(httpd.newswire, newswireStateFilename)
print('Newswire updated') print('Newswire updated')
convertRSStoActivityPub(baseDir, convertRSStoActivityPub(baseDir,