From 929b2dfb38b436a33c29ee38549e6bf9935f98cb Mon Sep 17 00:00:00 2001
From: Tron <tron1point0@gmail.com>
Date: Mon, 15 Oct 2018 05:35:28 -0500
Subject: [PATCH] Factored out scaled image loading into a method so
 CodeClimate (hopefully) stops complaining about cognitive complexity.

---
 gui/bitmap_loader.py | 35 +++++++++++++++++++++++------------
 1 file changed, 23 insertions(+), 12 deletions(-)

diff --git a/gui/bitmap_loader.py b/gui/bitmap_loader.py
index f2409bc60..6319d5c0c 100644
--- a/gui/bitmap_loader.py
+++ b/gui/bitmap_loader.py
@@ -85,20 +85,14 @@ class BitmapLoader(object):
             import gui.mainFrame
             cls.scaling_factor = int(gui.mainFrame.MainFrame.getInstance().GetContentScaleFactor())
 
-        scaledNameTemplate = "{0}@{1}x.png"
-        img = None
-        scale = cls.scaling_factor + 1
+        scale = cls.scaling_factor
 
-        while img is None and scale > 1:
+        filename, img = cls.loadScaledBitmap(name, location, scale)
+
+        while img is None and scale > 0:
+            # can't find the correctly scaled image, fallback to smaller scales
             scale -= 1
-            filename = scaledNameTemplate.format(name, scale)
-            img = cls.loadImage(filename, location)
-
-        if img is None:
-            # can't find the scaled image, fallback to no scaling
-            filename = "{0}.png".format(name)
-            img = cls.loadImage(filename, location)
-            scale = 1
+            filename, img = cls.loadScaledBitmap(name, location, scale)
 
         if img is None:
             print(("Missing icon file: {0}/{1}".format(location, filename)))
@@ -109,6 +103,23 @@ class BitmapLoader(object):
             bmp.SetSize((int(bmp.GetWidth()/scale), int(bmp.GetHeight()/scale)))
         return bmp
 
+    @classmethod
+    def loadScaledBitmap(cls, name, location, scale=0):
+        """Attempts to load a scaled bitmap.
+
+        Args:
+            name (str): TypeID or basename of the image being requested.
+            location (str): Path to a location that may contain the image.
+            scale (int): Scale factor of the image variant to load. If ``0``, attempts to load the unscaled variant.
+
+        Returns:
+            (str, wx.Image): Tuple of the filename that may have been loaded and the image at that location. The
+                filename will always be present, but the image may be ``None``.
+        """
+        filename = "{0}@{1}x.png".format(name, scale) if scale > 0 else "{0}.png".format(name)
+        img = cls.loadImage(filename, location)
+        return filename, img
+
     @classmethod
     def loadImage(cls, filename, location):
         if cls.archive: