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

Don't exit until all file extensions are tried

main
Bob Mottram 2020-07-26 10:15:51 +01:00
parent 33a5decd1d
commit 666a3f9680
1 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
daemon.py
View File

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