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

Extra condition

main
Bob Mottram 2020-07-25 23:42:07 +01:00
parent b4843e1408
commit d9c20676a0
1 changed files with 33 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
daemon.py
View File

@ -1911,39 +1911,40 @@ class PubServer(BaseHTTPRequestHandler):
self._benchmarkGETtimings(GETstartTime, GETtimings, 17)
for ext in ('webp', 'gif', 'jpg', 'png'):
for bg in ('follow', 'options', 'login'):
# follow screen background image
if self.path == '/' + bg + '-background.' + ext:
mediaFilename = \
self.server.baseDir + '/accounts/' + \
bg + '-background.' + ext
if os.path.isfile(mediaFilename):
if self._etag_exists(mediaFilename):
# The file has not changed
self._304()
return
if '-background.' in self.path:
for ext in ('webp', 'gif', 'jpg', 'png'):
for bg in ('follow', 'options', 'login'):
# follow screen background image
if self.path == '/' + bg + '-background.' + ext:
mediaFilename = \
self.server.baseDir + '/accounts/' + \
bg + '-background.' + ext
if os.path.isfile(mediaFilename):
if self._etag_exists(mediaFilename):
# The file has not changed
self._304()
return
tries = 0
mediaBinary = None
while tries < 5:
try:
with open(mediaFilename, 'rb') as avFile:
mediaBinary = avFile.read()
break
except Exception as e:
print(e)
time.sleep(1)
tries += 1
if mediaBinary:
self._set_headers_etag(mediaFilename,
'image/' + ext,
mediaBinary, cookie,
callingDomain)
self._write(mediaBinary)
return
self._404()
return
tries = 0
mediaBinary = None
while tries < 5:
try:
with open(mediaFilename, 'rb') as avFile:
mediaBinary = avFile.read()
break
except Exception as e:
print(e)
time.sleep(1)
tries += 1
if mediaBinary:
self._set_headers_etag(mediaFilename,
'image/' + ext,
mediaBinary, cookie,
callingDomain)
self._write(mediaBinary)
return
self._404()
return
self._benchmarkGETtimings(GETstartTime, GETtimings, 18)