Merge branch 'feature/recent' into dev

Conflicts:
	eos/db/saveddata/character.py
	eos/db/saveddata/fit.py

Implements pyfa-org#983 but utilizing sqlalchemy events to update the fit modified date whenever something is added/changed.

eos/db/gamedata/queries.py

@@ -27,12 +27,11 @@
 from eos.db.util import processEager, processWhere
 from eos.gamedata import AlphaClone, Attribute, Category, Group, Item, MarketGroup, MetaGroup, AttributeInfo, MetaData
 
+cache = {}
 configVal = getattr(eos.config, "gamedataCache", None)
 if configVal is True:
     def cachedQuery(amount, *keywords):
         def deco(function):
-            cache = {}
-
             def checkAndReturn(*args, **kwargs):
                 useCache = kwargs.pop("useCache", True)
                 cacheKey = []
@@ -98,6 +97,34 @@ def getItem(lookfor, eager=None):
     return item
 
 
+@cachedQuery(1, "lookfor")
+def getItems(lookfor, eager=None):
+    """
+    Gets a list of items. Does a bit of cache hackery to get working properly -- cache
+    is usually based on function calls with the parameters, needed to extract data directly.
+    Works well enough. Not currently used, but it's here for possible future inclusion
+    """
+
+    toGet = []
+    results = []
+
+    for id in lookfor:
+        if (id, None) in cache:
+            results.append(cache.get((id, None)))
+        else:
+            toGet.append(id)
+
+    if len(toGet) > 0:
+        # Get items that aren't currently cached, and store them in the cache
+        items = gamedata_session.query(Item).filter(Item.ID.in_(toGet)).all()
+        for item in items:
+            cache[(item.ID, None)] = item
+        results += items
+
+    # sort the results based on the original indexing
+    results.sort(key=lambda x: lookfor.index(x.ID))
+    return results
+
 @cachedQuery(1, "lookfor")
 def getAlphaClone(lookfor, eager=None):
     if isinstance(lookfor, int):

eos/db/saveddata/booster.py

@@ -20,7 +20,7 @@
 from sqlalchemy import Table, Column, ForeignKey, Integer, Boolean, DateTime
 from sqlalchemy.ext.associationproxy import association_proxy
 from sqlalchemy.orm import mapper, relation
-import sqlalchemy.sql.functions as func
+import datetime
 
 from eos.db import saveddata_meta
 from eos.saveddata.booster import Booster
@@ -30,8 +30,8 @@
                         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("created", DateTime, nullable=True, default=datetime.datetime.now),
+                        Column("modified", DateTime, nullable=True, onupdate=datetime.datetime.now),
                        )
 
 # Legacy booster side effect code, should disable but a mapper relies on it.

eos/db/saveddata/cargo.py

@@ -18,19 +18,24 @@
 # ===============================================================================
 
 from sqlalchemy import Table, Column, Integer, ForeignKey, DateTime
-from sqlalchemy.orm import mapper
-import sqlalchemy.sql.functions as func
+from sqlalchemy.orm import mapper, relation
+import datetime
 
 from eos.db import saveddata_meta
 from eos.saveddata.cargo import Cargo
+from eos.saveddata.fit import Fit
 
 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),
-                    Column("created", DateTime, nullable=True, default=func.now()),
-                    Column("modified", DateTime, nullable=True, onupdate=func.now()),
+                    Column("created", DateTime, nullable=True, default=datetime.datetime.now),
+                    Column("modified", DateTime, nullable=True, onupdate=datetime.datetime.now),
                     )
 
-mapper(Cargo, cargo_table)
+mapper(Cargo, cargo_table,
+   properties={
+       "owner": relation(Fit)
+   }
+)

eos/db/saveddata/character.py

@@ -19,7 +19,7 @@
 
 from sqlalchemy import Table, Column, Integer, ForeignKey, String, DateTime, Float
 from sqlalchemy.orm import relation, mapper
-import sqlalchemy.sql.functions as func
+import datetime
 
 from eos.db import saveddata_meta
 from eos.db.saveddata.implant import charImplants_table
@@ -39,8 +39,8 @@
                          Column("alphaCloneID", Integer, nullable=True),
                          Column("ownerID", ForeignKey("users.ID"), nullable=True),
                          Column("secStatus", Float, nullable=True, default=0.0),
-                         Column("created", DateTime, nullable=True, default=func.now()),
-                         Column("modified", DateTime, nullable=True, onupdate=func.now()))
+                         Column("created", DateTime, nullable=True, default=datetime.datetime.now),
+                         Column("modified", DateTime, nullable=True, onupdate=datetime.datetime.now))
 
 mapper(Character, characters_table,
        properties={

eos/db/saveddata/crest.py

@@ -19,7 +19,7 @@
 
 from sqlalchemy import Table, Column, Integer, String, DateTime
 from sqlalchemy.orm import mapper
-import sqlalchemy.sql.functions as func
+import datetime
 
 from eos.db import saveddata_meta
 from eos.saveddata.crestchar import CrestChar
@@ -29,6 +29,6 @@
                     Column("name", String, nullable=False, unique=True),
                     Column("refresh_token", String, nullable=False),
                     # These records aren't updated. Instead, they are dropped and created, hence we don't have a modified field
-                    Column("created", DateTime, nullable=True, default=func.now()))
+                    Column("created", DateTime, nullable=True, default=datetime.datetime.now))
 
 mapper(CrestChar, crest_table)

eos/db/saveddata/damagePattern.py

@@ -19,7 +19,7 @@
 
 from sqlalchemy import Table, Column, Integer, ForeignKey, String, DateTime
 from sqlalchemy.orm import mapper
-import sqlalchemy.sql.functions as func
+import datetime
 
 from eos.db import saveddata_meta
 from eos.saveddata.damagePattern import DamagePattern
@@ -32,8 +32,8 @@
                              Column("kineticAmount", Integer),
                              Column("explosiveAmount", Integer),
                              Column("ownerID", ForeignKey("users.ID"), nullable=True),
-                             Column("created", DateTime, nullable=True, default=func.now()),
-                             Column("modified", DateTime, nullable=True, onupdate=func.now())
+                             Column("created", DateTime, nullable=True, default=datetime.datetime.now),
+                             Column("modified", DateTime, nullable=True, onupdate=datetime.datetime.now)
                              )
 
 mapper(DamagePattern, damagePatterns_table)

eos/db/saveddata/drone.py

@@ -18,11 +18,12 @@
 # ===============================================================================
 
 from sqlalchemy import Table, Column, Integer, ForeignKey, Boolean, DateTime
-from sqlalchemy.orm import mapper
-import sqlalchemy.sql.functions as func
+from sqlalchemy.orm import mapper, relation
+import datetime
 
 from eos.db import saveddata_meta
 from eos.saveddata.drone import Drone
+from eos.saveddata.fit import Fit
 
 drones_table = Table("drones", saveddata_meta,
                      Column("groupID", Integer, primary_key=True),
@@ -31,8 +32,12 @@
                      Column("amount", Integer, nullable=False),
                      Column("amountActive", Integer, nullable=False),
                      Column("projected", Boolean, default=False),
-                     Column("created", DateTime, nullable=True, default=func.now()),
-                     Column("modified", DateTime, nullable=True, onupdate=func.now())
+                     Column("created", DateTime, nullable=True, default=datetime.datetime.now),
+                     Column("modified", DateTime, nullable=True, onupdate=datetime.datetime.now)
                      )
 
-mapper(Drone, drones_table)
+mapper(Drone, drones_table,
+   properties={
+       "owner": relation(Fit)
+   }
+)

eos/db/saveddata/fighter.py

@@ -19,7 +19,7 @@
 
 from sqlalchemy import Table, Column, Integer, ForeignKey, Boolean, DateTime
 from sqlalchemy.orm import mapper, relation
-import sqlalchemy.sql.functions as func
+import datetime
 
 from eos.db import saveddata_meta
 from eos.saveddata.fighterAbility import FighterAbility
@@ -33,8 +33,8 @@
                        Column("active", Boolean, nullable=True),
                        Column("amount", Integer, nullable=False),
                        Column("projected", Boolean, default=False),
-                       Column("created", DateTime, nullable=True, default=func.now()),
-                       Column("modified", DateTime, nullable=True, onupdate=func.now())
+                       Column("created", DateTime, nullable=True, default=datetime.datetime.now),
+                       Column("modified", DateTime, nullable=True, onupdate=datetime.datetime.now)
                        )
 
 fighter_abilities_table = Table("fightersAbilities", saveddata_meta,

eos/db/saveddata/fit.py

@@ -22,7 +22,7 @@
 from sqlalchemy.sql import and_
 from sqlalchemy.orm import relation, reconstructor, mapper, relationship
 from sqlalchemy import ForeignKey, Column, Integer, String, Table, Boolean, DateTime
-import sqlalchemy.sql.functions as func
+import datetime
 
 from eos.db import saveddata_meta
 from eos.db import saveddata_session
@@ -59,25 +59,25 @@
                    Column("implantLocation", Integer, nullable=False, default=ImplantLocation.FIT),
                    Column("notes", String, nullable=True),
                    Column("ignoreRestrictions", Boolean, default=0),
-                   Column("created", DateTime, nullable=True, default=func.now()),
-                   Column("modified", DateTime, nullable=True, onupdate=func.now())
+                   Column("created", DateTime, nullable=True, default=datetime.datetime.now),
+                   Column("modified", DateTime, nullable=True, default=datetime.datetime.now, onupdate=datetime.datetime.now)
                    )
 
 projectedFits_table = Table("projectedFits", saveddata_meta,
                             Column("sourceID", ForeignKey("fits.ID"), primary_key=True),
                             Column("victimID", ForeignKey("fits.ID"), primary_key=True),
                             Column("amount", Integer, nullable=False, default=1),
                             Column("active", Boolean, nullable=False, default=1),
-                            Column("created", DateTime, nullable=True, default=func.now()),
-                            Column("modified", DateTime, nullable=True, onupdate=func.now())
+                            Column("created", DateTime, nullable=True, default=datetime.datetime.now),
+                            Column("modified", DateTime, nullable=True, onupdate=datetime.datetime.now)
                             )
 
 commandFits_table = Table("commandFits", saveddata_meta,
                           Column("boosterID", ForeignKey("fits.ID"), primary_key=True),
                           Column("boostedID", ForeignKey("fits.ID"), primary_key=True),
                           Column("active", Boolean, nullable=False, default=1),
-                          Column("created", DateTime, nullable=True, default=func.now()),
-                          Column("modified", DateTime, nullable=True, onupdate=func.now())
+                          Column("created", DateTime, nullable=True, default=datetime.datetime.now),
+                          Column("modified", DateTime, nullable=True, onupdate=datetime.datetime.now)
                           )
 
 
@@ -143,49 +143,70 @@ def __repr__(self):
         "booster_fit",  # .. and return the booster fit
         creator=lambda boosterID, booster_fit: CommandFit(boosterID, booster_fit)
 )
+
+
+# These relationships are broken out so that we can easily access it in the events stuff
+# We sometimes don't want particular relationships to cause a fit modified update (eg: projecting
+# a fit onto another would 'modify' both fits unless the following relationship is ignored)
+projectedFitSourceRel = relationship(
+   ProjectedFit,
+   primaryjoin=projectedFits_table.c.sourceID == fits_table.c.ID,
+   backref='source_fit',
+   collection_class=attribute_mapped_collection('victimID'),
+   cascade='all, delete, delete-orphan')
+
+
+boostedOntoRel = relationship(
+   CommandFit,
+   primaryjoin=commandFits_table.c.boosterID == fits_table.c.ID,
+   backref='booster_fit',
+   collection_class=attribute_mapped_collection('boostedID'),
+   cascade='all, delete, delete-orphan')
+
 mapper(es_Fit, fits_table,
        properties={
-           "_Fit__modules"          : relation(
+           "_Fit__modules": relation(
                    Module,
                    collection_class=HandledModuleList,
                    primaryjoin=and_(modules_table.c.fitID == fits_table.c.ID, modules_table.c.projected == False),  # noqa
                    order_by=modules_table.c.position,
                    cascade='all, delete, delete-orphan'),
-           "_Fit__projectedModules" : relation(
+           "_Fit__projectedModules": relation(
                    Module,
                    collection_class=HandledProjectedModList,
                    cascade='all, delete, delete-orphan',
                    single_parent=True,
                    primaryjoin=and_(modules_table.c.fitID == fits_table.c.ID, modules_table.c.projected == True)),  # noqa
-           "owner"                  : relation(
+           "owner": relation(
                    User,
                    backref="fits"),
-           "itemID"                 : fits_table.c.shipID,
-           "shipID"                 : fits_table.c.shipID,
-           "_Fit__boosters"         : relation(
+           "itemID": fits_table.c.shipID,
+           "shipID": fits_table.c.shipID,
+           "_Fit__boosters": relation(
                    Booster,
                    collection_class=HandledImplantBoosterList,
                    cascade='all, delete, delete-orphan',
+                   backref='owner',
                    single_parent=True),
-           "_Fit__drones"           : relation(
+           "_Fit__drones": relation(
                    Drone,
                    collection_class=HandledDroneCargoList,
                    cascade='all, delete, delete-orphan',
                    single_parent=True,
                    primaryjoin=and_(drones_table.c.fitID == fits_table.c.ID, drones_table.c.projected == False)),  # noqa
-           "_Fit__fighters"         : relation(
+           "_Fit__fighters": relation(
                    Fighter,
                    collection_class=HandledDroneCargoList,
                    cascade='all, delete, delete-orphan',
                    single_parent=True,
                    primaryjoin=and_(fighters_table.c.fitID == fits_table.c.ID, fighters_table.c.projected == False)),  # noqa
-           "_Fit__cargo"            : relation(
+           "_Fit__cargo": relation(
                    Cargo,
                    collection_class=HandledDroneCargoList,
                    cascade='all, delete, delete-orphan',
                    single_parent=True,
                    primaryjoin=and_(cargo_table.c.fitID == fits_table.c.ID)),
-           "_Fit__projectedDrones"  : relation(
+           "_Fit__projectedDrones": relation(
                    Drone,
                    collection_class=HandledProjectedDroneList,
                    cascade='all, delete, delete-orphan',
@@ -197,51 +218,41 @@ def __repr__(self):
                    cascade='all, delete, delete-orphan',
                    single_parent=True,
                    primaryjoin=and_(fighters_table.c.fitID == fits_table.c.ID, fighters_table.c.projected == True)),  # noqa
-           "_Fit__implants"         : relation(
+           "_Fit__implants": relation(
                    Implant,
                    collection_class=HandledImplantBoosterList,
                    cascade='all, delete, delete-orphan',
-                   backref='fit',
+                   backref='owner',
                    single_parent=True,
                    primaryjoin=fitImplants_table.c.fitID == fits_table.c.ID,
                    secondaryjoin=fitImplants_table.c.implantID == Implant.ID,
                    secondary=fitImplants_table),
-           "_Fit__character"        : relation(
+           "_Fit__character": relation(
                    Character,
                    backref="fits"),
-           "_Fit__damagePattern"    : relation(DamagePattern),
-           "_Fit__targetResists"    : relation(TargetResists),
-           "projectedOnto"          : relationship(
-                   ProjectedFit,
-                   primaryjoin=projectedFits_table.c.sourceID == fits_table.c.ID,
-                   backref='source_fit',
-                   collection_class=attribute_mapped_collection('victimID'),
-                   cascade='all, delete, delete-orphan'),
-           "victimOf"               : relationship(
+           "_Fit__damagePattern": relation(DamagePattern),
+           "_Fit__targetResists": relation(TargetResists),
+           "projectedOnto": projectedFitSourceRel,
+           "victimOf": relationship(
                    ProjectedFit,
                    primaryjoin=fits_table.c.ID == projectedFits_table.c.victimID,
                    backref='victim_fit',
                    collection_class=attribute_mapped_collection('sourceID'),
                    cascade='all, delete, delete-orphan'),
-           "boostedOnto"            : relationship(
-                   CommandFit,
-                   primaryjoin=commandFits_table.c.boosterID == fits_table.c.ID,
-                   backref='booster_fit',
-                   collection_class=attribute_mapped_collection('boostedID'),
-                   cascade='all, delete, delete-orphan'),
-           "boostedOf"              : relationship(
+           "boostedOnto": boostedOntoRel,
+           "boostedOf": relationship(
                    CommandFit,
                    primaryjoin=fits_table.c.ID == commandFits_table.c.boostedID,
                    backref='boosted_fit',
                    collection_class=attribute_mapped_collection('boosterID'),
                    cascade='all, delete, delete-orphan'),
        }
-       )
+)
 
 mapper(ProjectedFit, projectedFits_table,
        properties={
            "_ProjectedFit__amount": projectedFits_table.c.amount,
        }
-       )
+)
 
 mapper(CommandFit, commandFits_table)