Import Cleanup for Services

eos/db/saveddata/loadDefaultDatabaseValues.py

@@ -18,8 +18,8 @@
 # ===============================================================================
 
 import eos.db
-import eos.types
-
+from eos.saveddata.damagePattern import DamagePattern as es_DamagePattern
+from eos.saveddata.targetResists import TargetResists as es_TargetResists
 
 class ImportError(Exception):
     pass
@@ -118,7 +118,7 @@ def importDamageProfileDefaults(cls):
             name, em, therm, kin, exp = damageProfileRow
             damageProfile = eos.db.getDamagePattern(name)
             if damageProfile is None:
-                damageProfile = eos.types.DamagePattern(em, therm, kin, exp)
+                damageProfile = es_DamagePattern(em, therm, kin, exp)
                 damageProfile.name = name
                 eos.db.save(damageProfile)
 
@@ -180,7 +180,7 @@ def importResistProfileDefaults(cls):
             name, em, therm, kin, exp = targetResistProfileRow
             resistsProfile = eos.db.eos.db.getTargetResists(name)
             if resistsProfile is None:
-                resistsProfile = eos.types.TargetResists(em, therm, kin, exp)
+                resistsProfile = es_TargetResists(em, therm, kin, exp)
                 resistsProfile.name = name
                 eos.db.save(resistsProfile)
 
@@ -192,6 +192,6 @@ def importRequiredDefaults(cls):
             name, em, therm, kin, exp = damageProfileRow
             damageProfile = eos.db.getDamagePattern(name)
             if damageProfile is None:
-                damageProfile = eos.types.DamagePattern(em, therm, kin, exp)
+                damageProfile = es_DamagePattern(em, therm, kin, exp)
                 damageProfile.name = name
                 eos.db.save(damageProfile)

eos/effectHandlerHelpers.py

@@ -21,7 +21,6 @@
 import logging
 
 import eos.db
-import eos.types
 
 logger = logging.getLogger(__name__)
 
@@ -160,13 +159,6 @@ def remove(self, mod):
         for i in xrange(oldPos, len(self)):
             self[i].position -= 1
 
-    def toDummy(self, index):
-        mod = self[index]
-        if not mod.isEmpty:
-            dummy = eos.types.Module.buildEmpty(mod.slot)
-            dummy.position = index
-            self[index] = dummy
-
     def toModule(self, index, mod):
         mod.position = index
         self[index] = mod

eos/saveddata/module.py

@@ -32,18 +32,13 @@
 
 
 class State(Enum):
-    def __init__(self):
-        pass
-
     OFFLINE = -1
     ONLINE = 0
     ACTIVE = 1
     OVERHEATED = 2
 
 
 class Slot(Enum):
-    def __init__(self):
-        pass
 
     # These are self-explanatory
     LOW = 1
@@ -65,15 +60,13 @@ def __init__(self):
 
 
 class Hardpoint(Enum):
-    def __init__(self):
-        pass
 
     NONE = 0
     MISSILE = 1
     TURRET = 2
 
 
-class Module(HandledItem, HandledCharge, ItemAttrShortcut, ChargeAttrShortcut):
+class Module(HandledItem, HandledCharge, ItemAttrShortcut, ChargeAttrShortcut, list):
     """An instance of this class represents a module together with its charge and modified attributes"""
     DAMAGE_TYPES = ("em", "thermal", "kinetic", "explosive")
     MINING_ATTRIBUTES = ("miningAmount",)
@@ -141,6 +134,13 @@ def build(self):
             self.__chargeModifiedAttributes.original = self.__charge.attributes
             self.__chargeModifiedAttributes.overrides = self.__charge.overrides
 
+    def toDummy(self, index):
+        mod = self[index]
+        if not mod.isEmpty:
+            dummy = Module.buildEmpty(mod.slot)
+            dummy.position = index
+            self[index] = dummy
+
     @classmethod
     def buildEmpty(cls, slot):
         empty = Module(None)

gui/builtinContextMenus/amount.py

@@ -5,6 +5,8 @@
 import gui.globalEvents as GE
 import wx
 from service.fit import Fit
+from eos.saveddata.cargo import Cargo as es_Cargo
+from eos.saveddata.fighter import Fighter as es_Fighter
 
 class ChangeAmount(ContextMenu):
     def __init__(self):
@@ -50,11 +52,11 @@ def change(self, event):
         mainFrame = gui.mainFrame.MainFrame.getInstance()
         fitID = mainFrame.getActiveFit()
 
-        if isinstance(self.thing, eos.types.Cargo):
+        if isinstance(self.thing, es_Cargo):
             sFit.addCargo(fitID, self.thing.item.ID, int(self.input.GetLineText(0)), replace=True)
         elif isinstance(self.thing, eos.types.Fit):
             sFit.changeAmount(fitID, self.thing, int(self.input.GetLineText(0)))
-        elif isinstance(self.thing, eos.types.Fighter):
+        elif isinstance(self.thing, es_Fighter):
             sFit.changeActiveFighters(fitID, self.thing, int(self.input.GetLineText(0)))
 
         wx.PostEvent(mainFrame, GE.FitChanged(fitID=fitID))

gui/commandView.py

@@ -24,9 +24,9 @@
 import gui.droneView
 from gui.builtinViewColumns.state import State
 from gui.contextMenu import ContextMenu
-import eos.types
 from service.fit import Fit
 from service.market import Market
+from eos.saveddata.drone import Drone as es_Drone
 
 
 class DummyItem:
@@ -108,7 +108,7 @@ def handleDrag(self, type, fitID):
 
     def startDrag(self, event):
         row = event.GetIndex()
-        if row != -1 and isinstance(self.get(row), eos.types.Drone):
+        if row != -1 and isinstance(self.get(row), es_Drone):
             data = wx.PyTextDataObject()
             data.SetText("command:"+str(self.GetItemData(row)))
 

gui/crestFittings.py

@@ -5,6 +5,8 @@
 import requests
 
 from service.crest import CrestModes
+from service.crest import Crest
+from service.fit import Fit
 
 from eos.types import Cargo
 from eos.db import getItem

gui/mainFrame.py

@@ -784,7 +784,8 @@ def backupToXml(self, event):
                               "Backing up %d fits to: %s"%(max, filePath),
                               maximum=max, parent=self,
                               style=wx.PD_APP_MODAL | wx.PD_ELAPSED_TIME)
-            sFit.backupFits(filePath, self.backupCallback)
+
+            Port.backupFits(filePath, self.backupCallback)
             self.progressDialog.ShowModal()
 
     def exportHtml(self, event):

gui/projectedView.py

@@ -118,7 +118,7 @@ def handleDrag(self, type, fitID):
 
     def startDrag(self, event):
         row = event.GetIndex()
-        if row != -1 and isinstance(self.get(row), eos.types.Drone):
+        if row != -1 and isinstance(self.get(row), es_Drone):
             data = wx.PyTextDataObject()
             data.SetText("projected:"+str(self.GetItemData(row)))
 
@@ -134,7 +134,7 @@ def mergeDrones(self, x, y, itemID):
 
     def _merge(self, src, dst):
         dstDrone = self.get(dst)
-        if isinstance(dstDrone, eos.types.Drone):
+        if isinstance(dstDrone, es_Drone):
             sFit = Fit.getInstance()
             fitID = self.mainFrame.getActiveFit()
             if sFit.mergeDrones(fitID, self.get(src), dstDrone, True):
@@ -247,15 +247,15 @@ def spawnMenu(self):
             item = self.get(sel)
             if item is None: return
             sMkt = Market.getInstance()
-            if isinstance(item, eos.types.Drone):
+            if isinstance(item, es_Drone):
                 srcContext = "projectedDrone"
                 itemContext = sMkt.getCategoryByItem(item.item).name
                 context = ((srcContext, itemContext),)
-            elif isinstance(item, eos.types.Fighter):
+            elif isinstance(item, es_Fighter):
                 srcContext = "projectedFighter"
                 itemContext = sMkt.getCategoryByItem(item.item).name
                 context = ((srcContext, itemContext),)
-            elif isinstance(item, eos.types.Module):
+            elif isinstance(item, es_Module):
                 modSrcContext = "projectedModule"
                 modItemContext = sMkt.getCategoryByItem(item.item).name
                 modFullContext = (modSrcContext, modItemContext)

service/attribute.py

@@ -34,4 +34,6 @@ def getAttributeInfo(self, identity):
         elif isinstance(identity, (int, float)):
             id = int(identity)
             info = eos.db.getAttributeInfo(id, eager=("icon", "unit"))
+        else:
+            info = None
         return info

service/character.py

@@ -31,9 +31,13 @@
 
 import config
 import eos.db
-import eos.types
 from service.eveapi import EVEAPIConnection, ParseXML
 
+from eos.saveddata.implant import Implant as es_Implant
+from eos.saveddata.character import Character as es_Character
+from eos.saveddata.module import Slot as es_Slot, Module as es_Module
+from eos.saveddata.fighter import Fighter as es_Fighter
+
 logger = logging.getLogger(__name__)
 
 class CharacterImportThread(threading.Thread):
@@ -175,13 +179,13 @@ def importCharacter(self, path, callback):
         thread.start()
 
     def all0(self):
-        return eos.types.Character.getAll0()
+        return es_Character.getAll0()
 
     def all0ID(self):
         return self.all0().ID
 
     def all5(self):
-        return eos.types.Character.getAll5()
+        return es_Character.getAll5()
 
     def all5ID(self):
         return self.all5().ID
@@ -248,7 +252,7 @@ def getCharName(self, charID):
         return eos.db.getCharacter(charID).name
 
     def new(self, name="New Character"):
-        char = eos.types.Character(name)
+        char = es_Character(name)
         eos.db.save(char)
         return char
 
@@ -344,7 +348,7 @@ def addImplant(self, charID, itemID):
             logger.error("Trying to add implant to read-only character")
             return
 
-        implant = eos.types.Implant(eos.db.getItem(itemID))
+        implant = es_Implant(eos.db.getItem(itemID))
         char.implants.append(implant)
         eos.db.commit()
 
@@ -361,17 +365,17 @@ def checkRequirements(self, fit):
         toCheck = []
         reqs = {}
         for thing in itertools.chain(fit.modules, fit.drones, fit.fighters, (fit.ship,)):
-            if isinstance(thing, eos.types.Module) and thing.slot == eos.types.Slot.RIG:
+            if isinstance(thing, es_Module) and thing.slot == es_Slot.RIG:
                 continue
             for attr in ("item", "charge"):
-                if attr == "charge" and isinstance(thing, eos.types.Fighter):
+                if attr == "charge" and isinstance(thing, es_Fighter):
                     # Fighter Bombers are automatically charged with micro bombs.
                     # These have skill requirements attached, but aren't used in EVE.
                     continue
                 subThing = getattr(thing, attr, None)
                 subReqs = {}
                 if subThing is not None:
-                    if isinstance(thing, eos.types.Fighter) and attr == "charge":
+                    if isinstance(thing, es_Fighter) and attr == "charge":
                         continue
                     self._checkRequirements(fit, fit.character, subThing, subReqs)
                     if subReqs:

service/damagePattern.py

@@ -20,8 +20,7 @@
 import copy
 
 import eos.db
-import eos.types
-
+from eos.saveddata.damagePattern import DamagePattern as es_DamagePattern
 
 class ImportError(Exception):
      pass
@@ -41,7 +40,7 @@ def getDamagePattern(self, name):
         return eos.db.getDamagePattern(name)
 
     def newPattern(self, name):
-        p = eos.types.DamagePattern(0, 0, 0, 0)
+        p = es_DamagePattern(0, 0, 0, 0)
         p.name = name
         eos.db.save(p)
         return p
@@ -67,7 +66,7 @@ def importPatterns(self, text):
         for pattern in current:
             lookup[pattern.name] = pattern
 
-        imports, num = eos.types.DamagePattern.importPatterns(text)
+        imports, num = es_DamagePattern.importPatterns(text)
         for pattern in imports:
             if pattern.name in lookup:
                 match = lookup[pattern.name]
@@ -89,4 +88,4 @@ def exportPatterns(self):
                 del patterns[i]
 
         patterns.sort(key=lambda p: p.name)
-        return eos.types.DamagePattern.exportPatterns(*patterns)
+        return es_DamagePattern.exportPatterns(*patterns)