From 01ded187b1978766179782b3e583601b9bdd9c5c Mon Sep 17 00:00:00 2001 From: Bob Mottram Date: Fri, 29 May 2020 13:39:49 +0100 Subject: [PATCH] Variable names --- daemon.py | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/daemon.py b/daemon.py index b8617eea..f6789c91 100644 --- a/daemon.py +++ b/daemon.py @@ -1818,35 +1818,35 @@ class PubServer(BaseHTTPRequestHandler): # favicon image if '/favicon.ico' in self.path: # custom favicon - mediaFilename = \ + faviconFilename = \ self.server.baseDir + '/favicon.ico' - if not os.path.isfile(mediaFilename): + if not os.path.isfile(faviconFilename): # default favicon - mediaFilename = \ + faviconFilename = \ self.server.baseDir + '/img/icons/favicon.ico' - if self._etag_exists(mediaFilename): + if self._etag_exists(faviconFilename): # The file has not changed self._304() return if self.server.iconsCache.get('favicon.ico'): - mediaBinary = self.server.iconsCache['favicon.ico'] - self._set_headers_etag(mediaFilename, + favBinary = self.server.iconsCache['favicon.ico'] + self._set_headers_etag(faviconFilename, 'image/png', - mediaBinary, cookie, + favBinary, cookie, callingDomain) - self._write(mediaBinary) + self._write(favBinary) return else: - if os.path.isfile(mediaFilename): - with open(mediaFilename, 'rb') as avFile: - mediaBinary = avFile.read() - self._set_headers_etag(mediaFilename, + if os.path.isfile(faviconFilename): + with open(faviconFilename, 'rb') as favFile: + favBinary = favFile.read() + self._set_headers_etag(faviconFilename, 'image/png', - mediaBinary, cookie, + favBinary, cookie, callingDomain) - self._write(mediaBinary) - self.server.iconsCache['favicon.ico'] = mediaBinary - return + self._write(favBinary) + self.server.iconsCache['favicon.ico'] = favBinary + return self._404() return