dave/pyfa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 5 Wiki Activity

Some quick cleanup of logging and shtuff

Browse Source
This commit is contained in:
Ebag333
2017-04-05 00:17:13 -07:00
parent 9d029b46b1
commit df510c40f4
1 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
eos/saveddata/fit.py
View File

@@ -32,7 +32,6 @@ from eos.saveddata.ship import Ship
from eos.saveddata.character import Character
from eos.saveddata.citadel import Citadel
from eos.saveddata.module import Module, State, Slot, Hardpoint
from utils.timer import Timer
from logbook import Logger
pyfalog = Logger(__name__)
@@ -459,7 +458,7 @@ class Fit(object):
self.commandBonuses[warfareBuffID] = (runTime, value, module, effect)
def __runCommandBoosts(self, runTime="normal"):
pyfalog.debug("Applying gang boosts for {0}", self)
pyfalog.debug("Applying gang boosts for {0}", self.ID)
for warfareBuffID in self.commandBonuses.keys():
# Unpack all data required to run effect properly
effect_runTime, value, thing, effect = self.commandBonuses[warfareBuffID]
@@ -638,13 +637,12 @@ class Fit(object):
del self.commandBonuses[warfareBuffID]
def calculateModifiedAttributes(self, targetFit=None, withBoosters=False, dirtyStorage=None):
timer = Timer(u'Fit: {}, {}'.format(self.ID, self.name), pyfalog)
def calculateModifiedAttributes(self, targetFit=None, withBoosters=False):
pyfalog.debug("Starting fit calculation on: {0}, withBoosters: {1}", self, withBoosters)
shadow = False
if targetFit and not withBoosters:
pyfalog.debug("Applying projections to target: {0}", targetFit)
pyfalog.debug("Calculating projections from {0} to target {1}", self.name, targetFit.name)
projectionInfo = self.getProjectionInfo(targetFit.ID)
pyfalog.debug("ProjectionInfo: {0}", projectionInfo)
if self == targetFit:
@@ -693,6 +691,7 @@ class Fit(object):
return
for runTime in ("early", "normal", "late"):
pyfalog.debug("Run time: {0}", runTime)
# Items that are unrestricted. These items are run on the local fit
# first and then projected onto the target fit it one is designated
u = [
@@ -751,8 +750,6 @@ class Fit(object):
targetFit.register(item, origin=self)
item.calculateModifiedAttributes(targetFit, runTime, True)
timer.checkpoint('Done with runtime: %s' % runTime)
# Mark fit as calculated
self.__calculated = True
@@ -760,7 +757,7 @@ class Fit(object):
if not projected and not withBoosters:
for fit in self.projectedFits:
if fit.getProjectionInfo(self.ID).active:
fit.calculateModifiedAttributes(self, withBoosters=withBoosters, dirtyStorage=dirtyStorage)
fit.calculateModifiedAttributes(self, withBoosters=withBoosters)
timer.checkpoint('Done with fit calculation')
@@ -768,6 +765,8 @@ class Fit(object):
pyfalog.debug("Delete shadow fit object")
del self
pyfalog.debug('Done with fit calculation')
def fill(self):
"""
Fill this fit's module slots with enough dummy slots so that all slots are used.