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

Tidying

main
Bob Mottram 2020-10-08 13:52:15 +01:00
parent 12b37b81d3
commit e465b91647
1 changed files with 1 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
newsdaemon.py
View File

@ -11,10 +11,8 @@ import time
from collections import OrderedDict from collections import OrderedDict
from newswire import getDictFromNewswire from newswire import getDictFromNewswire
from posts import createNewsPost from posts import createNewsPost
from inbox import individualPostAsHtml
from utils import saveJson from utils import saveJson
from utils import getStatusNumber from utils import getStatusNumber
from webinterface import getIconsDir
def updateFeedsIndex(baseDir: str, domain: str, postId: str) -> None: def updateFeedsIndex(baseDir: str, domain: str, postId: str) -> None:
@ -71,15 +69,9 @@ def convertRSStoActivityPub(baseDir: str, httpPrefix: str,
# file where the post is stored # file where the post is stored
filename = basePath + '/' + newPostId.replace('/', '#') + '.json' filename = basePath + '/' + newPostId.replace('/', '#') + '.json'
if os.path.isfile(filename): if os.path.isfile(filename):
# if a local post exists as html then change the link # don't create the post if it already exists
# to the local one
#htmlFilename = \
# baseDir + '/accounts/news@' + domain + \
# '/postcache/' + newPostId.replace('/', '#') + '.html'
#if os.path.isfile(htmlFilename):
newswire[originalDateStr][1] = \ newswire[originalDateStr][1] = \
'/users/news/statuses/' + statusNumber '/users/news/statuses/' + statusNumber
# don't create the post if it already exists
continue continue
rssTitle = item[0] rssTitle = item[0]
@ -126,17 +118,6 @@ def convertRSStoActivityPub(baseDir: str, httpPrefix: str,
# save the post and update the index # save the post and update the index
if saveJson(blog, filename): if saveJson(blog, filename):
updateFeedsIndex(baseDir, domain, postId + '.json') updateFeedsIndex(baseDir, domain, postId + '.json')
# convert json to html
iconsDir = getIconsDir(baseDir)
pageNumber = -999
#individualPostAsHtml(True, recentPostsCache, maxRecentPosts,
# iconsDir, translate, pageNumber,
# baseDir, session, cachedWebfingers,
# personCache,
# 'news', domain, port, blog,
# None, True, False,
# httpPrefix, __version__, 'outbox',
# True, True, True, False, True)
newswire[originalDateStr][1] = \ newswire[originalDateStr][1] = \
'/users/news/statuses/' + statusNumber '/users/news/statuses/' + statusNumber