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

Introduces empty group filtering to ship browser: stage 1

config.py

@@ -13,10 +13,10 @@ debug = False
 saveInRoot = False
 
 # Version data
-version = "1.1.22"
-tag = "Stable"
-expansionName = "Rubicon"
-expansionVersion = "1.3"
+version = "1.3.1"
+tag = "git"
+expansionName = "Crius"
+expansionVersion = "1.0"
 evemonMinVersion = "4081"
 
 pyfaPath = None

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, getBoosterFits
+                                     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/migration.py

@@ -53,8 +53,7 @@ def checkFitBooster(saveddata_engine):
         try:
             saveddata_engine.execute("SELECT booster FROM fits LIMIT 1")
         # If we don't, create them
-        # This is ugly as hell, but we can't use proper migrate packages as it
-        # will require us to rebuild skeletons, including mac
         except sqlalchemy.exc.DatabaseError:
             saveddata_engine.execute("ALTER TABLE fits ADD COLUMN booster BOOLEAN;")
-            saveddata_engine.execute("UPDATE fits SET booster = 0;")
+        # 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

@@ -24,11 +24,12 @@ 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),
@@ -53,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
 
@@ -360,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):