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

Check that modules fit on imported fits #512 #522

Browse Source
This commit is contained in:
aacn500
2016-03-16 20:12:26 +00:00
parent c42748a5dd
commit 57433efe80
1 changed files with 57 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

71
service/port.py
View File

@@ -123,7 +123,10 @@ class Port(object):
# If XML-style start of tag encountered, detect as XML
if re.match("<", firstLine):
return "XML", cls.importXml(string, callback, encoding)
if encoding:
return "XML", cls.importXml(string, callback, encoding)
else:
return "XML", cls.importXml(string, callback)
# If JSON-style start, parse os CREST/JSON
if firstLine[0] == '{':
@@ -176,13 +179,21 @@ class Port(object):
# When item can't be added to any slot (unknown item or just charge), ignore it
except ValueError:
continue
if m.isValidState(State.ACTIVE):
m.state = State.ACTIVE
if m.fits(f):
m.owner = f
if m.isValidState(State.ACTIVE):
m.state = State.ACTIVE
f.modules.append(m)
f.modules.append(m)
except:
continue
# Check that the states of all modules are valid
sFit = service.Fit.getInstance()
sFit.recalc(f)
sFit.checkStates(f, None)
return f
@staticmethod
@@ -219,12 +230,19 @@ class Port(object):
for i in xrange(int(amount)):
try:
m = Module(item)
f.modules.append(m)
if m.fits(f):
f.modules.append(m)
except:
pass
m.owner = f
if m.isValidState(State.ACTIVE):
m.state = State.ACTIVE
# Check that the states of all modules are valid
sFit = service.Fit.getInstance()
sFit.recalc(f)
sFit.checkStates(f, None)
return f
@staticmethod
@@ -315,12 +333,15 @@ class Port(object):
except:
pass
if setOffline is True and m.isValidState(State.OFFLINE):
m.state = State.OFFLINE
elif m.isValidState(State.ACTIVE):
m.state = State.ACTIVE
if m.fits(fit):
m.owner = fit
if setOffline is True and m.isValidState(State.OFFLINE):
m.state = State.OFFLINE
elif m.isValidState(State.ACTIVE):
m.state = State.ACTIVE
fit.modules.append(m)
fit.modules.append(m)
for droneName in droneMap:
d = Drone(sMkt.getItem(droneName))
@@ -332,6 +353,11 @@ class Port(object):
c.amount = cargoMap[cargoName]
fit.cargo.append(c)
# Check that there are no conflicts between active modules
sFit = service.Fit.getInstance()
sFit.recalc(fit)
sFit.checkStates(fit, None)
return fit
@staticmethod
@@ -467,6 +493,7 @@ class Port(object):
# Create module and activate it if it's activable
m = Module(modItem)
m.owner = f
if m.isValidState(State.ACTIVE):
m.state = State.ACTIVE
# Add charge to mod if applicable, on any errors just don't add anything
@@ -478,7 +505,14 @@ class Port(object):
except:
pass
# Append module to fit
f.modules.append(m)
if m.fits(f):
f.modules.append(m)
# Check that there are no conflicts between active modules
sFit = service.Fit.getInstance()
sFit.recalc(f)
sFit.checkStates(f, None)
# Append fit to list of fits
fits.append(f)
@@ -534,12 +568,21 @@ class Port(object):
# When item can't be added to any slot (unknown item or just charge), ignore it
except ValueError:
continue
if m.isValidState(State.ACTIVE):
m.state = State.ACTIVE
if m.fits(f):
m.owner = f
if m.isValidState(State.ACTIVE):
m.state = State.ACTIVE
f.modules.append(m)
f.modules.append(m)
except KeyboardInterrupt:
continue
# Check that the states of all modules are valid
sFit = service.Fit.getInstance()
sFit.recalc(f)
sFit.checkStates(f, None)
fits.append(f)
if callback:
wx.CallAfter(callback, None)