Reduces icon opacity of "Empty Groups" toggle dependant on filtering state.

Introduces empty group filtering to ship browser: stage 1

.gitignore

@@ -12,3 +12,7 @@
 #Patch files
 *.patch
 #Personal
+/saveddata
+
+#Pyfa file
+pyfaFits.html

config.py

@@ -13,9 +13,9 @@ debug = False
 saveInRoot = False
 
 # Version data
-version = "1.1.18"
-tag = "Stable"
-expansionName = "Rubicon"
+version = "1.3.1"
+tag = "git"
+expansionName = "Crius"
 expansionVersion = "1.0"
 evemonMinVersion = "4081"
 
@@ -34,9 +34,10 @@ def defPaths():
     global saveInRoot
     # The main pyfa directory which contains run.py
     # Python 2.X uses ANSI by default, so we need to convert the character encoding
-    pyfaPath = getattr(configforced, "pyfaPath", None)
+    pyfaPath = getattr(configforced, "pyfaPath", pyfaPath)
     if pyfaPath is None:
-        pyfaPath = unicode(os.path.dirname(os.path.abspath(sys.modules['__main__'].__file__)), sys.getfilesystemencoding())
+        pyfaPath = unicode(os.path.dirname(os.path.realpath(os.path.abspath(
+            sys.modules['__main__'].__file__))), sys.getfilesystemencoding())
 
     # Where we store the saved fits etc, default is the current users home directory
     if saveInRoot is True:
@@ -46,7 +47,8 @@ def defPaths():
     else:
         savePath = getattr(configforced, "savePath", None)
         if savePath is None:
-            savePath = unicode(os.path.expanduser(os.path.join("~", ".pyfa")), sys.getfilesystemencoding())
+            savePath = unicode(os.path.expanduser(os.path.join("~", ".pyfa")),
+                               sys.getfilesystemencoding())
 
     # Redirect stderr to file if we're requested to do so
     stderrToFile = getattr(configforced, "stderrToFile", None)
@@ -62,7 +64,8 @@ def defPaths():
             os.mkdir(savePath)
         sys.stdout = open(os.path.join(savePath, "output_log.txt"), "w")
 
-    # Static EVE Data from the staticdata repository, should be in the staticdata directory in our pyfa directory
+    # Static EVE Data from the staticdata repository, should be in the staticdata
+    # directory in our pyfa directory
     staticPath = os.path.join(pyfaPath, "staticdata")
 
     # The database where we store all the fits etc

eos/db/__init__.py

@@ -66,7 +66,7 @@ from eos.db.saveddata.queries import getUser, getCharacter, getFit, getFitsWithS
                                      getCharacterList, getPrice, getDamagePatternList, getDamagePattern, \
                                      getFitList, getFleetList, getFleet, save, remove, commit, add, \
                                      getCharactersForUser, getMiscData, getSquadsIDsWithFitID, getWing, \
-                                     getSquad
+                                     getSquad, getBoosterFits, getProjectedFits
 
 #If using in memory saveddata, you'll want to reflect it so the data structure is good.
 if config.saveddata_connectionstring == "sqlite:///:memory:":

eos/db/gamedata/item.py

@@ -23,7 +23,7 @@ from sqlalchemy.ext.associationproxy import association_proxy
 from sqlalchemy.orm.collections import attribute_mapped_collection
 
 from eos.db import gamedata_meta
-from eos.types import Icon, Attribute, Item, Effect, MetaType, Group
+from eos.types import Icon, Attribute, Item, Effect, MetaType, Group, Traits
 
 items_table = Table("invtypes", gamedata_meta,
                     Column("typeID", Integer, primary_key = True),
@@ -38,9 +38,8 @@ items_table = Table("invtypes", gamedata_meta,
                     Column("iconID", Integer, ForeignKey("icons.iconID")),
                     Column("groupID", Integer, ForeignKey("invgroups.groupID"), index=True))
 
-
-
 from .metaGroup import metatypes_table
+from .traits import traits_table
 
 mapper(Item, items_table,
        properties = {"group" : relation(Group, backref = "items"),
@@ -52,6 +51,11 @@ mapper(Item, items_table,
                                             uselist = False),
                      "ID" : synonym("typeID"),
                      "name" : synonym("typeName"),
-                     "description" : deferred(items_table.c.description)})
+                     "description" : deferred(items_table.c.description),
+                     "traits" : relation(Traits,
+                                            primaryjoin = traits_table.c.typeID == items_table.c.typeID,
+                                            order_by = traits_table.c.typeID,
+                                            uselist = True)
+                    })
 
 Item.category = association_proxy("group", "category")

eos/db/gamedata/queries.py

@@ -184,8 +184,6 @@ def getItemsByCategory(filter, where=None, eager=None):
 def searchItems(nameLike, where=None, join=None, eager=None):
     if not isinstance(nameLike, basestring):
         raise TypeError("Need string as argument")
-    # Prepare our string for request
-    nameLike = u"%{0}%".format(sqlizeString(nameLike))
 
     if join is None:
         join = tuple()
@@ -193,8 +191,11 @@ def searchItems(nameLike, where=None, join=None, eager=None):
     if not hasattr(join, "__iter__"):
         join = (join,)
 
-    filter = processWhere(Item.name.like(nameLike, escape="\\"), where)
-    items = gamedata_session.query(Item).options(*processEager(eager)).join(*join).filter(filter).all()
+    items = gamedata_session.query(Item).options(*processEager(eager)).join(*join)
+    for token in nameLike.split(' '):
+        token_safe = u"%{0}%".format(sqlizeString(token))
+        items = items.filter(processWhere(Item.name.like(token_safe, escape="\\"), where))
+    items = items.limit(100).all()
     return items
 
 @cachedQuery(2, "where", "itemids")

eos/db/gamedata/traits.py

@@ -0,0 +1,22 @@
+
+from sqlalchemy import Column, Table, Integer, String, ForeignKey, and_, select
+from sqlalchemy.orm import mapper, column_property
+from eos.types import Item, Traits
+from eos.db import gamedata_meta
+
+traits_table = Table("invtraits", gamedata_meta,
+                     Column("typeID", Integer, ForeignKey("invtypes.typeID"), primary_key=True),
+                     Column("skillID", Integer, ForeignKey("invtypes.typeID"), primary_key=True),
+                     Column("bonusText", String, primary_key=True))
+
+
+from .item import items_table
+
+mapper(Traits, traits_table,
+        properties = {"skillName" : column_property(
+                                             select([items_table.c.typeName],
+                                                and_(
+                                                    items_table.c.typeID == traits_table.c.skillID,
+                                                    traits_table.c.skillID != -1
+                                                )))
+        });

eos/db/migration.py

@@ -3,7 +3,7 @@ import sqlalchemy
 def update(saveddata_engine):
     checkPriceFailures(saveddata_engine)
     checkApiDefaultChar(saveddata_engine)
-
+    checkFitBooster(saveddata_engine)
 
 def checkPriceFailures(saveddata_engine):
     # Check if we have 'failed' column
@@ -39,3 +39,21 @@ def checkApiDefaultChar(saveddata_engine):
         except sqlalchemy.exc.DatabaseError:
             saveddata_engine.execute("ALTER TABLE characters ADD COLUMN defaultChar INTEGER;")
             saveddata_engine.execute("ALTER TABLE characters ADD COLUMN chars VARCHAR;")
+
+def checkFitBooster(saveddata_engine):
+    try:
+        saveddata_engine.execute("SELECT * FROM fits LIMIT 1")
+    # If table doesn't exist, it means we're doing everything from scratch
+    # and sqlalchemy will process everything as needed
+    except sqlalchemy.exc.DatabaseError:
+        pass
+    # If not, we're running on top of existing DB
+    else:
+        # Check that we have columns
+        try:
+            saveddata_engine.execute("SELECT booster FROM fits LIMIT 1")
+        # If we don't, create them
+        except sqlalchemy.exc.DatabaseError:
+            saveddata_engine.execute("ALTER TABLE fits ADD COLUMN booster BOOLEAN;")
+        # Set NULL data to 0 (needed in case of downgrade, see GH issue #62
+        saveddata_engine.execute("UPDATE fits SET booster = 0 WHERE booster IS NULL;")

eos/db/saveddata/cargo.py

@@ -0,0 +1,32 @@
+#===============================================================================
+# Copyright (C) 2010 Diego Duclos
+#
+# This file is part of eos.
+#
+# eos is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation, either version 2 of the License, or
+# (at your option) any later version.
+#
+# eos is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with eos.  If not, see <http://www.gnu.org/licenses/>.
+#===============================================================================
+
+from sqlalchemy import Table, Column, Integer, ForeignKey, Boolean
+from sqlalchemy.orm import mapper
+
+from eos.db import saveddata_meta
+from eos.types import Cargo
+
+cargo_table = Table("cargo", saveddata_meta,
+                     Column("ID", Integer, primary_key=True),
+                     Column("fitID", Integer, ForeignKey("fits.ID"), nullable = False, index = True),
+                     Column("itemID", Integer, nullable = False),
+                     Column("amount", Integer, nullable = False))
+
+mapper(Cargo, cargo_table)

eos/db/saveddata/fit.py

@@ -17,18 +17,19 @@
 # along with eos.  If not, see <http://www.gnu.org/licenses/>.
 #===============================================================================
 
-from sqlalchemy import Table, Column, Integer, ForeignKey, String
+from sqlalchemy import Table, Column, Integer, ForeignKey, String, Boolean
 from sqlalchemy.orm import relation, mapper
 from sqlalchemy.sql import and_
 
 from eos.db import saveddata_meta
 from eos.db.saveddata.module import modules_table
 from eos.db.saveddata.drone import drones_table
+from eos.db.saveddata.cargo import cargo_table
 from eos.db.saveddata.implant import fitImplants_table
-from eos.types import Fit, Module, User, Booster, Drone, Implant, Character, DamagePattern
+from eos.types import Fit, Module, User, Booster, Drone, Cargo, Implant, Character, DamagePattern
 from eos.effectHandlerHelpers import HandledModuleList, HandledDroneList, \
 HandledImplantBoosterList, HandledProjectedModList, HandledProjectedDroneList, \
-HandledProjectedFitList
+HandledProjectedFitList, HandledCargoList
 fits_table = Table("fits", saveddata_meta,
                          Column("ID", Integer, primary_key = True),
                          Column("ownerID", ForeignKey("users.ID"), nullable = True, index = True),
@@ -36,7 +37,8 @@ fits_table = Table("fits", saveddata_meta,
                          Column("name", String, nullable = False),
                          Column("timestamp", Integer, nullable = False),
                          Column("characterID", ForeignKey("characters.ID"), nullable = True),
-                         Column("damagePatternID", ForeignKey("damagePatterns.ID"), nullable=True))
+                         Column("damagePatternID", ForeignKey("damagePatterns.ID"), nullable=True),
+                         Column("booster", Boolean, nullable = False, index = True, default = 0))
 
 projectedFits_table = Table("projectedFits", saveddata_meta,
                             Column("sourceID", ForeignKey("fits.ID"), primary_key = True),
@@ -52,6 +54,8 @@ mapper(Fit, fits_table,
                      "_Fit__boosters" : relation(Booster, collection_class = HandledImplantBoosterList, cascade='all, delete, delete-orphan', single_parent=True),
                      "_Fit__drones" : relation(Drone, collection_class = HandledDroneList, cascade='all, delete, delete-orphan', single_parent=True,
                                                primaryjoin = and_(drones_table.c.fitID == fits_table.c.ID, drones_table.c.projected == False)),
+                     "_Fit__cargo" : relation(Cargo, collection_class = HandledCargoList, cascade='all, delete, delete-orphan', single_parent=True,
+                                               primaryjoin = and_(cargo_table.c.fitID == fits_table.c.ID)),
                      "_Fit__projectedDrones" : relation(Drone, collection_class = HandledProjectedDroneList, cascade='all, delete, delete-orphan', single_parent=True,
                                                primaryjoin = and_(drones_table.c.fitID == fits_table.c.ID, drones_table.c.projected == True)),
                      "_Fit__implants" : relation(Implant, collection_class = HandledImplantBoosterList, cascade='all, delete, delete-orphan', single_parent=True,

eos/db/saveddata/queries.py

@@ -21,6 +21,7 @@ from eos.db.util import processEager, processWhere
 from eos.db import saveddata_session, sd_lock
 from eos.types import User, Character, Fit, Price, DamagePattern, Fleet, MiscData, Wing, Squad
 from eos.db.saveddata.fleet import squadmembers_table
+from eos.db.saveddata.fit import projectedFits_table
 from sqlalchemy.sql import and_
 import eos.config
 
@@ -248,6 +249,24 @@ def getFitsWithShip(shipID, ownerID=None, where=None, eager=None):
         raise TypeError("ShipID must be integer")
     return fits
 
+def getBoosterFits(ownerID=None, where=None, eager=None):
+    """
+    Get all the fits that are flagged as a boosting ship
+    If no user is passed, do this for all users.
+    """
+
+    if ownerID is not None and not isinstance(ownerID, int):
+        raise TypeError("OwnerID must be integer")
+    filter = Fit.booster == 1
+    if ownerID is not None:
+        filter = and_(filter, Fit.ownerID == ownerID)
+
+    filter = processWhere(filter, where)
+    eager = processEager(eager)
+    with sd_lock:
+        fits = saveddata_session.query(Fit).options(*eager).filter(filter).all()
+    return fits
+
 def countFitsWithShip(shipID, ownerID=None, where=None, eager=None):
     """
     Get all the fits using a certain ship.
@@ -342,7 +361,15 @@ def getSquadsIDsWithFitID(fitID):
             return squads
     else:
         raise TypeError("Need integer as argument")
-
+        
+def getProjectedFits(fitID):
+    if isinstance(fitID, int):
+        with sd_lock:
+            filter = and_(projectedFits_table.c.sourceID == fitID, Fit.ID == projectedFits_table.c.victimID)
+            fits = saveddata_session.query(Fit).filter(filter).all()
+            return fits
+    else:
+        raise TypeError("Need integer as argument")        
 
 def add(stuff):
     with sd_lock:

eos/effectHandlerHelpers.py

@@ -187,6 +187,46 @@ class HandledDroneList(HandledList):
 
         return d
 
+class HandledCargoList(HandledList):
+    # shameless copy of HandledDroneList
+    # I have no idea what this does, but I needed it
+    # @todo: investigate this
+    def find(self, item):
+        for d in self:
+            if d.item == item:
+                yield d
+
+    def findFirst(self, item):
+        for d in self.find(item):
+            return d
+
+    def append(self, cargo):
+        list.append(self, cargo)
+
+    def remove(self, cargo):
+        HandledList.remove(self, cargo)
+
+    def appendItem(self, item, qty = 1):
+        if qty < 1: ValueError("Amount of cargo to add should be >= 1")
+        d = self.findFirst(item)
+
+        if d is None:
+            d = eos.types.Cargo(item)
+            self.append(d)
+
+        d.qty += qty
+        return d
+
+    def removeItem(self, item, qty):
+        if qty < 1: ValueError("Amount of cargo to remove should be >= 1")
+        d = self.findFirst(item)
+        if d is None: return
+        d.qty -= qty
+        if d.qty <= 0:
+            self.remove(d)
+            return None
+
+        return d
 
 class HandledImplantBoosterList(HandledList):
     def __init__(self):

eos/effects/accessdifficultybonusmodifierrequiringarchaelogy.py

@@ -1,6 +1,7 @@
 # Used by:
 # Modules named like: Emission Scope Sharpener (8 of 8)
 # Implant: Poteque 'Prospector' Archaeology AC-905
+# Implant: Poteque 'Prospector' Environmental Analysis EY-1005
 type = "passive"
 def handler(fit, container, context):
     fit.modules.filteredItemIncrease(lambda module: module.item.requiresSkill("Archaeology"),

eos/effects/accessdifficultybonusmodifierrequiringhacking.py

@@ -1,5 +1,6 @@
 # Used by:
 # Modules named like: Memetic Algorithm Bank (8 of 8)
+# Implant: Poteque 'Prospector' Environmental Analysis EY-1005
 # Implant: Poteque 'Prospector' Hacking HC-905
 type = "passive"
 def handler(fit, container, context):

eos/effects/angelsetbonus.py

@@ -1,5 +1,5 @@
 # Used by:
-# Implants named like: Halo (12 of 12)
+# Implants named like: grade Halo (18 of 18)
 runTime = "early"
 type = "passive"
 def handler(fit, implant, context):

eos/effects/archaeologyskillvirusbonus.py

@@ -1,6 +1,7 @@
 # Used by:
 # Modules named like: Emission Scope Sharpener (8 of 8)
 # Implant: Poteque 'Prospector' Archaeology AC-905
+# Implant: Poteque 'Prospector' Environmental Analysis EY-1005
 # Skill: Archaeology
 type = "passive"
 def handler(fit, container, context):

eos/effects/basesensorstrengthmodifierrequiringastrometrics.py

@@ -1,7 +1,7 @@
 # Used by:
 # Modules from group: Scan Probe Launcher (4 of 7)
-# Implants named like: Low grade Virtue (5 of 6)
 # Implants named like: Poteque 'Prospector' Astrometric Rangefinding AR (3 of 3)
+# Implants named like: grade Virtue (10 of 12)
 # Modules named like: Gravity Capacitor Upgrade (8 of 8)
 # Skill: Astrometric Rangefinding
 # Skill: Astrometrics

eos/effects/boostermodifyboosterarmorpenalties.py

@@ -1,6 +1,6 @@
 # Used by:
 # Implants named like: Eifyr and Co. 'Alchemist' Nanite Control NC (2 of 2)
-# Implants named like: Low grade Edge (5 of 6)
+# Implants named like: grade Edge (10 of 12)
 # Skill: Neurotoxin Control
 type = "passive"
 def handler(fit, container, context):

eos/effects/boostermodifyboostermaxvelocityandcapacitorpenalty.py

@@ -1,6 +1,6 @@
 # Used by:
 # Implants named like: Eifyr and Co. 'Alchemist' Nanite Control NC (2 of 2)
-# Implants named like: Low grade Edge (5 of 6)
+# Implants named like: grade Edge (10 of 12)
 # Skill: Neurotoxin Control
 type = "passive"
 def handler(fit, container, context):

eos/effects/boostermodifyboostermissilepenalty.py

@@ -1,6 +1,6 @@
 # Used by:
 # Implants named like: Eifyr and Co. 'Alchemist' Nanite Control NC (2 of 2)
-# Implants named like: Low grade Edge (5 of 6)
+# Implants named like: grade Edge (10 of 12)
 # Skill: Neurotoxin Control
 type = "passive"
 def handler(fit, container, context):

eos/effects/boostermodifyboostershieldpenalty.py

@@ -1,6 +1,6 @@
 # Used by:
 # Implants named like: Eifyr and Co. 'Alchemist' Nanite Control NC (2 of 2)
-# Implants named like: Low grade Edge (5 of 6)
+# Implants named like: grade Edge (10 of 12)
 # Skill: Neurotoxin Control
 type = "passive"
 def handler(fit, container, context):

eos/effects/boostermodifyboosterturretpenalty.py

@@ -1,6 +1,6 @@
 # Used by:
 # Implants named like: Eifyr and Co. 'Alchemist' Nanite Control NC (2 of 2)
-# Implants named like: Low grade Edge (5 of 6)
+# Implants named like: grade Edge (10 of 12)
 # Skill: Neurotoxin Control
 type = "passive"
 def handler(fit, container, context):

eos/effects/caldarisetbonus3.py

@@ -1,5 +1,5 @@
 # Used by:
-# Implants named like: Talon (6 of 12)
+# Implants named like: High grade Talon (6 of 6)
 runTime = "early"
 type = "passive"
 def handler(fit, implant, context):