Implement a "simple" cli over pyfa for cli business

service/esi.py

@@ -13,11 +13,9 @@ from service.const import EsiLoginMethod, EsiSsoMode
 from eos.saveddata.ssocharacter import SsoCharacter
 from service.esiAccess import APIException, GenericSsoError
 import gui.globalEvents as GE
-from gui.ssoLogin import SsoLogin
 from service.server import StoppableHTTPServer, AuthHandler
 from service.settings import EsiSettings
 from service.esiAccess import EsiAccess
-import gui.mainFrame
 
 from requests import Session
 
@@ -140,6 +138,7 @@ class Esi(EsiAccess):
         self.fittings_deleted.add(fittingID)
 
     def login(self):
+        import gui.ssoLogin
         start_server = self.settings.get('loginMode') == EsiLoginMethod.SERVER and self.server_base.supports_auto_login
         with gui.ssoLogin.SsoLogin(self.server_base, start_server) as dlg:
             if dlg.ShowModal() == wx.ID_OK:

service/port/__init__.py

@@ -1,2 +1,8 @@
 from .efs import EfsPort
-from .port import Port
+
+
+def __getattr__(name):
+    if name == "Port":
+        from service.port.port import Port
+        return Port
+    raise AttributeError("module %r has no attribute %r" % (__name__, name))

service/port/dna.py

@@ -31,7 +31,6 @@ from eos.saveddata.fighter import Fighter
 from eos.saveddata.fit import Fit
 from eos.saveddata.module import Module
 from eos.saveddata.ship import Ship
-from gui.fitCommands.helpers import activeStateLimit
 from service.const import PortDnaOptions
 from service.fit import Fit as svcFit
 from service.market import Market
@@ -80,6 +79,7 @@ def importDnaAlt(string, fitName=None):
     return processImportInfo(info, fitName, "*")
 
 def processImportInfo(info, fitName, amountSeparator):
+    from gui.fitCommands.helpers import activeStateLimit
     sMkt = Market.getInstance()
     f = Fit()
     try:

service/port/efs.py

@@ -16,10 +16,6 @@ from eos.effectHandlerHelpers import HandledList
 from eos.db import gamedata_session, getCategory, getAttributeInfo, getGroup
 from eos.gamedata import Attribute, Effect, Group, Item, ItemEffect
 from eos.utils.spoolSupport import SpoolType, SpoolOptions
-from gui.fitCommands.calc.module.localAdd import CalcAddLocalModuleCommand
-from gui.fitCommands.calc.module.localRemove import CalcRemoveLocalModulesCommand
-from gui.fitCommands.calc.module.changeCharges import CalcChangeModuleChargesCommand
-from gui.fitCommands.helpers import ModuleInfo
 
 
 pyfalog = Logger(__name__)
@@ -68,6 +64,9 @@ class EfsPort:
 
         if propID is None:
             return None
+        from gui.fitCommands.calc.module.localAdd import CalcAddLocalModuleCommand
+        from gui.fitCommands.calc.module.localRemove import CalcRemoveLocalModulesCommand
+        from gui.fitCommands.helpers import ModuleInfo
         cmd = CalcAddLocalModuleCommand(fitID, ModuleInfo(itemID=propID))
         cmd.Do()
         if cmd.needsGuiRecalc:
@@ -137,6 +136,7 @@ class EfsPort:
                     EfsPort.attrDirectMap(["reloadTime"], stats, mod)
                     c = mod.charge
                     if c:
+                        from gui.fitCommands.calc.module.changeCharges import CalcChangeModuleChargesCommand
                         sFit.recalc(fit)
                         CalcChangeModuleChargesCommand(
                             fit.ID,

service/port/eft.py

@@ -33,7 +33,6 @@ from eos.saveddata.fit import Fit
 from eos.saveddata.implant import Implant
 from eos.saveddata.module import Module
 from eos.saveddata.ship import Ship
-from gui.fitCommands.helpers import activeStateLimit
 from service.const import PortEftOptions
 from service.fit import Fit as svcFit
 from service.market import Market
@@ -241,6 +240,7 @@ def exportCargo(cargos):
 
 
 def importEft(lines):
+    from gui.fitCommands.helpers import activeStateLimit
     lines = _importPrepare(lines)
     try:
         fit = _importCreateFit(lines)
@@ -877,6 +877,7 @@ class AbstractFit:
             self.getContainerBySlot(m.slot).append(m)
 
     def __makeModule(self, itemSpec):
+        from gui.fitCommands.helpers import activeStateLimit
         # Mutate item if needed
         m = None
         if itemSpec.mutationIdx in self.mutations:

service/port/esi.py

@@ -31,7 +31,6 @@ from eos.saveddata.fighter import Fighter
 from eos.saveddata.fit import Fit
 from eos.saveddata.module import Module
 from eos.saveddata.ship import Ship
-from gui.fitCommands.helpers import activeStateLimit
 from service.fit import Fit as svcFit
 from service.market import Market
 
@@ -161,6 +160,7 @@ def exportESI(ofit, exportCharges, exportImplants, exportBoosters, callback):
 
 
 def importESI(string):
+    from gui.fitCommands.helpers import activeStateLimit
 
     sMkt = Market.getInstance()
     fitobj = Fit()

service/port/port.py

@@ -195,10 +195,14 @@ class Port:
         # TODO: catch the exception?
         # activeFit is reserved?, bufferStr is unicode? (assume only clipboard string?
         sFit = svcFit.getInstance()
+        if sFit.character is None:
+            from eos.saveddata.character import Character as saveddata_Character
+            sFit.character = saveddata_Character.getAll5()
         importType, makesNewFits, importData = Port.importAuto(bufferStr, activeFit=activeFit)
 
         if makesNewFits:
-            for fit in importData:
+            fits = [f for f in importData if f is not None]
+            for fit in fits:
                 fit.character = sFit.character
                 fit.damagePattern = sFit.pattern
                 fit.targetProfile = sFit.targetProfile
@@ -208,6 +212,7 @@ class Port:
                     useCharImplants = sFit.serviceFittingOptions["useCharacterImplantsByDefault"]
                     fit.implantLocation = ImplantLocation.CHARACTER if useCharImplants else ImplantLocation.FIT
                 db.save(fit)
+            return importType, fits
         return importType, importData
 
     @classmethod

service/port/xml.py

@@ -32,7 +32,6 @@ from eos.saveddata.fighter import Fighter
 from eos.saveddata.fit import Fit
 from eos.saveddata.module import Module
 from eos.saveddata.ship import Ship
-from gui.fitCommands.helpers import activeStateLimit
 from service.fit import Fit as svcFit
 from service.market import Market
 from service.port.muta import renderMutantAttrs, parseMutantAttrs
@@ -155,6 +154,7 @@ def _resolve_module(hardware, sMkt, b_localized):
 
 
 def importXml(text, progress):
+    from gui.fitCommands.helpers import activeStateLimit
     from .port import Port
     sMkt = Market.getInstance()
     doc = xml.dom.minidom.parseString(text)