From 54319bd38d25980810fca6ff5e69acfacb7e1510 Mon Sep 17 00:00:00 2001 From: Bob Mottram Date: Tue, 23 Apr 2024 10:23:31 +0100 Subject: [PATCH] Tidying --- daemon_get.py | 17 +++++++++++++---- daemon_get_favicon.py | 33 +++++++++++++++++---------------- 2 files changed, 30 insertions(+), 20 deletions(-) diff --git a/daemon_get.py b/daemon_get.py index ea0169ea3..cabb57233 100644 --- a/daemon_get.py +++ b/daemon_get.py @@ -541,13 +541,17 @@ def daemon_http_get(self) -> None: if 'newswire_favicon.ico' in self.path: get_favicon(self, calling_domain, self.server.base_dir, self.server.debug, - 'newswire_favicon.ico') + 'newswire_favicon.ico', + self.server.iconsCache, + self.server.domain_full) return # favicon image if 'favicon.ico' in self.path: get_favicon(self, calling_domain, self.server.base_dir, - self.server.debug, 'favicon.ico') + self.server.debug, 'favicon.ico', + self.server.iconsCache, + self.server.domain_full) return # check authorization @@ -1308,11 +1312,16 @@ def daemon_http_get(self) -> None: if self.server.domain_full in self.path: # favicon for this instance get_favicon(self, calling_domain, self.server.base_dir, - self.server.debug, 'favicon.ico') + self.server.debug, 'favicon.ico', + self.server.iconsCache, + self.server.domain_full) return show_cached_favicon(self, referer_domain, self.path, self.server.base_dir, - getreq_start_time) + getreq_start_time, + self.server.favicons_cache, + self.server.fitness, + self.server.debug) return # get css diff --git a/daemon_get_favicon.py b/daemon_get_favicon.py index 9616ee669..afe90e7ea 100644 --- a/daemon_get_favicon.py +++ b/daemon_get_favicon.py @@ -23,7 +23,8 @@ from utils import binary_is_image def get_favicon(self, calling_domain: str, base_dir: str, debug: bool, - fav_filename: str) -> None: + fav_filename: str, + icons_cache: {}, domain_full: str) -> None: """Return the site favicon or default newswire favicon """ fav_type = 'image/x-icon' @@ -68,12 +69,12 @@ def get_favicon(self, calling_domain: str, print('favicon icon has not changed: ' + calling_domain) http_304(self) return - if self.server.iconsCache.get(fav_filename): - fav_binary = self.server.iconsCache[fav_filename] + if icons_cache.get(fav_filename): + fav_binary = icons_cache[fav_filename] set_headers_etag(self, favicon_filename, fav_type, fav_binary, None, - self.server.domain_full, + domain_full, False, None) write2(self, fav_binary) if debug: @@ -90,10 +91,10 @@ def get_favicon(self, calling_domain: str, set_headers_etag(self, favicon_filename, fav_type, fav_binary, None, - self.server.domain_full, + domain_full, False, None) write2(self, fav_binary) - self.server.iconsCache[fav_filename] = fav_binary + icons_cache[fav_filename] = fav_binary if debug: print('Sent favicon from file: ' + calling_domain) return @@ -103,14 +104,16 @@ def get_favicon(self, calling_domain: str, def show_cached_favicon(self, referer_domain: str, path: str, - base_dir: str, getreq_start_time) -> None: + base_dir: str, getreq_start_time, + favicons_cache: {}, + fitness: {}, debug: bool) -> None: """Shows a favicon image obtained from the cache """ fav_file = path.replace('/favicons/', '') fav_filename = base_dir + urllib.parse.unquote_plus(path) print('showCachedFavicon: ' + fav_filename) - if self.server.favicons_cache.get(fav_file): - media_binary = self.server.favicons_cache[fav_file] + if favicons_cache.get(fav_file): + media_binary = favicons_cache[fav_file] mime_type = media_file_mime_type(fav_filename) set_headers_etag(self, fav_filename, mime_type, @@ -118,9 +121,8 @@ def show_cached_favicon(self, referer_domain: str, path: str, referer_domain, False, None) write2(self, media_binary) - fitness_performance(getreq_start_time, self.server.fitness, - '_GET', '_show_cached_favicon2', - self.server.debug) + fitness_performance(getreq_start_time, fitness, + '_GET', '_show_cached_favicon2', debug) return if not os.path.isfile(fav_filename): http_404(self, 44) @@ -144,10 +146,9 @@ def show_cached_favicon(self, referer_domain: str, path: str, referer_domain, False, None) write2(self, media_binary) - fitness_performance(getreq_start_time, self.server.fitness, - '_GET', '_show_cached_favicon', - self.server.debug) - self.server.favicons_cache[fav_file] = media_binary + fitness_performance(getreq_start_time, fitness, + '_GET', '_show_cached_favicon', debug) + favicons_cache[fav_file] = media_binary return else: print('WARN: favicon is not an image ' + fav_filename)