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

Merge pull request #232 from blitzmann/progress

Browse Source 
Port custom wait dialog to wx.ProgressDialog
This commit is contained in:
Ryan Holmes
2015-01-08 12:15:05 -06:00
parent 07da5aa861 e42671fbec
commit 88b1426fe0
6 changed files with 214 additions and 131 deletions
Download Patch File Download Diff File Expand all files Collapse all files

80
service/fit.py
View File

@@ -17,7 +17,6 @@
# along with pyfa. If not, see <http://www.gnu.org/licenses/>.
#===============================================================================
import os.path
import locale
import copy
import threading
@@ -47,11 +46,13 @@ class FitBackupThread(threading.Thread):
path = self.path
sFit = Fit.getInstance()
allFits = map(lambda x: x[0], sFit.getAllFits())
backedUpFits = sFit.exportXml(*allFits)
backedUpFits = sFit.exportXml(self.callback, *allFits)
backupFile = open(path, "w", encoding="utf-8")
backupFile.write(backedUpFits)
backupFile.close()
wx.CallAfter(self.callback)
# Send done signal to GUI
wx.CallAfter(self.callback, -1)
class FitImportThread(threading.Thread):
@@ -61,14 +62,11 @@ class FitImportThread(threading.Thread):
self.callback = callback
def run(self):
importedFits = []
paths = self.paths
sFit = Fit.getInstance()
for path in paths:
pathImported = sFit.importFit(path)
if pathImported is not None:
importedFits += pathImported
wx.CallAfter(self.callback, importedFits)
sFit.importFitFromFiles(self.paths, self.callback)
# Send done signal to GUI
wx.CallAfter(self.callback, -1)
class Fit(object):
@@ -127,6 +125,9 @@ class Fit(object):
return names
def countAllFits(self):
return eos.db.countAllFits()
def countFitsWithShip(self, shipID):
count = eos.db.countFitsWithShip(shipID)
return count
@@ -758,9 +759,9 @@ class Fit(object):
fit = eos.db.getFit(fitID)
return Port.exportDna(fit)
def exportXml(self, *fitIDs):
def exportXml(self, callback = None, *fitIDs):
fits = map(lambda fitID: eos.db.getFit(fitID), fitIDs)
return Port.exportXml(*fits)
return Port.exportXml(callback, *fits)
def backupFits(self, path, callback):
thread = FitBackupThread(path, callback)
@@ -770,26 +771,46 @@ class Fit(object):
thread = FitImportThread(paths, callback)
thread.start()
def importFit(self, path):
filename = os.path.split(path)[1]
def importFitFromFiles(self, paths, callback=None):
"""
Imports fits from file(s). First processes all provided paths and stores
assembled fits into a list. This allows us to call back to the GUI as
fits are processed as well as when fits are being saved.
returns
"""
defcodepage = locale.getpreferredencoding()
file = open(path, "r")
srcString = file.read()
# If file had ANSI encoding, convert it to unicode using system
# default codepage, or use fallback cp1252 on any encoding errors
if isinstance(srcString, str):
try:
srcString = unicode(srcString, defcodepage)
except UnicodeDecodeError:
srcString = unicode(srcString, "cp1252")
fits = []
for path in paths:
if callback: # Pulse
wx.CallAfter(callback, "Processing file:\n%s"%path)
_, fits = Port.importAuto(srcString, filename)
for fit in fits:
file = open(path, "r")
srcString = file.read()
# If file had ANSI encoding, convert it to unicode using system
# default codepage, or use fallback cp1252 on any encoding errors
if isinstance(srcString, str):
try:
srcString = unicode(srcString, defcodepage)
except UnicodeDecodeError:
srcString = unicode(srcString, "cp1252")
_, fitsImport = Port.importAuto(srcString, path, callback=callback)
fits += fitsImport
IDs = []
numFits = len(fits)
for i, fit in enumerate(fits):
# Set some more fit attributes and save
fit.character = self.character
fit.damagePattern = self.pattern
fit.targetResists = self.targetResists
eos.db.save(fit)
IDs.append(fit.ID)
if callback: # Pulse
wx.CallAfter(callback, "Saving fit\n%d/%d"%(i+1, numFits))
return fits
def importFitFromBuffer(self, bufferStr, activeFit=None):
@@ -798,15 +819,8 @@ class Fit(object):
fit.character = self.character
fit.damagePattern = self.pattern
fit.targetResists = self.targetResists
return fits
def saveImportedFits(self, fits):
IDs = []
for fit in fits:
eos.db.save(fit)
IDs.append(fit.ID)
return IDs
return fits
def checkStates(self, fit, base):
changed = False

27
service/port.py
View File

@@ -19,10 +19,10 @@
import re
import xml.dom
import json
from eos.types import State, Slot, Module, Cargo, Fit, Ship, Drone, Implant, Booster
import service
import wx
try:
from collections import OrderedDict
@@ -35,20 +35,20 @@ class Port(object):
"""Service which houses all import/export format functions"""
@classmethod
def importAuto(cls, string, sourceFileName=None, activeFit=None):
def importAuto(cls, string, sourceFileName=None, activeFit=None, callback=None):
# Get first line and strip space symbols of it to avoid possible detection errors
firstLine = re.split("[\n\r]+", string.strip(), maxsplit=1)[0]
firstLine = firstLine.strip()
# If XML-style start of tag encountered, detect as XML
if re.match("<", firstLine):
return "XML", cls.importXml(string)
return "XML", cls.importXml(string, callback)
# If we've got source file name which is used to describe ship name
# and first line contains something like [setup name], detect as eft config file
if re.match("\[.*\]", firstLine) and sourceFileName is not None:
shipName = sourceFileName.rsplit('.')[0]
return "EFT Config", cls.importEftCfg(shipName, string)
return "EFT Config", cls.importEftCfg(shipName, string, callback)
# If no file is specified and there's comma between brackets,
# consider that we have [ship, setup name] and detect like eft export format
@@ -200,7 +200,7 @@ class Port(object):
return fit
@staticmethod
def importEftCfg(shipname, contents):
def importEftCfg(shipname, contents, callback=None):
"""Handle import from EFT config store file"""
# Check if we have such ship in database, bail if we don't
@@ -346,6 +346,9 @@ class Port(object):
f.modules.append(m)
# Append fit to list of fits
fits.append(f)
if callback:
wx.CallAfter(callback, None)
# Skip fit silently if we get an exception
except Exception:
pass
@@ -353,14 +356,15 @@ class Port(object):
return fits
@staticmethod
def importXml(text):
def importXml(text, callback=None):
sMkt = service.Market.getInstance()
doc = xml.dom.minidom.parseString(text.encode("utf-8"))
fittings = doc.getElementsByTagName("fittings").item(0)
fittings = fittings.getElementsByTagName("fitting")
fits = []
for fitting in fittings:
for i, fitting in enumerate(fittings):
f = Fit()
f.name = fitting.getAttribute("name")
# <localized hint="Maelstrom">Maelstrom</localized>
@@ -402,6 +406,8 @@ class Port(object):
except KeyboardInterrupt:
continue
fits.append(f)
if callback:
wx.CallAfter(callback, None)
return fits
@@ -503,11 +509,11 @@ class Port(object):
return dna + "::"
@classmethod
def exportXml(cls, *fits):
def exportXml(cls, callback=None, *fits):
doc = xml.dom.minidom.Document()
fittings = doc.createElement("fittings")
doc.appendChild(fittings)
for fit in fits:
for i, fit in enumerate(fits):
try:
fitting = doc.createElement("fitting")
fitting.setAttribute("name", fit.name)
@@ -571,5 +577,8 @@ class Port(object):
except:
print "Failed on fitID: %d"%fit.ID
continue
finally:
if callback:
wx.CallAfter(callback, i)
return doc.toprettyxml()