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

Change service.efsPort to a class structure for consistancy.

Browse Source
This commit is contained in:
MaruMaruOO
2018-07-17 02:45:00 -04:00
parent 4be78db738
commit b1f1db1bee
4 changed files with 576 additions and 581 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
gui/mainFrame.py
View File

@@ -77,7 +77,7 @@ from eos.modifiedAttributeDict import ModifiedAttributeDict
from eos.db.saveddata.loadDefaultDatabaseValues import DefaultDatabaseValues from eos.db.saveddata.loadDefaultDatabaseValues import DefaultDatabaseValues
from eos.db.saveddata.queries import getFit as db_getFit from eos.db.saveddata.queries import getFit as db_getFit
from service.port import Port, IPortUser from service.port import Port, IPortUser
from service.efsPort import parseNeededFitDetails as exportEfsStats from service.efsPort import EfsPort
from service.settings import HTMLExportSettings from service.settings import HTMLExportSettings
from time import gmtime, strftime from time import gmtime, strftime
@@ -729,7 +729,7 @@ class MainFrame(wx.Frame):
def clipboardEfs(self): def clipboardEfs(self):
fit = db_getFit(self.getActiveFit()) fit = db_getFit(self.getActiveFit())
toClipboard(exportEfsStats(fit, 0)) toClipboard(EfsPort.exportEfs(fit, 0))
def importFromClipboard(self, event): def importFromClipboard(self, event):
clipboard = fromClipboard() clipboard = fromClipboard()

4
savedata/efs_export_base_fits.py
View File

@@ -78,7 +78,7 @@ eos.db.saveddata_meta.create_all()
import json import json
from service.fit import Fit from service.fit import Fit
from service.efsPort import parseNeededFitDetails from service.efsPort import EfsPort
from sqlalchemy import Column, String, Integer, ForeignKey, Boolean, Table from sqlalchemy import Column, String, Integer, ForeignKey, Boolean, Table
from sqlalchemy.orm import relation, mapper, synonym, deferred from sqlalchemy.orm import relation, mapper, synonym, deferred
@@ -250,6 +250,6 @@ def setFitFromString(dnaString, fitName, groupID) :
fitL.addCommandFit(fit.ID, shieldLinkShip) fitL.addCommandFit(fit.ID, shieldLinkShip)
fitL.addCommandFit(fit.ID, skirmishLinkShip) fitL.addCommandFit(fit.ID, skirmishLinkShip)
fitL.addCommandFit(fit.ID, infoLinkShip) fitL.addCommandFit(fit.ID, infoLinkShip)
jsonStr = parseNeededFitDetails(fit, groupID) jsonStr = EfsPort.exportEfs(fit, groupID)
Fit.deleteFit(fitID) Fit.deleteFit(fitID)
return jsonStr return jsonStr

4
savedata/efs_export_pyfa_fits.py
View File

@@ -19,7 +19,7 @@ import eos.db
if not os.path.exists(config.savePath): if not os.path.exists(config.savePath):
os.mkdir(config.savePath) os.mkdir(config.savePath)
from service.efsPort import parseNeededFitDetails from service.efsPort import EfsPort
def exportPyfaFits(opts): def exportPyfaFits(opts):
nameReq = '' nameReq = ''
@@ -48,7 +48,7 @@ def exportPyfaFits(opts):
n += 1 n += 1
name = fit.ship.name + ': ' + fit.name name = fit.ship.name + ': ' + fit.name
if n >= skipTill and nameReq in name: if n >= skipTill and nameReq in name:
stats = parseNeededFitDetails(fit, 0) stats = EfsPort.exportEfs(fit, 0)
output.write(stats) output.write(stats)
output.write(',\n') output.write(',\n')
output.write(']);\nexport {shipJSON};') output.write(']);\nexport {shipJSON};')

1145
service/efsPort.py
View File

File diff suppressed because it is too large Load Diff