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

Use etags on icons

main
Bob Mottram 2020-04-13 21:14:46 +01:00
parent e08aa14c22
commit 677b505013
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
daemon.py
View File

@ -1670,18 +1670,26 @@ class PubServer(BaseHTTPRequestHandler):
mediaStr = self.path.split('/icons/')[1] mediaStr = self.path.split('/icons/')[1]
mediaFilename = \ mediaFilename = \
self.server.baseDir + '/img/icons/' + mediaStr self.server.baseDir + '/img/icons/' + mediaStr
if self._etag_exists(mediaFilename):
# The file has not changed
self._304()
return
if self.server.iconsCache.get(mediaStr): if self.server.iconsCache.get(mediaStr):
mediaBinary = self.server.iconsCache[mediaStr] mediaBinary = self.server.iconsCache[mediaStr]
self._set_headers('image/png', len(mediaBinary), self._set_headers_etag(mediaFilename,
cookie, callingDomain) 'image/png',
mediaBinary, cookie,
callingDomain)
self._write(mediaBinary) self._write(mediaBinary)
return return
else: else:
if os.path.isfile(mediaFilename): if os.path.isfile(mediaFilename):
with open(mediaFilename, 'rb') as avFile: with open(mediaFilename, 'rb') as avFile:
mediaBinary = avFile.read() mediaBinary = avFile.read()
self._set_headers('image/png', len(mediaBinary), self._set_headers_etag(mediaFilename,
cookie, callingDomain) 'image/png',
mediaBinary, cookie,
callingDomain)
self._write(mediaBinary) self._write(mediaBinary)
self.server.iconsCache[mediaStr] = mediaBinary self.server.iconsCache[mediaStr] = mediaBinary
return return