service/port/xml.py - refactoring

Author: jeffy-g

service/port/xml.py

@@ -59,45 +59,59 @@ def _extract_match(t):
     # hint attribute, text content
     return m.group(1), m.group(2)
 
-
-def _solve_ship(fitting, sMkt, b_localized):
-    # type: (minidom.Element, Market, bool) -> Fit
-    """ NOTE: Since it is meaningless unless a correct ship object can be constructed,
-        process flow changed
-    """
-    # ------ Confirm ship
-    # <localized hint="Maelstrom">Maelstrom</localized>
-    shipType = fitting.getElementsByTagName("shipType")[0].getAttribute("value")
+def doIt(text, b_localized):
+    # type: (str, bool) -> tuple[str, str|None]
     anything = None
     if b_localized:
         try:
             # expect an official name, emergency cache
-            shipType, anything = _extract_match(shipType)
+            text, anything = _extract_match(text)
         except ExtractingError:
             pass
 
+    return text, anything
+
+def _solve(name, altName, handler):
+    # type: (str, str|None, function) -> object
     limit = 2
-    ship = None
+    subject = None
     while True:
         must_retry = False
         try:
-            try:
-                ship = Ship(sMkt.getItem(shipType))
-            except ValueError:
-                ship = Citadel(sMkt.getItem(shipType))
+            subject = handler(name)
         except (KeyboardInterrupt, SystemExit):
             raise
         except Exception as e:
-            pyfalog.warning("Caught exception on _solve_ship")
-            pyfalog.error(e)
+            # pyfalog.warning("Caught exception on _solve")
+            pyfalog.error("Caught exception on _solve:: {}", e)
             limit -= 1
             if limit == 0:
                 break
-            shipType = anything
+            name = altName
             must_retry = True
         if not must_retry:
             break
 
+    return subject
+
+def _solve_ship(fitting, sMkt, b_localized):
+    # type: (minidom.Element, Market, bool) -> Fit
+    """ NOTE: Since it is meaningless unless a correct ship object can be constructed,
+        process flow changed
+    """
+    def handler(name):
+        try:
+            return Ship(sMkt.getItem(name))
+        except ValueError:
+            return Citadel(sMkt.getItem(name))
+
+    # ------ Confirm ship
+    # <localized hint="Maelstrom">Maelstrom</localized>
+    shipType, anything = doIt(
+        fitting.getElementsByTagName("shipType")[0].getAttribute("value"), b_localized
+    )
+    ship = _solve(shipType, anything, handler)
+
     if ship is None:
         raise Exception("cannot resolve ship type.")
 
@@ -116,37 +130,17 @@ def _solve_ship(fitting, sMkt, b_localized):
 
 def _solve_module(hardware, sMkt, b_localized):
     # type: (minidom.Element, Market, bool) -> Item
-    moduleName = hardware.getAttribute("base_type") or hardware.getAttribute("type")
-    emergency = None
-    if b_localized:
-        try:
-            # expect an official name, emergency cache
-            moduleName, emergency = _extract_match(moduleName)
-        except ExtractingError:
-            pass
-
-    item = None
-    limit = 2
-    while True:
-        must_retry = False
-        try:
-            item = sMkt.getItem(moduleName, eager="group.category")
-            if not item:
-                raise ValueError(f"{moduleName} is not valid")
-            pyfalog.info('_solve_module - sMkt.getItem: {}', item)
-        except (KeyboardInterrupt, SystemExit):
-            raise
-        except Exception as e:
-            pyfalog.warning("Caught exception on _solve_module, name:{}", moduleName)
-            pyfalog.error(e)
-            limit -= 1
-            if limit == 0:
-                break
-            moduleName = emergency
-            must_retry = True
-        if not must_retry and item:
-            break
-
+    def handler(name):
+        item = sMkt.getItem(name, eager="group.category")
+        if not item:
+            raise ValueError(f'"{name}" is not valid')
+        pyfalog.info('_solve_module - sMkt.getItem: {}', item)
+        return item
+
+    moduleName, emergency = doIt(
+        hardware.getAttribute("base_type") or hardware.getAttribute("type"), b_localized
+    )
+    item = _solve(moduleName, emergency, handler)
     if item is None:
         raise Exception("cannot resolve module or item.")
 
@@ -174,7 +168,7 @@ def importXml(text, progress):
     failed = 0
 
     pyfalog.info(
-        f"importXml - localized fitting {'detected' if b_localized else 'is normaly'}"
+        f"importXml - fitting is {'localized' if b_localized else 'normally'}"
     )
     for fitting in fittings:
         if progress and progress.userCancelled: