indymedia
/
epicyon
mirror of https://gitlab.com/bashrc2/epicyon
7
4
Fork 1
Code Issues 14 Releases Wiki Activity

Remove from recent posts cache when clearing post

merge-requests/8/head
Bob Mottram 2020-10-18 21:06:52 +01:00
parent dcf34cd3c2
commit ee6b6b7662
3 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
daemon.py
View File

@ -3147,7 +3147,8 @@ class PubServer(BaseHTTPRequestHandler):
# remove any previous cached news posts # remove any previous cached news posts
newsId = \ newsId = \
postJsonObject['object']['id'].replace('/', '#') postJsonObject['object']['id'].replace('/', '#')
clearFromPostCaches(baseDir, newsId) clearFromPostCaches(baseDir, self.server.recentPostsCache,
newsId)
# save the news post # save the news post
saveJson(postJsonObject, postFilename) saveJson(postJsonObject, postFilename)

2
newsdaemon.py
View File

@ -491,7 +491,7 @@ def convertRSStoActivityPub(baseDir: str, httpPrefix: str,
storeHashTags(baseDir, 'news', blog) storeHashTags(baseDir, 'news', blog)
clearFromPostCaches(baseDir, postId) clearFromPostCaches(baseDir, recentPostsCache, postId)
if saveJson(blog, filename): if saveJson(blog, filename):
updateFeedsOutboxIndex(baseDir, domain, postId + '.json') updateFeedsOutboxIndex(baseDir, domain, postId + '.json')

21
utils.py
View File

@ -587,7 +587,8 @@ def locateNewsArrival(baseDir: str, domain: str,
return None return None
def clearFromPostCaches(baseDir: str, postId: str) -> None: def clearFromPostCaches(baseDir: str, recentPostsCache: {},
postId: str) -> None:
"""Clears cached html for the given post, so that edits """Clears cached html for the given post, so that edits
to news will appear to news will appear
""" """
@ -608,6 +609,16 @@ def clearFromPostCaches(baseDir: str, postId: str) -> None:
print('WARN: clearFromPostCaches file not removed ' + print('WARN: clearFromPostCaches file not removed ' +
postFilename) postFilename)
pass pass
# if the post is in the recent posts cache then remove it
if recentPostsCache.get('index'):
if postId in recentPostsCache['index']:
recentPostsCache['index'].remove(postId)
if recentPostsCache.get('json'):
if recentPostsCache['json'].get(postId):
del recentPostsCache['json'][postId]
if recentPostsCache.get('html'):
if recentPostsCache['html'].get(postId):
del recentPostsCache['html'][postId]
def locatePost(baseDir: str, nickname: str, domain: str, def locatePost(baseDir: str, nickname: str, domain: str,
@ -742,8 +753,12 @@ def deletePost(baseDir: str, httpPrefix: str,
if recentPostsCache.get('index'): if recentPostsCache.get('index'):
if postId in recentPostsCache['index']: if postId in recentPostsCache['index']:
recentPostsCache['index'].remove(postId) recentPostsCache['index'].remove(postId)
if recentPostsCache['json'].get(postId): if recentPostsCache.get('json'):
del recentPostsCache['json'][postId] if recentPostsCache['json'].get(postId):
del recentPostsCache['json'][postId]
if recentPostsCache.get('html'):
if recentPostsCache['html'].get(postId):
del recentPostsCache['html'][postId]
# remove any attachment # remove any attachment
removeAttachment(baseDir, httpPrefix, domain, postJsonObject) removeAttachment(baseDir, httpPrefix, domain, postJsonObject)