Merge branch 'feature/recent' into dev

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

Implements #983 but utilizing sqlalchemy events to update the fit modified date whenever something is added/changed.
This commit is contained in:
blitzmann
2017-05-07 20:48:41 -04:00
23 changed files with 356 additions and 103 deletions

View File

@@ -20,6 +20,7 @@
import copy
from logbook import Logger
from time import time
import datetime
import eos.db
from eos.saveddata.booster import Booster as es_Booster
@@ -93,10 +94,24 @@ class Fit(object):
fits = eos.db.getFitsWithShip(shipID)
names = []
for fit in fits:
names.append((fit.ID, fit.name, fit.booster, fit.timestamp))
names.append((fit.ID, fit.name, fit.booster, fit.modified or fit.created or datetime.datetime.fromtimestamp(fit.timestamp)))
return names
@staticmethod
def getRecentFits():
""" Fetches recently modified fits, used with shipBrowser """
pyfalog.debug("Fetching recent fits")
fits = eos.db.getRecentFits()
returnInfo = []
for fit in fits:
item = eos.db.getItem(fit[1])
returnInfo.append((fit[0], fit[2], fit[3] or fit[4] or datetime.datetime.fromtimestamp(fit[5]), item))
# ID name timestamps
return returnInfo
@staticmethod
def getFitsWithModules(typeIDs):
""" Lists fits flagged as booster """
@@ -258,10 +273,15 @@ class Fit(object):
pyfalog.debug("Searching for fit: {0}", name)
results = eos.db.searchFits(name)
fits = []
for fit in results:
fits.append((
fit.ID, fit.name, fit.ship.item.ID, fit.ship.item.name, fit.booster,
fit.timestamp))
fit.ID,
fit.name,
fit.ship.item.ID,
fit.ship.item.name,
fit.booster,
fit.modifiedCoalesce))
return fits
def addImplant(self, fitID, itemID, recalc=True):