Fix item search limit, project wide reformatting and cleanup

_development/helpers.py

@@ -13,14 +13,14 @@
 sys.path.append(os.path.realpath(os.path.join(script_dir, '..', '..')))
 sys._called_from_test = True
 
+
 # noinspection PyUnresolvedReferences,PyUnusedLocal
 @pytest.fixture
 def DBInMemory_test():
     def rollback():
         with sd_lock:
             saveddata_session.rollback()
 
-
     print("Creating database in memory")
     from os.path import realpath, join, dirname, abspath
 
@@ -47,7 +47,7 @@ class ReadOnlyException(Exception):
     # game db because we haven't reached gamedata_meta.create_all()
     try:
         gamedata_version = gamedata_session.execute(
-            "SELECT `field_value` FROM `metadata` WHERE `field_name` LIKE 'client_build'"
+                "SELECT `field_value` FROM `metadata` WHERE `field_name` LIKE 'client_build'"
         ).fetchone()[0]
     except Exception as e:
         print("Missing gamedata version.")
@@ -70,9 +70,9 @@ class ReadOnlyException(Exception):
 
     # Import all the definitions for all our database stuff
     # noinspection PyPep8
-    #from eos.db.gamedata import alphaClones, attribute, category, effect, group, icon, item, marketGroup, metaData, metaGroup, queries, traits, unit
+    # from eos.db.gamedata import alphaClones, attribute, category, effect, group, icon, item, marketGroup, metaData, metaGroup, queries, traits, unit
     # noinspection PyPep8
-    #from eos.db.saveddata import booster, cargo, character, crest, damagePattern, databaseRepair, drone, fighter, fit, implant, implantSet, loadDefaultDatabaseValues, miscData, module, override, price, queries, skill, targetResists, user
+    # from eos.db.saveddata import booster, cargo, character, crest, damagePattern, databaseRepair, drone, fighter, fit, implant, implantSet, loadDefaultDatabaseValues, miscData, module, override, price, queries, skill, targetResists, user
 
     # If using in memory saveddata, you'll want to reflect it so the data structure is good.
     if saveddata_connectionstring == "sqlite:///:memory:":
@@ -83,12 +83,13 @@ class ReadOnlyException(Exception):
     print(gamedata_engine)
 
     helper = {
-        #'config': eos.config,
-        'gamedata_session'    : gamedata_session,
-        'saveddata_session'    : saveddata_session,
+        # 'config': eos.config,
+        'gamedata_session' : gamedata_session,
+        'saveddata_session': saveddata_session,
     }
     return helper
 
+
 # noinspection PyUnresolvedReferences,PyUnusedLocal
 @pytest.fixture
 def DBInMemory():
@@ -104,10 +105,10 @@ def DBInMemory():
     print(eos.db.gamedata_engine)
 
     helper = {
-        'config': eos.config,
-        'db'    : eos.db,
+        'config'           : eos.config,
+        'db'               : eos.db,
         'gamedata_session' : eos.db.gamedata_session,
-        'saveddata_session' : eos.db.saveddata_session,
+        'saveddata_session': eos.db.saveddata_session,
     }
     return helper
 

_development/helpers_items.py

@@ -6,7 +6,7 @@
 
 # noinspection PyShadowingNames
 @pytest.fixture
-def StrongBluePillBooster (DB, Gamedata, Saveddata):
+def StrongBluePillBooster(DB, Gamedata, Saveddata):
     print("Creating Strong Blue Pill Booster")
     item = DB['gamedata_session'].query(Gamedata['Item']).filter(Gamedata['Item'].name == "Strong Blue Pill Booster").first()
     return Saveddata['Booster'](item)

_development/helpers_locale.py

@@ -69,8 +69,8 @@
 
 system_names = {
     'Windows': windows_codecs,
-    'Linux': linux_codecs,
-    'Darwin': mac_codecs,
+    'Linux'  : linux_codecs,
+    'Darwin' : mac_codecs,
 }
 
 
@@ -86,6 +86,7 @@ def GetPath(root, file=None, codec=None):
 
     return path
 
+
 def GetUnicodePath(root, file=None, codec=None):
     # Replace this with the function we actually use for this
     path = os.path.realpath(os.path.abspath(root))

config.py

@@ -12,7 +12,6 @@
     pyfalog.warning("Failed to import: configforced")
     configforced = None
 
-
 # Turns on debug mode
 debug = False
 # Defines if our saveddata will be in pyfa root or not

eos/db/__init__.py

@@ -31,6 +31,7 @@
 pyfalog.info("Gamedata connection: {0}", config.gamedata_connectionstring)
 pyfalog.info("Saveddata connection: {0}", config.saveddata_connectionstring)
 
+
 class ReadOnlyException(Exception):
     pass
 

eos/db/gamedata/marketGroup.py

@@ -41,4 +41,4 @@
            "ID"         : synonym("marketGroupID"),
            "name"       : synonym("marketGroupName"),
            "description": deferred(marketgroups_table.c.description)
-        })
+       })

eos/db/gamedata/metaGroup.py

@@ -38,14 +38,14 @@
        properties={
            "ID"  : synonym("metaGroupID"),
            "name": synonym("metaGroupName")
-        })
+       })
 
 mapper(MetaType, metatypes_table,
        properties={
            "ID"    : synonym("metaGroupID"),
            "parent": relation(Item, primaryjoin=metatypes_table.c.parentTypeID == items_table.c.typeID),
            "items" : relation(Item, primaryjoin=metatypes_table.c.typeID == items_table.c.typeID),
            "info"  : relation(MetaGroup, lazy=False)
-        })
+       })
 
 MetaType.name = association_proxy("info", "name")

eos/db/gamedata/unit.py

@@ -32,4 +32,4 @@
        properties={
            "ID"  : synonym("unitID"),
            "name": synonym("unitName")
-        })
+       })

eos/db/migrations/upgrade22.py

@@ -7,26 +7,25 @@
 
 
 def upgrade(saveddata_engine):
-
     # 1 = created only
     # 2 = created and modified
     tables = {
-        "boosters": 2,
-        "cargo": 2,
-        "characters": 2,
-        "crest": 1,
-        "damagePatterns": 2,
-        "drones": 2,
-        "fighters": 2,
-        "fits": 2,
-        "projectedFits": 2,
-        "commandFits": 2,
-        "implants": 2,
-        "implantSets": 2,
-        "modules": 2,
-        "overrides": 2,
+        "boosters"       : 2,
+        "cargo"          : 2,
+        "characters"     : 2,
+        "crest"          : 1,
+        "damagePatterns" : 2,
+        "drones"         : 2,
+        "fighters"       : 2,
+        "fits"           : 2,
+        "projectedFits"  : 2,
+        "commandFits"    : 2,
+        "implants"       : 2,
+        "implantSets"    : 2,
+        "modules"        : 2,
+        "overrides"      : 2,
         "characterSkills": 2,
-        "targetResists": 2
+        "targetResists"  : 2
     }
 
     for table in tables.keys():

eos/db/saveddata/booster.py

@@ -26,12 +26,12 @@
 from eos.saveddata.booster import Booster
 
 boosters_table = Table("boosters", saveddata_meta,
-                        Column("ID", Integer, primary_key=True),
-                        Column("itemID", Integer),
-                        Column("fitID", Integer, ForeignKey("fits.ID"), nullable=False),
-                        Column("active", Boolean),
-                        Column("created", DateTime, nullable=True, default=func.now()),
-                        Column("modified", DateTime, nullable=True, onupdate=func.now()),
+                       Column("ID", Integer, primary_key=True),
+                       Column("itemID", Integer),
+                       Column("fitID", Integer, ForeignKey("fits.ID"), nullable=False),
+                       Column("active", Boolean),
+                       Column("created", DateTime, nullable=True, default=func.now()),
+                       Column("modified", DateTime, nullable=True, onupdate=func.now()),
                        )
 
 # Legacy booster side effect code, should disable but a mapper relies on it.

eos/db/saveddata/skill.py

@@ -24,7 +24,6 @@
 from eos.db import saveddata_meta
 from eos.saveddata.character import Skill
 
-
 skills_table = Table("characterSkills", saveddata_meta,
                      Column("characterID", ForeignKey("characters.ID"), primary_key=True, index=True),
                      Column("itemID", Integer, primary_key=True),

eos/effects/adaptivearmorhardener.py

@@ -33,7 +33,7 @@ def handler(fit, module, context):
         # pyfalog.debug("Damage Adjusted for Armor Resists: %f/%f/%f/%f", baseDamageTaken[0], baseDamageTaken[1], baseDamageTaken[2], baseDamageTaken[3])
 
         resistanceShiftAmount = module.getModifiedItemAttr(
-            'resistanceShiftAmount') / 100  # The attribute is in percent and we want a fraction
+                'resistanceShiftAmount') / 100  # The attribute is in percent and we want a fraction
         RAHResistance = [
             module.getModifiedItemAttr('armorEmDamageResonance'),
             module.getModifiedItemAttr('armorThermalDamageResonance'),
@@ -90,9 +90,9 @@ def handler(fit, module, context):
             for i, val in enumerate(cycleList):
                 tolerance = 1e-06
                 if abs(RAHResistance[0] - val[0]) <= tolerance and \
-                            abs(RAHResistance[1] - val[1]) <= tolerance and \
-                            abs(RAHResistance[2] - val[2]) <= tolerance and \
-                            abs(RAHResistance[3] - val[3]) <= tolerance:
+                                abs(RAHResistance[1] - val[1]) <= tolerance and \
+                                abs(RAHResistance[2] - val[2]) <= tolerance and \
+                                abs(RAHResistance[3] - val[3]) <= tolerance:
                     loopStart = i
                     # pyfalog.debug("Loop found: %d-%d", loopStart, num)
                     break
@@ -103,7 +103,7 @@ def handler(fit, module, context):
 
         if loopStart < 0:
             pyfalog.error("Reactive Armor Hardener failed to find equilibrium. Damage profile after armor: {0}/{1}/{2}/{3}",
-                         baseDamageTaken[0], baseDamageTaken[1], baseDamageTaken[2], baseDamageTaken[3])
+                          baseDamageTaken[0], baseDamageTaken[1], baseDamageTaken[2], baseDamageTaken[3])
 
         # Average the profiles in the RAH loop, or the last 20 if it didn't find a loop.
         loopCycles = cycleList[loopStart:]

eos/effects/angelsetbonus.py

@@ -8,7 +8,7 @@
 
 def handler(fit, implant, context):
     fit.appliedImplants.filteredItemMultiply(
-        lambda implant: "signatureRadiusBonus" in implant.itemModifiedAttributes and
-                        "implantSetAngel" in implant.itemModifiedAttributes,
-        "signatureRadiusBonus",
-        implant.getModifiedItemAttr("implantSetAngel"))
+            lambda implant: "signatureRadiusBonus" in implant.itemModifiedAttributes and
+                            "implantSetAngel" in implant.itemModifiedAttributes,
+            "signatureRadiusBonus",
+            implant.getModifiedItemAttr("implantSetAngel"))

eos/effects/armorallrepairsystemsamountbonuspassive.py

@@ -8,5 +8,5 @@
 
 def handler(fit, booster, context):
     fit.modules.filteredItemBoost(
-        lambda mod: mod.item.requiresSkill("Repair Systems") or mod.item.requiresSkill("Capital Repair Systems"),
-        "armorDamageAmount", booster.getModifiedItemAttr("armorDamageAmountBonus"))
+            lambda mod: mod.item.requiresSkill("Repair Systems") or mod.item.requiresSkill("Capital Repair Systems"),
+            "armorDamageAmount", booster.getModifiedItemAttr("armorDamageAmountBonus"))

eos/effects/elitebonusinterdictorsmissilekineticdamage1.py

@@ -7,5 +7,5 @@
 
 def handler(fit, ship, context):
     fit.modules.filteredChargeBoost(
-        lambda mod: mod.charge.requiresSkill("Light Missiles") or mod.charge.requiresSkill("Rockets"),
-        "kineticDamage", ship.getModifiedItemAttr("eliteBonusInterdictors1"), skill="Interdictors")
+            lambda mod: mod.charge.requiresSkill("Light Missiles") or mod.charge.requiresSkill("Rockets"),
+            "kineticDamage", ship.getModifiedItemAttr("eliteBonusInterdictors1"), skill="Interdictors")

eos/effects/elitebonusmarauderscruiseandtorpedodamagerole1.py

@@ -9,5 +9,5 @@ def handler(fit, ship, context):
     damageTypes = ("em", "explosive", "kinetic", "thermal")
     for damageType in damageTypes:
         fit.modules.filteredChargeBoost(
-            lambda mod: mod.charge.requiresSkill("Cruise Missiles") or mod.charge.requiresSkill("Torpedoes"),
-            "{0}Damage".format(damageType), ship.getModifiedItemAttr("eliteBonusViolatorsRole1"))
+                lambda mod: mod.charge.requiresSkill("Cruise Missiles") or mod.charge.requiresSkill("Torpedoes"),
+                "{0}Damage".format(damageType), ship.getModifiedItemAttr("eliteBonusViolatorsRole1"))

eos/effects/energyneutralizerfalloff.py

@@ -9,7 +9,7 @@
 
 def handler(fit, src, context):
     if "projected" in context and ((hasattr(src, "state") and src.state >= State.ACTIVE) or
-                                    hasattr(src, "amountActive")):
+                                       hasattr(src, "amountActive")):
         amount = src.getModifiedItemAttr("energyNeutralizerAmount")
         time = src.cycleTime
 

eos/effects/entityenergyneutralizerfalloff.py

@@ -9,7 +9,7 @@
 
 def handler(fit, src, context):
     if "projected" in context and ((hasattr(src, "state") and src.state >= State.ACTIVE) or
-                                    hasattr(src, "amountActive")):
+                                       hasattr(src, "amountActive")):
         amount = src.getModifiedItemAttr("energyNeutralizerAmount")
         time = src.getModifiedItemAttr("energyNeutralizerDuration")
 

eos/effects/maraudermodeeffect26.py

@@ -34,13 +34,13 @@ def handler(fit, module, context):
 
     # Tanking
     fit.modules.filteredItemBoost(
-        lambda mod: mod.item.requiresSkill("Capital Repair Systems") or mod.item.requiresSkill("Repair Systems"),
-        "armorDamageAmount", module.getModifiedItemAttr("armorDamageAmountBonus"),
-        stackingPenalties=True)
+            lambda mod: mod.item.requiresSkill("Capital Repair Systems") or mod.item.requiresSkill("Repair Systems"),
+            "armorDamageAmount", module.getModifiedItemAttr("armorDamageAmountBonus"),
+            stackingPenalties=True)
     fit.modules.filteredItemBoost(
-        lambda mod: mod.item.requiresSkill("Capital Shield Operation") or mod.item.requiresSkill("Shield Operation"),
-        "shieldBonus", module.getModifiedItemAttr("shieldBoostMultiplier"),
-        stackingPenalties=True)
+            lambda mod: mod.item.requiresSkill("Capital Shield Operation") or mod.item.requiresSkill("Shield Operation"),
+            "shieldBonus", module.getModifiedItemAttr("shieldBoostMultiplier"),
+            stackingPenalties=True)
 
     # Speed penalty
     fit.ship.boostItemAttr("maxVelocity", module.getModifiedItemAttr("speedFactor"))

eos/effects/minigamevirusstrengthbonus.py

@@ -16,5 +16,5 @@
 def handler(fit, container, context):
     level = container.level if "skill" in context else 1
     fit.modules.filteredItemIncrease(
-        lambda mod: (mod.item.requiresSkill("Hacking") or mod.item.requiresSkill("Archaeology")),
-        "virusStrength", container.getModifiedItemAttr("virusStrengthBonus") * level)
+            lambda mod: (mod.item.requiresSkill("Hacking") or mod.item.requiresSkill("Archaeology")),
+            "virusStrength", container.getModifiedItemAttr("virusStrengthBonus") * level)

eos/effects/modeagilitypostdiv.py

@@ -7,8 +7,8 @@
 
 def handler(fit, module, context):
     fit.ship.multiplyItemAttr(
-        "agility",
-        1 / module.getModifiedItemAttr("modeAgilityPostDiv"),
-        stackingPenalties=True,
-        penaltyGroup="postDiv"
+            "agility",
+            1 / module.getModifiedItemAttr("modeAgilityPostDiv"),
+            stackingPenalties=True,
+            penaltyGroup="postDiv"
     )

eos/effects/modearmorrepdurationpostdiv.py

@@ -7,7 +7,7 @@
 
 def handler(fit, module, context):
     fit.modules.filteredItemMultiply(
-        lambda mod: mod.item.requiresSkill("Repair Systems"),
-        "duration",
-        1 / module.getModifiedItemAttr("modeArmorRepDurationPostDiv")
+            lambda mod: mod.item.requiresSkill("Repair Systems"),
+            "duration",
+            1 / module.getModifiedItemAttr("modeArmorRepDurationPostDiv")
     )

eos/effects/modearmorresonancepostdiv.py

@@ -13,8 +13,8 @@ def handler(fit, module, context):
             ("Thermic", "Thermal")
     ):
         fit.ship.multiplyItemAttr(
-            "armor{0}DamageResonance".format(tgtResType),
-            1 / module.getModifiedItemAttr("mode{0}ResistancePostDiv".format(srcResType)),
-            stackingPenalties=True,
-            penaltyGroup="postDiv"
+                "armor{0}DamageResonance".format(tgtResType),
+                1 / module.getModifiedItemAttr("mode{0}ResistancePostDiv".format(srcResType)),
+                stackingPenalties=True,
+                penaltyGroup="postDiv"
         )

eos/effects/modehullresonancepostdiv.py

@@ -13,6 +13,6 @@ def handler(fit, module, context):
             ("Thermic", "thermal")
     ):
         fit.ship.multiplyItemAttr(
-            "{0}DamageResonance".format(tgtResType),
-            1 / module.getModifiedItemAttr("mode{0}ResistancePostDiv".format(srcResType))
+                "{0}DamageResonance".format(tgtResType),
+                1 / module.getModifiedItemAttr("mode{0}ResistancePostDiv".format(srcResType))
         )

eos/effects/modemwdandabboostpostdiv.py

@@ -8,9 +8,9 @@
 
 def handler(fit, module, context):
     fit.modules.filteredItemMultiply(
-        lambda mod: mod.item.requiresSkill("High Speed Maneuvering") or mod.item.requiresSkill("Afterburner"),
-        "speedFactor",
-        1 / module.getModifiedItemAttr("modeVelocityPostDiv"),
-        stackingPenalties=True,
-        penaltyGroup="postDiv"
+            lambda mod: mod.item.requiresSkill("High Speed Maneuvering") or mod.item.requiresSkill("Afterburner"),
+            "speedFactor",
+            1 / module.getModifiedItemAttr("modeVelocityPostDiv"),
+            stackingPenalties=True,
+            penaltyGroup="postDiv"
     )

eos/effects/modemwdboostpostdiv.py

@@ -7,9 +7,9 @@
 
 def handler(fit, module, context):
     fit.modules.filteredItemMultiply(
-        lambda mod: mod.item.requiresSkill("High Speed Maneuvering"),
-        "speedFactor",
-        1 / module.getModifiedItemAttr("modeMWDVelocityPostDiv"),
-        stackingPenalties=True,
-        penaltyGroup="postDiv"
+            lambda mod: mod.item.requiresSkill("High Speed Maneuvering"),
+            "speedFactor",
+            1 / module.getModifiedItemAttr("modeMWDVelocityPostDiv"),
+            stackingPenalties=True,
+            penaltyGroup="postDiv"
     )