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

Reduce indentation

main
Bob Mottram 2020-09-01 11:24:58 +01:00
parent c1ae893bc7
commit 20f33a580f
1 changed files with 178 additions and 225 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

161
daemon.py
View File

@ -4893,51 +4893,43 @@ class PubServer(BaseHTTPRequestHandler):
"""Shows the replies timeline """Shows the replies timeline
Returns true if the timeline was shown Returns true if the timeline was shown
""" """
if '/statuses/' in path and '/users/' in path: if not ('/statuses/' in path and '/users/' in path):
return False
namedStatus = path.split('/users/')[1] namedStatus = path.split('/users/')[1]
if '/' in namedStatus: if '/' not in namedStatus:
return False
postSections = namedStatus.split('/') postSections = namedStatus.split('/')
if len(postSections) >= 4: if len(postSections) < 4:
if postSections[3].startswith('replies'): return False
if not postSections[3].startswith('replies'):
return False
nickname = postSections[0] nickname = postSections[0]
statusNumber = postSections[2] statusNumber = postSections[2]
if len(statusNumber) > 10 and \ if not (len(statusNumber) > 10 and statusNumber.isdigit()):
statusNumber.isdigit(): return False
boxname = 'outbox' boxname = 'outbox'
# get the replies file # get the replies file
postDir = \ postDir = \
baseDir + '/accounts/' + \ baseDir + '/accounts/' + nickname + '@' + domain + '/' + boxname
nickname + '@' + domain+'/' + \
boxname
postRepliesFilename = \ postRepliesFilename = \
postDir + '/' + \ postDir + '/' + \
httpPrefix + ':##' + \ httpPrefix + ':##' + domainFull + '#users#' + \
domainFull + '#users#' + \ nickname + '#statuses#' + statusNumber + '.replies'
nickname + '#statuses#' + \
statusNumber + '.replies'
if not os.path.isfile(postRepliesFilename): if not os.path.isfile(postRepliesFilename):
# There are no replies, # There are no replies,
# so show empty collection # so show empty collection
contextStr = \ contextStr = \
'https://www.w3.org/ns/activitystreams' 'https://www.w3.org/ns/activitystreams'
firstStr = \ firstStr = \
httpPrefix + \ httpPrefix + '://' + domainFull + '/users/' + nickname + \
'://' + domainFull + \ '/statuses/' + statusNumber + '/replies?page=true'
'/users/' + nickname + \
'/statuses/' + statusNumber + \
'/replies?page=true'
idStr = \ idStr = \
httpPrefix + \ httpPrefix + '://' + domainFull + '/users/' + nickname + \
'://' + domainFull + \ '/statuses/' + statusNumber + '/replies'
'/users/' + nickname + \
'/statuses/' + statusNumber + \
'/replies'
lastStr = \ lastStr = \
httpPrefix + \ httpPrefix + '://' + domainFull + '/users/' + nickname + \
'://' + domainFull + \ '/statuses/' + statusNumber + '/replies?page=true'
'/users/' + nickname + \
'/statuses/' + statusNumber + \
'/replies?page=true'
repliesJson = { repliesJson = {
'@context': contextStr, '@context': contextStr,
'first': firstStr, 'first': firstStr,
@ -4948,34 +4940,22 @@ class PubServer(BaseHTTPRequestHandler):
} }
if self._requestHTTP(): if self._requestHTTP():
if not self.server.session: if not self.server.session:
print('DEBUG: ' + print('DEBUG: creating new session during get replies')
'creating new session ' + self.server.session = createSession(proxyType)
'during get replies')
self.server.session = \
createSession(proxyType)
if not self.server.session: if not self.server.session:
print('ERROR: GET failed to ' + print('ERROR: GET failed to create session ' +
'create session ' +
'during get replies') 'during get replies')
self._404() self._404()
self.server.GETbusy = False self.server.GETbusy = False
return return
recentPostsCache = \ recentPostsCache = self.server.recentPostsCache
self.server.recentPostsCache maxRecentPosts = self.server.maxRecentPosts
maxRecentPosts = \ translate = self.server.translate
self.server.maxRecentPosts session = self.server.session
translate = \ cachedWebfingers = self.server.cachedWebfingers
self.server.translate personCache = self.server.personCache
session = \ projectVersion = self.server.projectVersion
self.server.session ytDomain = self.server.YTReplacementDomain
cachedWebfingers = \
self.server.cachedWebfingers
personCache = \
self.server.personCache
projectVersion = \
self.server.projectVersion
ytDomain = \
self.server.YTReplacementDomain
msg = \ msg = \
htmlPostReplies(recentPostsCache, htmlPostReplies(recentPostsCache,
maxRecentPosts, maxRecentPosts,
@ -4992,20 +4972,15 @@ class PubServer(BaseHTTPRequestHandler):
projectVersion, projectVersion,
ytDomain) ytDomain)
msg = msg.encode('utf-8') msg = msg.encode('utf-8')
self._set_headers('text/html', self._set_headers('text/html', len(msg),
len(msg), cookie, callingDomain)
cookie,
callingDomain)
self._write(msg) self._write(msg)
else: else:
if self._fetchAuthenticated(): if self._fetchAuthenticated():
msg = \ msg = json.dumps(repliesJson, ensure_ascii=False)
json.dumps(repliesJson,
ensure_ascii=False)
msg = msg.encode('utf-8') msg = msg.encode('utf-8')
protocolStr = 'application/json' protocolStr = 'application/json'
self._set_headers(protocolStr, self._set_headers(protocolStr, len(msg), None,
len(msg), None,
callingDomain) callingDomain)
self._write(msg) self._write(msg)
else: else:
@ -5015,18 +4990,14 @@ class PubServer(BaseHTTPRequestHandler):
else: else:
# replies exist. Itterate through the # replies exist. Itterate through the
# text file containing message ids # text file containing message ids
contextStr = \ contextStr = 'https://www.w3.org/ns/activitystreams'
'https://www.w3.org/ns/activitystreams'
idStr = \ idStr = \
httpPrefix + \ httpPrefix + '://' + domainFull + \
'://' + domainFull + \
'/users/' + nickname + '/statuses/' + \ '/users/' + nickname + '/statuses/' + \
statusNumber + '?page=true' statusNumber + '?page=true'
partOfStr = \ partOfStr = \
httpPrefix + \ httpPrefix + '://' + domainFull + \
'://' + domainFull + \ '/users/' + nickname + '/statuses/' + statusNumber
'/users/' + nickname + \
'/statuses/' + statusNumber
repliesJson = { repliesJson = {
'@context': contextStr, '@context': contextStr,
'id': idStr, 'id': idStr,
@ -5047,11 +5018,9 @@ class PubServer(BaseHTTPRequestHandler):
# send the replies json # send the replies json
if self._requestHTTP(): if self._requestHTTP():
if not self.server.session: if not self.server.session:
print('DEBUG: ' + print('DEBUG: creating new session ' +
'creating new session ' +
'during get replies 2') 'during get replies 2')
self.server.session = \ self.server.session = createSession(proxyType)
createSession(proxyType)
if not self.server.session: if not self.server.session:
print('ERROR: GET failed to ' + print('ERROR: GET failed to ' +
'create session ' + 'create session ' +
@ -5059,22 +5028,14 @@ class PubServer(BaseHTTPRequestHandler):
self._404() self._404()
self.server.GETbusy = False self.server.GETbusy = False
return return
recentPostsCache = \ recentPostsCache = self.server.recentPostsCache
self.server.recentPostsCache maxRecentPosts = self.server.maxRecentPosts
maxRecentPosts = \ translate = self.server.translate
self.server.maxRecentPosts session = self.server.session
translate = \ cachedWebfingers = self.server.cachedWebfingers
self.server.translate personCache = self.server.personCache
session = \ projectVersion = self.server.projectVersion
self.server.session ytDomain = self.server.YTReplacementDomain
cachedWebfingers = \
self.server.cachedWebfingers
personCache = \
self.server.personCache
projectVersion = \
self.server.projectVersion
ytDomain = \
self.server.YTReplacementDomain
msg = \ msg = \
htmlPostReplies(recentPostsCache, htmlPostReplies(recentPostsCache,
maxRecentPosts, maxRecentPosts,
@ -5084,26 +5045,20 @@ class PubServer(BaseHTTPRequestHandler):
cachedWebfingers, cachedWebfingers,
personCache, personCache,
nickname, nickname,
self.server.domain, domain,
self.server.port, port,
repliesJson, repliesJson,
httpPrefix, httpPrefix,
projectVersion, projectVersion,
ytDomain) ytDomain)
msg = msg.encode('utf-8') msg = msg.encode('utf-8')
self._set_headers('text/html', self._set_headers('text/html', len(msg),
len(msg), cookie, callingDomain)
cookie,
callingDomain)
self._write(msg) self._write(msg)
self._benchmarkGETtimings(GETstartTime, self._benchmarkGETtimings(GETstartTime,
GETtimings, GETtimings,
'indiv' + 'individual post done',
'idual' + 'post replies done')
' post done',
'post ' +
'replies ' +
'done')
else: else:
if self._fetchAuthenticated(): if self._fetchAuthenticated():
msg = \ msg = \
@ -5111,10 +5066,8 @@ class PubServer(BaseHTTPRequestHandler):
ensure_ascii=False) ensure_ascii=False)
msg = msg.encode('utf-8') msg = msg.encode('utf-8')
protocolStr = 'application/json' protocolStr = 'application/json'
self._set_headers(protocolStr, self._set_headers(protocolStr, len(msg),
len(msg), None, callingDomain)
None,
callingDomain)
self._write(msg) self._write(msg)
else: else:
self._404() self._404()