Change service.efsPort to a class structure for consistancy.

gui/mainFrame.py

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

savedata/efs_export_base_fits.py

@@ -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

savedata/efs_export_pyfa_fits.py

@@ -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};')