From 88cc541f5940695e80a47255f2e0c9d61c110b10 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Mon, 6 Dec 2021 10:21:37 +0000
Subject: [PATCH] Less indentation

---
 daemon.py | 92 ++++++++++++++++++++++++++++---------------------------
 1 file changed, 47 insertions(+), 45 deletions(-)

diff --git a/daemon.py b/daemon.py
index 8b2f7764f..c0244a4fd 100644
--- a/daemon.py
+++ b/daemon.py
@@ -7299,55 +7299,57 @@ class PubServer(BaseHTTPRequestHandler):
                   baseDir: str, GETstartTime) -> None:
         """Shows an icon
         """
-        if path.endswith('.png'):
-            mediaStr = path.split('/icons/')[1]
-            if '/' not in mediaStr:
-                if not self.server.themeName:
-                    theme = 'default'
-                else:
-                    theme = self.server.themeName
-                iconFilename = mediaStr
+        if not path.endswith('.png'):
+            self._404()
+            return
+        mediaStr = path.split('/icons/')[1]
+        if '/' not in mediaStr:
+            if not self.server.themeName:
+                theme = 'default'
             else:
-                theme = mediaStr.split('/')[0]
-                iconFilename = mediaStr.split('/')[1]
-            mediaFilename = \
-                baseDir + '/theme/' + theme + '/icons/' + iconFilename
-            if self._etag_exists(mediaFilename):
-                # The file has not changed
-                self._304()
-                return
-            if self.server.iconsCache.get(mediaStr):
-                mediaBinary = self.server.iconsCache[mediaStr]
-                mimeTypeStr = mediaFileMimeType(mediaFilename)
-                self._set_headers_etag(mediaFilename,
-                                       mimeTypeStr,
-                                       mediaBinary, None,
-                                       self.server.domainFull,
-                                       False, None)
-                self._write(mediaBinary)
+                theme = self.server.themeName
+            iconFilename = mediaStr
+        else:
+            theme = mediaStr.split('/')[0]
+            iconFilename = mediaStr.split('/')[1]
+        mediaFilename = \
+            baseDir + '/theme/' + theme + '/icons/' + iconFilename
+        if self._etag_exists(mediaFilename):
+            # The file has not changed
+            self._304()
+            return
+        if self.server.iconsCache.get(mediaStr):
+            mediaBinary = self.server.iconsCache[mediaStr]
+            mimeTypeStr = mediaFileMimeType(mediaFilename)
+            self._set_headers_etag(mediaFilename,
+                                   mimeTypeStr,
+                                   mediaBinary, None,
+                                   self.server.domainFull,
+                                   False, None)
+            self._write(mediaBinary)
+            fitnessPerformance(GETstartTime, self.server.fitness,
+                               '_GET', '_showIcon', self.server.debug)
+            return
+        else:
+            if os.path.isfile(mediaFilename):
+                mediaBinary = None
+                try:
+                    with open(mediaFilename, 'rb') as avFile:
+                        mediaBinary = avFile.read()
+                except OSError:
+                    print('EX: unable to read icon image ' + mediaFilename)
+                if mediaBinary:
+                    mimeType = mediaFileMimeType(mediaFilename)
+                    self._set_headers_etag(mediaFilename,
+                                           mimeType,
+                                           mediaBinary, None,
+                                           self.server.domainFull,
+                                           False, None)
+                    self._write(mediaBinary)
+                    self.server.iconsCache[mediaStr] = mediaBinary
                 fitnessPerformance(GETstartTime, self.server.fitness,
                                    '_GET', '_showIcon', self.server.debug)
                 return
-            else:
-                if os.path.isfile(mediaFilename):
-                    mediaBinary = None
-                    try:
-                        with open(mediaFilename, 'rb') as avFile:
-                            mediaBinary = avFile.read()
-                    except OSError:
-                        print('EX: unable to read icon image ' + mediaFilename)
-                    if mediaBinary:
-                        mimeType = mediaFileMimeType(mediaFilename)
-                        self._set_headers_etag(mediaFilename,
-                                               mimeType,
-                                               mediaBinary, None,
-                                               self.server.domainFull,
-                                               False, None)
-                        self._write(mediaBinary)
-                        self.server.iconsCache[mediaStr] = mediaBinary
-                    fitnessPerformance(GETstartTime, self.server.fitness,
-                                       '_GET', '_showIcon', self.server.debug)
-                    return
         self._404()
 
     def _showHelpScreenImage(self, callingDomain: str, path: str,