Change service.efsPort to a class structure for consistancy.

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

View File

@@ -78,7 +78,7 @@ eos.db.saveddata_meta.create_all()
import json
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.orm import relation, mapper, synonym, deferred
@@ -250,6 +250,6 @@ def setFitFromString(dnaString, fitName, groupID) :
fitL.addCommandFit(fit.ID, shieldLinkShip)
fitL.addCommandFit(fit.ID, skirmishLinkShip)
fitL.addCommandFit(fit.ID, infoLinkShip)
jsonStr = parseNeededFitDetails(fit, groupID)
jsonStr = EfsPort.exportEfs(fit, groupID)
Fit.deleteFit(fitID)
return jsonStr

View File

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