diff --git a/service/port/eft.py b/service/port/eft.py index 5149fc14a..b36b4708d 100644 --- a/service/port/eft.py +++ b/service/port/eft.py @@ -45,7 +45,7 @@ pyfalog = Logger(__name__) MODULE_CATS = ('Module', 'Subsystem', 'Structure Module') SLOT_ORDER = (FittingSlot.LOW, FittingSlot.MED, FittingSlot.HIGH, FittingSlot.RIG, FittingSlot.SUBSYSTEM, FittingSlot.SERVICE) -OFFLINE_SUFFIX = '/OFFLINE' +OFFLINE_SUFFIX = '/offline' NAME_CHARS = r'[^,/\[\]]' # Characters which are allowed to be used in name @@ -251,7 +251,7 @@ def importEft(lines): aFit.mutations = importGetMutationData(lines) stubPattern = r'^\[.+?\]$' - modulePattern = r'^(?P{0}+?)(,\s*(?P{0}+?))?(?P\s*{1})?(\s*\[(?P\d+?)\])?$'.format(NAME_CHARS, OFFLINE_SUFFIX) + modulePattern = r'^(?P{0}+?)(,\s*(?P{0}+?))?(?P\s*/(OFFLINE|offline))?(\s*\[(?P\d+?)\])?$'.format(NAME_CHARS) droneCargoPattern = r'^(?P{}+?) x(?P\d+?)(\s*\[(?P\d+?)\])?$'.format(NAME_CHARS) sections = []