From 4be78db73807d2a5ebc5308d68e1c736d7fb64a2 Mon Sep 17 00:00:00 2001 From: MaruMaruOO Date: Mon, 16 Jul 2018 06:25:56 -0400 Subject: [PATCH] Added additional data to efs exports moduleNames and moved it to service.efsPort --- gui/mainFrame.py | 3 +-- savedata/efs_export_base_fits.py | 2 +- savedata/efs_export_pyfa_fits.py | 2 +- savedata/makeAndDiffCheck.sh | 2 +- efs_stat_export.py => service/efsPort.py | 18 +++++++++++++++++- 5 files changed, 21 insertions(+), 6 deletions(-) rename efs_stat_export.py => service/efsPort.py (97%) diff --git a/gui/mainFrame.py b/gui/mainFrame.py index 3458cd6d0..dc0162d69 100644 --- a/gui/mainFrame.py +++ b/gui/mainFrame.py @@ -77,10 +77,9 @@ 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.settings import HTMLExportSettings -from efs_stat_export import parseNeededFitDetails as exportEfsStats - from time import gmtime, strftime import threading diff --git a/savedata/efs_export_base_fits.py b/savedata/efs_export_base_fits.py index a4fa8404d..9ebb026d8 100644 --- a/savedata/efs_export_base_fits.py +++ b/savedata/efs_export_base_fits.py @@ -78,7 +78,7 @@ eos.db.saveddata_meta.create_all() import json from service.fit import Fit -from efs_stat_export import parseNeededFitDetails +from service.efsPort import parseNeededFitDetails from sqlalchemy import Column, String, Integer, ForeignKey, Boolean, Table from sqlalchemy.orm import relation, mapper, synonym, deferred diff --git a/savedata/efs_export_pyfa_fits.py b/savedata/efs_export_pyfa_fits.py index 749fdc1d4..5484b097d 100644 --- a/savedata/efs_export_pyfa_fits.py +++ b/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 efs_stat_export import parseNeededFitDetails +from service.efsPort import parseNeededFitDetails def exportPyfaFits(opts): nameReq = '' diff --git a/savedata/makeAndDiffCheck.sh b/savedata/makeAndDiffCheck.sh index 84ddd89a5..c1aee9dc3 100755 --- a/savedata/makeAndDiffCheck.sh +++ b/savedata/makeAndDiffCheck.sh @@ -51,5 +51,5 @@ if [[ $EXPECTERRORS == True ]] ; then else diff -s --color=always ../shipJSON.js ~/.pyfa/shipJSON.js | grep -m 3 --color '' diff -s --color=always ../shipBaseJSON.js ~/.pyfa/shipBaseJSON.js | grep -m 3 --color '' -/home/stock/scripts/Pyfa/.tox/pep8/bin/flake8 --exclude=.svn,CVS,.bzr,.hg,.git,__pycache__,venv,tests,.tox,build,dist,__init__.py,floatspin.py --ignore=E121,E126,E127,E128,E203,E731,F401,E722,E741 efs_stat_export.py --max-line-length=165 +/home/stock/scripts/Pyfa/.tox/pep8/bin/flake8 --exclude=.svn,CVS,.bzr,.hg,.git,__pycache__,venv,tests,.tox,build,dist,__init__.py,floatspin.py --ignore=E121,E126,E127,E128,E203,E731,F401,E722,E741 service/efsPort.py --max-line-length=165 fi diff --git a/efs_stat_export.py b/service/efsPort.py similarity index 97% rename from efs_stat_export.py rename to service/efsPort.py index a8e50f7f4..a5d47ad41 100755 --- a/efs_stat_export.py +++ b/service/efsPort.py @@ -247,11 +247,27 @@ def getModuleNames(fit): moduleNames.append('Implants:') for implant in fit.implants: moduleNames.append(implant.item.name) + if len(fit.boosters) > 0: + moduleNames.append('') + moduleNames.append('Boosters:') + for booster in fit.boosters: + moduleNames.append(booster.item.name) if len(fit.commandFits) > 0: moduleNames.append('') moduleNames.append('Command Fits:') for commandFit in fit.commandFits: moduleNames.append(commandFit.name) + if len(fit.projectedModules) > 0: + moduleNames.append('') + moduleNames.append('Projected Modules:') + for mod in fit.projectedModules: + moduleNames.append(mod.item.name) + + if fit.character.name != "All 5": + moduleNames.append('') + moduleNames.append('Character:') + moduleNames.append(fit.character.name) + return moduleNames @@ -595,7 +611,7 @@ def parseNeededFitDetails(fit, groupID): 'maxTargetRange': fit.maxTargetRange, 'scanStrength': fit.scanStrength, 'weaponDPS': fit.weaponDPS, 'alignTime': fit.alignTime, 'signatureRadius': fitModAttr['signatureRadius'], 'weapons': weaponSystems, 'scanRes': fitModAttr['scanResolution'], - 'projectedModules': fit.projectedModules, 'capUsed': fit.capUsed, 'capRecharge': fit.capRecharge, + 'capUsed': fit.capUsed, 'capRecharge': fit.capRecharge, 'rigSlots': fitModAttr['rigSlots'], 'lowSlots': fitModAttr['lowSlots'], 'midSlots': fitModAttr['medSlots'], 'highSlots': fitModAttr['hiSlots'], 'turretSlots': fitModAttr['turretSlotsLeft'], 'launcherSlots': fitModAttr['launcherSlotsLeft'],