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

plugins/eddn: Tweak ships/modules in export of shipyard and outfitting from CAPI

Browse Source 
There are cases where a station/FC doesn't have outfitting modules or a
ships list.  Let's make the checks happen in both those functions and be
extra paranoid with some logging.

Closes #671
This commit is contained in:
Athanasius 2020-09-14 13:26:20 +01:00
parent 44353b668e
commit d45070c249
1 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
plugins/eddn.py
View File

@ -270,14 +270,22 @@ Msg:\n{msg}''')
: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
""" """
modules: Dict[str, Any] = data['lastStarport'].get('modules') or {} modules: Dict[str, Any] = data['lastStarport'].get('modules')
if not modules:
logger.debug('modules was None')
modules = {}
ships: Dict[str, Any] = data['lastStarport'].get('ships')
if not ships:
logger.debug('ships was None')
ships = {'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: bool = is_horizons( horizons: bool = is_horizons(
data['lastStarport'].get('economies', {}), data['lastStarport'].get('economies', {}),
modules, modules,
data['lastStarport'].get('ships', {'shipyard_list': {}, 'unavailable_list': []}) ships
) )
to_search: Iterator[Mapping[str, Any]] = filter( to_search: Iterator[Mapping[str, Any]] = filter(
@ -313,10 +321,19 @@ Msg:\n{msg}''')
: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
""" """
ships: Dict[str, Any] = data['lastStarport'].get('ships', {'shipyard_list': {}, 'unavailable_list': []}) modules: Dict[str, Any] = data['lastStarport'].get('modules')
if not modules:
logger.debug('modules was None')
modules = {}
ships: Dict[str, Any] = data['lastStarport'].get('ships')
if not ships:
logger.debug('ships was None')
ships = {'shipyard_list': {}, 'unavailable_list': []}
horizons: bool = is_horizons( horizons: bool = is_horizons(
data['lastStarport'].get('economies', {}), data['lastStarport'].get('economies', {}),
data['lastStarport'].get('modules', {}), modules,
ships ships
) )
@ -735,7 +752,7 @@ def cmdr_data(data: Mapping[str, Any], is_beta: bool) -> str:
MAP_STR_ANY = Mapping[str, Any] MAP_STR_ANY = Mapping[str, Any]
def is_horizons(economies: MAP_STR_ANY, modules: MAP_STR_ANY, ships: MAP_STR_ANY) -> bool: def is_horizons(economies: MAP_STR_ANY, modules: Dict, ships: MAP_STR_ANY) -> bool:
return ( return (
any(economy['name'] == 'Colony' for economy in economies.values()) or any(economy['name'] == 'Colony' for economy in economies.values()) or
any(module.get('sku') == HORIZ_SKU for module in modules.values()) or any(module.get('sku') == HORIZ_SKU for module in modules.values()) or