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

Improved fitting window import; revert addition of staticmethod's in fit service

Browse Source
This commit is contained in:
blitzmann
2014-05-23 18:58:09 -04:00
parent fbc336b038
commit b7e2b62562
2 changed files with 28 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

69
service/fit.py
View File

@@ -100,8 +100,7 @@ class Fit(object):
self.serviceFittingOptions = SettingsProvider.getInstance().getSettings(
"pyfaServiceFittingOptions", serviceFittingDefaultOptions)
@staticmethod
def getAllFits():
def getAllFits(self):
fits = eos.db.getFitList()
names = []
for fit in fits:
@@ -109,8 +108,7 @@ class Fit(object):
return names
@staticmethod
def getFitsWithShip(shipID):
def getFitsWithShip(self, shipID):
""" Lists fits of shipID, used with shipBrowser """
fits = eos.db.getFitsWithShip(shipID)
names = []
@@ -119,8 +117,7 @@ class Fit(object):
return names
@staticmethod
def getBoosterFits():
def getBoosterFits(self):
""" Lists fits flagged as booster """
fits = eos.db.getBoosterFits()
names = []
@@ -129,8 +126,7 @@ class Fit(object):
return names
@staticmethod
def countFitsWithShip(shipID):
def countFitsWithShip(self, shipID):
count = eos.db.countFitsWithShip(shipID)
return count
@@ -143,8 +139,7 @@ class Fit(object):
return True
return False
@staticmethod
def getModule(fitID, pos):
def getModule(self, fitID, pos):
fit = eos.db.getFit(fitID)
return fit.modules[pos]
@@ -159,14 +154,12 @@ class Fit(object):
self.recalc(fit)
return fit.ID
@staticmethod
def toggleBoostFit(fitID):
def toggleBoostFit(self, fitID):
fit = eos.db.getFit(fitID)
fit.booster = not fit.booster
eos.db.commit()
@staticmethod
def renameFit(fitID, newName):
def renameFit(self, fitID, newName):
fit = eos.db.getFit(fitID)
fit.name = newName
eos.db.commit()
@@ -179,15 +172,13 @@ class Fit(object):
eos.db.remove(fit)
@staticmethod
def copyFit(fitID):
def copyFit(self, fitID):
fit = eos.db.getFit(fitID)
newFit = copy.deepcopy(fit)
eos.db.save(newFit)
return newFit.ID
@staticmethod
def clearFit(fitID):
def clearFit(self, fitID):
if fitID is None:
return None
@@ -195,8 +186,7 @@ class Fit(object):
fit.clear()
return fit
@staticmethod
def removeProjectedData(fitID):
def removeProjectedData(self, fitID):
"""Removes projection relation from ships that have fitID as projection. See GitHub issue #90"""
fit = eos.db.getFit(fitID)
fits = eos.db.getProjectedFits(fitID)
@@ -249,8 +239,7 @@ class Fit(object):
fit.inited = True
return fit
@staticmethod
def searchFits(name):
def searchFits(self, name):
results = eos.db.searchFits(name)
fits = []
for fit in results:
@@ -461,8 +450,7 @@ class Fit(object):
eos.db.commit()
self.recalc(fit)
@staticmethod
def swapModules(fitID, src, dst):
def swapModules(self, fitID, src, dst):
fit = eos.db.getFit(fitID)
# Gather modules
srcMod = fit.modules[src]
@@ -589,8 +577,7 @@ class Fit(object):
self.recalc(fit)
return True
@staticmethod
def splitDrones(fit, d, amount, l):
def splitDrones(self, fit, d, amount, l):
total = d.amount
active = d.amountActive > 0
d.amount = amount
@@ -671,8 +658,7 @@ class Fit(object):
fit.character = self.character = eos.db.getCharacter(charID)
self.recalc(fit)
@staticmethod
def isAmmo(itemID):
def isAmmo(self, itemID):
return eos.db.getItem(itemID).category.name == "Charge"
def setAmmo(self, fitID, ammoID, modules):
@@ -688,8 +674,7 @@ class Fit(object):
self.recalc(fit)
@staticmethod
def getDamagePattern(fitID):
def getDamagePattern(self, fitID):
if fitID is None:
return
@@ -723,30 +708,24 @@ class Fit(object):
fit.damagePattern = dp
self.recalc(fit)
@staticmethod
def exportFit(fitID):
def exportFit(self, fitID):
return Port.exportEft(fitID)
@staticmethod
def exportEftImps(fitID):
def exportEftImps(self, fitID):
return Port.exportEftImps(fitID)
@staticmethod
def exportDna(fitID):
def exportDna(self, fitID):
return Port.exportDna(fitID)
@staticmethod
def exportXml(*fitIDs):
def exportXml(self, *fitIDs):
fits = map(lambda fitID: eos.db.getFit(fitID), fitIDs)
return Port.exportXml(*fits)
@staticmethod
def backupFits(path, callback):
def backupFits(self, path, callback):
thread = FitBackupThread(path, callback)
thread.start()
@staticmethod
def importFitsThreaded(paths, callback):
def importFitsThreaded(self, paths, callback):
thread = FitImportThread(paths, callback)
thread.start()
@@ -778,8 +757,7 @@ class Fit(object):
fit.damagePattern = self.pattern
return fits
@staticmethod
def saveImportedFits(fits):
def saveImportedFits(self, fits):
IDs = []
for fit in fits:
eos.db.save(fit)
@@ -787,8 +765,7 @@ class Fit(object):
return IDs
@staticmethod
def checkStates(fit, base):
def checkStates(self, fit, base):
changed = False
for mod in fit.modules:
if mod != base:

7
service/port.py
View File

@@ -30,6 +30,9 @@ try:
except ImportError:
from gui.utils.compat import OrderedDict
FIT_WIN_HEADINGS = ["High power", "Medium power", "Low power", "Rig Slot", "Sub System", "Charges"]
EFT_SLOT_ORDER = [Slot.LOW, Slot.MED, Slot.HIGH, Slot.RIG, Slot.SUBSYSTEM]
class Port(object):
"""Service which houses all import/export format functions"""
@@ -42,7 +45,7 @@ class Port(object):
# If string is from in-game copy of fitting window
# We match " power" instead of "High power" in case a fit has no high modules
if " power" in firstLine and activeFit is not None:
if firstLine in FIT_WIN_HEADINGS and activeFit is not None:
return "FIT", (cls.importFittingWindow(string, activeFit),)
# If we have "<url=fitting", fit is coming from eve chat
@@ -578,7 +581,7 @@ class Port(object):
curr += "\n"
stuff[slot].append(curr)
for slotType in [Slot.LOW, Slot.MED, Slot.HIGH, Slot.RIG, Slot.SUBSYSTEM]:
for slotType in EFT_SLOT_ORDER:
data = stuff.get(slotType)
if data is not None:
export += "\n"