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

Less indentation

merge-requests/30/head
Bob Mottram 2021-12-16 22:21:16 +00:00
parent d5806b1e28
commit f9bbfdd8cd
1 changed files with 25 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
daemon.py
View File

@ -7413,29 +7413,31 @@ class PubServer(BaseHTTPRequestHandler):
""" """
mediaFilename = baseDir + urllib.parse.unquote_plus(path) mediaFilename = baseDir + urllib.parse.unquote_plus(path)
print('showCachedFavicon: ' + mediaFilename) print('showCachedFavicon: ' + mediaFilename)
if os.path.isfile(mediaFilename): if not os.path.isfile(mediaFilename):
if self._etag_exists(mediaFilename): self._404()
# The file has not changed return
self._304() if self._etag_exists(mediaFilename):
return # The file has not changed
mediaBinary = None self._304()
try: return
with open(mediaFilename, 'rb') as avFile: mediaBinary = None
mediaBinary = avFile.read() try:
except OSError: with open(mediaFilename, 'rb') as avFile:
print('EX: unable to read cached favicon ' + mediaFilename) mediaBinary = avFile.read()
if mediaBinary: except OSError:
mimeType = mediaFileMimeType(mediaFilename) print('EX: unable to read cached favicon ' + mediaFilename)
self._set_headers_etag(mediaFilename, if mediaBinary:
mimeType, mimeType = mediaFileMimeType(mediaFilename)
mediaBinary, None, self._set_headers_etag(mediaFilename,
refererDomain, mimeType,
False, None) mediaBinary, None,
self._write(mediaBinary) refererDomain,
fitnessPerformance(GETstartTime, self.server.fitness, False, None)
'_GET', '_showCachedFavicon', self._write(mediaBinary)
self.server.debug) fitnessPerformance(GETstartTime, self.server.fitness,
return '_GET', '_showCachedFavicon',
self.server.debug)
return
self._404() self._404()
def _showCachedAvatar(self, refererDomain: str, path: str, def _showCachedAvatar(self, refererDomain: str, path: str,