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-06 10:21:37 +00:00
parent f54112a15c
commit 88cc541f59
1 changed files with 47 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

92
daemon.py
View File

@ -7299,55 +7299,57 @@ class PubServer(BaseHTTPRequestHandler):
baseDir: str, GETstartTime) -> None: baseDir: str, GETstartTime) -> None:
"""Shows an icon """Shows an icon
""" """
if path.endswith('.png'): if not path.endswith('.png'):
mediaStr = path.split('/icons/')[1] self._404()
if '/' not in mediaStr: return
if not self.server.themeName: mediaStr = path.split('/icons/')[1]
theme = 'default' if '/' not in mediaStr:
else: if not self.server.themeName:
theme = self.server.themeName theme = 'default'
iconFilename = mediaStr
else: else:
theme = mediaStr.split('/')[0] theme = self.server.themeName
iconFilename = mediaStr.split('/')[1] iconFilename = mediaStr
mediaFilename = \ else:
baseDir + '/theme/' + theme + '/icons/' + iconFilename theme = mediaStr.split('/')[0]
if self._etag_exists(mediaFilename): iconFilename = mediaStr.split('/')[1]
# The file has not changed mediaFilename = \
self._304() baseDir + '/theme/' + theme + '/icons/' + iconFilename
return if self._etag_exists(mediaFilename):
if self.server.iconsCache.get(mediaStr): # The file has not changed
mediaBinary = self.server.iconsCache[mediaStr] self._304()
mimeTypeStr = mediaFileMimeType(mediaFilename) return
self._set_headers_etag(mediaFilename, if self.server.iconsCache.get(mediaStr):
mimeTypeStr, mediaBinary = self.server.iconsCache[mediaStr]
mediaBinary, None, mimeTypeStr = mediaFileMimeType(mediaFilename)
self.server.domainFull, self._set_headers_etag(mediaFilename,
False, None) mimeTypeStr,
self._write(mediaBinary) mediaBinary, None,
self.server.domainFull,
False, None)
self._write(mediaBinary)
fitnessPerformance(GETstartTime, self.server.fitness,
'_GET', '_showIcon', self.server.debug)
return
else:
if os.path.isfile(mediaFilename):
mediaBinary = None
try:
with open(mediaFilename, 'rb') as avFile:
mediaBinary = avFile.read()
except OSError:
print('EX: unable to read icon image ' + mediaFilename)
if mediaBinary:
mimeType = mediaFileMimeType(mediaFilename)
self._set_headers_etag(mediaFilename,
mimeType,
mediaBinary, None,
self.server.domainFull,
False, None)
self._write(mediaBinary)
self.server.iconsCache[mediaStr] = mediaBinary
fitnessPerformance(GETstartTime, self.server.fitness, fitnessPerformance(GETstartTime, self.server.fitness,
'_GET', '_showIcon', self.server.debug) '_GET', '_showIcon', self.server.debug)
return return
else:
if os.path.isfile(mediaFilename):
mediaBinary = None
try:
with open(mediaFilename, 'rb') as avFile:
mediaBinary = avFile.read()
except OSError:
print('EX: unable to read icon image ' + mediaFilename)
if mediaBinary:
mimeType = mediaFileMimeType(mediaFilename)
self._set_headers_etag(mediaFilename,
mimeType,
mediaBinary, None,
self.server.domainFull,
False, None)
self._write(mediaBinary)
self.server.iconsCache[mediaStr] = mediaBinary
fitnessPerformance(GETstartTime, self.server.fitness,
'_GET', '_showIcon', self.server.debug)
return
self._404() self._404()
def _showHelpScreenImage(self, callingDomain: str, path: str, def _showHelpScreenImage(self, callingDomain: str, path: str,