From e1b349c0fc91b4927270907074be4fcc9fcb75a0 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Thu, 16 Dec 2021 22:01:12 +0000
Subject: [PATCH] Favicon path

---
 daemon.py   | 2 +-
 newswire.py | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/daemon.py b/daemon.py
index dbcd23ba9..19af15a2d 100644
--- a/daemon.py
+++ b/daemon.py
@@ -7411,7 +7411,7 @@ class PubServer(BaseHTTPRequestHandler):
                            baseDir: str, GETstartTime) -> None:
         """Shows a favicon image obtained from the cache
         """
-        mediaFilename = baseDir + '/favicons' + path
+        mediaFilename = baseDir + path
         if os.path.isfile(mediaFilename):
             if self._etag_exists(mediaFilename):
                 # The file has not changed
diff --git a/newswire.py b/newswire.py
index 907eb40c4..49954a867 100644
--- a/newswire.py
+++ b/newswire.py
@@ -147,16 +147,16 @@ def _downloadNewswireFeedFavicon(session, baseDir: str,
                                  link: str, debug: bool) -> bool:
     """Downloads the favicon for the given feed link
     """
-    url = getNewswireFaviconUrl(link)
+    favUrl = getNewswireFaviconUrl(link)
     if '://' not in link:
         return False
     timeoutSec = 10
-    imageData = getImageBinaryFromUrl(session, url, timeoutSec, debug)
+    imageData = getImageBinaryFromUrl(session, favUrl, timeoutSec, debug)
     if not imageData:
         return False
     if not os.path.isdir(baseDir + '/favicons'):
         os.mkdir(baseDir + '/favicons')
-    linkFilename = url.replace('/', '#')
+    linkFilename = favUrl.replace('/', '#')
     imageFilename = baseDir + '/favicons/' + linkFilename
     if os.path.isfile(imageFilename):
         return True
@@ -164,7 +164,7 @@ def _downloadNewswireFeedFavicon(session, baseDir: str,
         with open(imageFilename, 'wb+') as fp:
             fp.write(imageData)
     except OSError:
-        print('EX: failed writing favicon ' + url)
+        print('EX: failed writing favicon ' + favUrl)
         return False
     return True