From 771809eca26513a49843182e95581d4c552a68be Mon Sep 17 00:00:00 2001 From: DarkPhoenix Date: Thu, 13 Jun 2013 00:07:53 +0400 Subject: [PATCH] Do not fail whole import on failed modules --- eos/saveddata/fit.py | 32 +++++++++++++++++--------------- 1 file changed, 17 insertions(+), 15 deletions(-) diff --git a/eos/saveddata/fit.py b/eos/saveddata/fit.py index 98d8b4d4d..115f85dde 100755 --- a/eos/saveddata/fit.py +++ b/eos/saveddata/fit.py @@ -332,30 +332,32 @@ class Fit(object): fits = [] from eos import db for fitting in fittings: - try: + f = Fit() f.name = fitting.getAttribute("name") shipType = fitting.getElementsByTagName("shipType").item(0).getAttribute("value") f.ship = Ship(db.getItem(shipType)) hardwares = fitting.getElementsByTagName("hardware") for hardware in hardwares: - moduleName = hardware.getAttribute("type") - item = db.getItem(moduleName, eager="group.category") - if item: - if item.category.name == "Drone": - d = Drone(item) - d.amount = int(hardware.getAttribute("qty")) - f.drones.append(d) - else: - m = Module(item) - if m.isValidState(State.ACTIVE): - m.state = State.ACTIVE + try: + moduleName = hardware.getAttribute("type") + item = db.getItem(moduleName, eager="group.category") + if item: + if item.category.name == "Drone": + d = Drone(item) + d.amount = int(hardware.getAttribute("qty")) + f.drones.append(d) + else: + m = Module(item) + if m.isValidState(State.ACTIVE): + m.state = State.ACTIVE - f.modules.append(m) + f.modules.append(m) + except Exception: + continue fits.append(f) - except Exception: - pass + return fits