From e9b98b82cece5444ca8b3f8c9463a62f83b439dc Mon Sep 17 00:00:00 2001 From: Bob Mottram Date: Thu, 16 Dec 2021 22:26:46 +0000 Subject: [PATCH] Dash instead of hash --- daemon.py | 1 - newswire.py | 2 +- webapp_column_right.py | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/daemon.py b/daemon.py index 04a6fd22b..f27c50256 100644 --- a/daemon.py +++ b/daemon.py @@ -7412,7 +7412,6 @@ class PubServer(BaseHTTPRequestHandler): """Shows a favicon image obtained from the cache """ mediaFilename = baseDir + urllib.parse.unquote_plus(path) - print('showCachedFavicon: ' + mediaFilename) if not os.path.isfile(mediaFilename): self._404() return diff --git a/newswire.py b/newswire.py index 49954a867..ceab0dcec 100644 --- a/newswire.py +++ b/newswire.py @@ -156,7 +156,7 @@ def _downloadNewswireFeedFavicon(session, baseDir: str, return False if not os.path.isdir(baseDir + '/favicons'): os.mkdir(baseDir + '/favicons') - linkFilename = favUrl.replace('/', '#') + linkFilename = favUrl.replace('/', '-') imageFilename = baseDir + '/favicons/' + linkFilename if os.path.isfile(imageFilename): return True diff --git a/webapp_column_right.py b/webapp_column_right.py index fb7fc78c6..4cf7a005b 100644 --- a/webapp_column_right.py +++ b/webapp_column_right.py @@ -240,7 +240,7 @@ def _htmlNewswire(baseDir: str, newswire: {}, nickname: str, moderator: bool, faviconUrl = getNewswireFaviconUrl(url) faviconLink = '' if faviconUrl: - favBase = '/favicons/' + faviconUrl.replace('/', '#') + favBase = '/favicons/' + faviconUrl.replace('/', '-') cachedFaviconFilename = baseDir + favBase if os.path.isfile(cachedFaviconFilename): faviconUrl = favBase