ED/EDMarketConnector
1
0
Fork 0
mirror of https://github.com/EDCD/EDMarketConnector.git synced 2025-06-08 19:32:15 +03:00
Code Issues Projects Releases Wiki Activity

Replaced repeated code with helper function

Browse Source
This commit is contained in:
A_D 2020-08-07 15:18:33 +02:00
parent a88cb454da
commit 7adf522de9
No known key found for this signature in database
GPG Key ID: 4BE9EB7DF45076C4
1 changed files with 22 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
plugins/eddn.py
View File

@ -265,19 +265,15 @@ class EDDN:
:param data: dict containing the outfitting data :param data: dict containing the outfitting data
:param is_beta: whether or not we're currently in beta mode :param is_beta: whether or not we're currently in beta mode
""" """
economies: Dict[str, Any] = data['lastStarport'].get('economies') or {}
modules: Dict[str, Any] = data['lastStarport'].get('modules') or {} modules: Dict[str, Any] = data['lastStarport'].get('modules') or {}
ships: Dict[str, Union[Dict[str, Any], List]] = data['lastStarport'].get('ships') or {
'shipyard_list': {}, 'unavailable_list': []
}
# Horizons flag - will hit at least Int_PlanetApproachSuite other than at engineer bases ("Colony"), # Horizons flag - will hit at least Int_PlanetApproachSuite other than at engineer bases ("Colony"),
# prison or rescue Megaships, or under Pirate Attack etc # prison or rescue Megaships, or under Pirate Attack etc
horizons = ( horizons: bool = is_horizons(
any(economy['name'] == 'Colony' for economy in economies.values()) or data['lastStarport'].get('economies', {}),
any(module.get('sku') == HORIZ_SKU for module in modules.values()) or modules,
any(ship.get('sku') == HORIZ_SKU for ship in (ships['shipyard_list'] or {}).values()) data['lastStarport'].get('ships', {'shipyard_list': {}, 'unavailable_list': []})
) )
to_search: Iterator[Mapping[str, Any]] = filter( to_search: Iterator[Mapping[str, Any]] = filter(
lambda m: self.MODULE_RE.search(m['name']) and m.get('sku') in (None, HORIZ_SKU) and lambda m: self.MODULE_RE.search(m['name']) and m.get('sku') in (None, HORIZ_SKU) and
@ -312,14 +308,12 @@ class EDDN:
:param data: dict containing the shipyard data :param data: dict containing the shipyard data
:param is_beta: whether or not we are in beta mode :param is_beta: whether or not we are in beta mode
""" """
economies: Dict[str, Any] = data['lastStarport'].get('economies') or {} ships: Dict[str, Any] = data['lastStarport'].get('ships', {'shipyard_list': {}, 'unavailable_list': []})
modules: Dict[str, Any] = data['lastStarport'].get('modules') or {} horizons: bool = is_horizons(
ships: Dict[str, Any] = data['lastStarport'].get('ships') or {'shipyard_list': {}, 'unavailable_list': []} data['lastStarport'].get('economies', {}),
horizons: bool = ( data['lastStarport'].get('modules', {}),
any(economy['name'] == 'Colony' for economy in economies.values()) or ships
any(module.get('sku') == HORIZ_SKU for module in modules.values()) or )
any(ship.get('sku') == HORIZ_SKU for ship in (ships['shipyard_list'] or {}).values())
)
shipyard: List[Mapping[str, Any]] = sorted( shipyard: List[Mapping[str, Any]] = sorted(
itertools.chain( itertools.chain(
@ -728,3 +722,14 @@ def cmdr_data(data: Mapping[str, Any], is_beta: bool) -> str:
except Exception as e: except Exception as e:
logger.debug('Failed exporting data', exc_info=e) logger.debug('Failed exporting data', exc_info=e)
return str(e) return str(e)
MAP_STR_ANY = Mapping[str, Any]
def is_horizons(economies: MAP_STR_ANY, modules: MAP_STR_ANY, ships: MAP_STR_ANY) -> bool:
return (
any(economy['name'] == 'Colony' for economy in economies.values()) or
any(module.get('sku') == HORIZ_SKU for module in modules.values()) or
any(ship.get('sku') == HORIZ_SKU for ship in (ships['shipyard_list'] or {}).values())
)