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

Fit Citadel imports (#749)

Browse Source
This commit is contained in:
blitzman
2016-09-27 01:44:55 -04:00
parent 44fb4a558c
commit becb3d4bb6
1 changed files with 28 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
service/port.py
View File

@@ -21,7 +21,7 @@ import re
import os import os
import xml.dom import xml.dom
from eos.types import State, Slot, Module, Cargo, Fit, Ship, Drone, Implant, Booster from eos.types import State, Slot, Module, Cargo, Fit, Ship, Drone, Implant, Booster, Citadel
import service import service
import wx import wx
import logging import logging
@@ -174,7 +174,10 @@ class Port(object):
f.name = fit['name'] f.name = fit['name']
try: try:
f.ship = Ship(sMkt.getItem(fit['ship']['id'])) try:
f.ship = Ship(sMkt.getItem(fit['ship']['id']))
except ValueError:
f.ship = Citadel(sMkt.getItem(fit['ship']['id']))
except: except:
return None return None
@@ -228,7 +231,13 @@ class Port(object):
ids = map(int, re.findall(r'\d+', string)) ids = map(int, re.findall(r'\d+', string))
for id in ids: for id in ids:
try: try:
Ship(sMkt.getItem(id)) try:
try:
Ship(sMkt.getItem(sMkt.getItem(id)))
except ValueError:
Citadel(sMkt.getItem(sMkt.getItem(id)))
except ValueError:
Citadel(sMkt.getItem(id))
string = string[string.index(str(id)):] string = string[string.index(str(id)):]
break break
except: except:
@@ -238,7 +247,10 @@ class Port(object):
f = Fit() f = Fit()
try: try:
f.ship = Ship(sMkt.getItem(int(info[0]))) try:
f.ship = Ship(sMkt.getItem(int(info[0])))
except ValueError:
f.ship = Citadel(sMkt.getItem(int(info[0])))
f.name = "{0} - DNA Imported".format(f.ship.item.name) f.name = "{0} - DNA Imported".format(f.ship.item.name)
except UnicodeEncodeError as e: except UnicodeEncodeError as e:
def logtransform(s): def logtransform(s):
@@ -309,7 +321,10 @@ class Port(object):
try: try:
ship = sMkt.getItem(shipType) ship = sMkt.getItem(shipType)
fit.ship = Ship(ship) try:
fit.ship = Ship(ship)
except ValueError:
fit.ship = Citadel(ship)
fit.name = fitName fit.name = fitName
except: except:
return return
@@ -463,7 +478,10 @@ class Port(object):
# Strip square brackets and pull out a fit name # Strip square brackets and pull out a fit name
f.name = fitLines[0][1:-1] f.name = fitLines[0][1:-1]
# Assign ship to fitting # Assign ship to fitting
f.ship = Ship(sMkt.getItem(shipname)) try:
f.ship = Ship(sMkt.getItem(shipname))
except ValueError:
f.ship = Citadel(sMkt.getItem(shipname))
moduleList = [] moduleList = []
for x in range(1, len(fitLines)): for x in range(1, len(fitLines)):
@@ -610,7 +628,10 @@ class Port(object):
# <localized hint="Maelstrom">Maelstrom</localized> # <localized hint="Maelstrom">Maelstrom</localized>
shipType = fitting.getElementsByTagName("shipType").item(0).getAttribute("value") shipType = fitting.getElementsByTagName("shipType").item(0).getAttribute("value")
try: try:
f.ship = Ship(sMkt.getItem(shipType)) try:
f.ship = Ship(sMkt.getItem(shipType))
except ValueError:
f.ship = Citadel(sMkt.getItem(shipType))
except: except:
continue continue
hardwares = fitting.getElementsByTagName("hardware") hardwares = fitting.getElementsByTagName("hardware")