From 33d5ea22dea3b27fff9e99ca5fc2ba8e5c628620 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Wed, 2 Sep 2020 13:01:26 +0100
Subject: [PATCH] Move background image to its own method

---
 daemon.py | 90 ++++++++++++++++++++++++++++++-------------------------
 1 file changed, 50 insertions(+), 40 deletions(-)

diff --git a/daemon.py b/daemon.py
index c602a871b..b90282527 100644
--- a/daemon.py
+++ b/daemon.py
@@ -6948,6 +6948,52 @@ class PubServer(BaseHTTPRequestHandler):
         self._404()
         return True
 
+    def _showBackgroundImage(self, callingDomain: str, path: str,
+                             baseDir: str,
+                             GETstartTime, GETtimings: {}) -> bool:
+        """Show a background image
+        """
+        for ext in ('webp', 'gif', 'jpg', 'png'):
+            for bg in ('follow', 'options', 'login'):
+                # follow screen background image
+                if path.endswith('/' + bg + '-background.' + ext):
+                    bgFilename = \
+                        baseDir + '/accounts/' + \
+                        bg + '-background.' + ext
+                    if os.path.isfile(bgFilename):
+                        if self._etag_exists(bgFilename):
+                            # The file has not changed
+                            self._304()
+                            return True
+
+                        tries = 0
+                        bgBinary = None
+                        while tries < 5:
+                            try:
+                                with open(bgFilename, 'rb') as avFile:
+                                    bgBinary = avFile.read()
+                                    break
+                            except Exception as e:
+                                print(e)
+                                time.sleep(1)
+                                tries += 1
+                        if bgBinary:
+                            if ext == 'jpg':
+                                ext = 'jpeg'
+                            self._set_headers_etag(bgFilename,
+                                                   'image/' + ext,
+                                                   bgBinary, None,
+                                                   callingDomain)
+                            self._write(bgBinary)
+                            self._benchmarkGETtimings(GETstartTime,
+                                                      GETtimings,
+                                                      'search screen ' +
+                                                      'banner done',
+                                                      'background shown')
+                            return True
+        self._404()
+        return True
+
     def do_GET(self):
         callingDomain = self.server.domainFull
         if self.headers.get('Host'):
@@ -7582,46 +7628,10 @@ class PubServer(BaseHTTPRequestHandler):
                                   'search screen banner done')
 
         if '-background.' in self.path:
-            for ext in ('webp', 'gif', 'jpg', 'png'):
-                for bg in ('follow', 'options', 'login'):
-                    # follow screen background image
-                    if self.path.endswith('/' + bg + '-background.' + ext):
-                        bgFilename = \
-                            self.server.baseDir + '/accounts/' + \
-                            bg + '-background.' + ext
-                        if os.path.isfile(bgFilename):
-                            if self._etag_exists(bgFilename):
-                                # The file has not changed
-                                self._304()
-                                return
-
-                            tries = 0
-                            bgBinary = None
-                            while tries < 5:
-                                try:
-                                    with open(bgFilename, 'rb') as avFile:
-                                        bgBinary = avFile.read()
-                                        break
-                                except Exception as e:
-                                    print(e)
-                                    time.sleep(1)
-                                    tries += 1
-                            if bgBinary:
-                                if ext == 'jpg':
-                                    ext = 'jpeg'
-                                self._set_headers_etag(bgFilename,
-                                                       'image/' + ext,
-                                                       bgBinary, cookie,
-                                                       callingDomain)
-                                self._write(bgBinary)
-                                self._benchmarkGETtimings(GETstartTime,
-                                                          GETtimings,
-                                                          'search screen ' +
-                                                          'banner done',
-                                                          'background shown')
-                                return
-            self._404()
-            return
+            if self._showBackgroundImage(callingDomain, self.path,
+                                         self.server.baseDir,
+                                         GETstartTime, GETtimings):
+                return
 
         self._benchmarkGETtimings(GETstartTime, GETtimings,
                                   'search screen banner done',