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

monitor: Remove .planet in favour of state['Body']

Browse Source 
This had mostly been done already, now it's complete.

*If* any plugin is, still, using `monitor.planet` then they get to keep
the broken pieces because it's not included in PLUGINS.md#Available-imports.
This commit is contained in:
Athanasius 2023-01-03 15:28:48 +00:00
parent 9ccd0c3b7d
commit 0177fc4d69
No known key found for this signature in database
GPG Key ID: 772697E181BB2767
1 changed files with 9 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
monitor.py
View File

@ -119,7 +119,6 @@ class EDLogs(FileSystemEventHandler): # type: ignore # See below
self.system: str | None = None self.system: str | None = None
self.coordinates: Tuple[float, float, float] | None = None self.coordinates: Tuple[float, float, float] | None = None
self.systempopulation: int | None = None self.systempopulation: int | None = None
self.planet: str | None = None
self.station: str | None = None self.station: str | None = None
self.station_marketid: int | None = None self.station_marketid: int | None = None
self.stationtype: str | None = None self.stationtype: str | None = None
@ -308,7 +307,7 @@ class EDLogs(FileSystemEventHandler): # type: ignore # See below
self.system = None self.system = None
self.state['SystemAddress'] = None self.state['SystemAddress'] = None
self.coordinates = None self.coordinates = None
self.planet = self.state['Body'] = None self.state['Body'] = None
self.state['BodyID'] = None self.state['BodyID'] = None
self.state['BodyType'] = None self.state['BodyType'] = None
self.station = None self.station = None
@ -535,8 +534,8 @@ class EDLogs(FileSystemEventHandler): # type: ignore # See below
'Population': self.systempopulation, 'Population': self.systempopulation,
} }
if self.planet: if self.state['Body']:
entry['Body'] = self.planet entry['Body'] = self.state['Body']
entry['BodyID'] = self.state['BodyID'] entry['BodyID'] = self.state['BodyID']
entry['BodyType'] = self.state['BodyType'] entry['BodyType'] = self.state['BodyType']
@ -583,7 +582,7 @@ class EDLogs(FileSystemEventHandler): # type: ignore # See below
self.system = None self.system = None
self.state['SystemAddress'] = None self.state['SystemAddress'] = None
self.state['StarPos'] = self.coordinates = None self.state['StarPos'] = self.coordinates = None
self.state['Body'] = self.planet = None self.state['Body'] = None
self.state['BodyID'] = None self.state['BodyID'] = None
self.station = None self.station = None
self.station_marketid = None self.station_marketid = None
@ -620,7 +619,7 @@ class EDLogs(FileSystemEventHandler): # type: ignore # See below
self.system = None self.system = None
self.state['SystemAddress'] = None self.state['SystemAddress'] = None
self.state['StarPos'] = self.coordinates = None self.state['StarPos'] = self.coordinates = None
self.status['Body'] = self.planet = None self.status['Body'] = None
self.status['BodyID'] = None self.status['BodyID'] = None
self.status['BodyType'] = None self.status['BodyType'] = None
self.station = None self.station = None
@ -856,7 +855,8 @@ class EDLogs(FileSystemEventHandler): # type: ignore # See below
# • InSRV: bool # • InSRV: bool
# • OnFoot: bool # • OnFoot: bool
if event_type in ('location', 'carrierjump'): if event_type in ('location', 'carrierjump'):
self.planet = entry.get('Body') if entry.get('BodyType') == 'Planet' else None # We're not guaranteeing this is a planet, rather than a
# station.
self.state['Body'] = entry.get('Body') self.state['Body'] = entry.get('Body')
self.state['BodyID'] = entry.get('BodyID') self.state['BodyID'] = entry.get('BodyID')
self.state['BodyType'] = entry.get('BodyType') self.state['BodyType'] = entry.get('BodyType')
@ -867,7 +867,6 @@ class EDLogs(FileSystemEventHandler): # type: ignore # See below
self.state['IsDocked'] = True self.state['IsDocked'] = True
elif event_type == 'fsdjump': elif event_type == 'fsdjump':
self.planet = None
self.state['Body'] = None self.state['Body'] = None
self.state['BodyID'] = None self.state['BodyID'] = None
self.state['BodyType'] = None self.state['BodyType'] = None
@ -902,7 +901,6 @@ class EDLogs(FileSystemEventHandler): # type: ignore # See below
self.state['Dropship'] = None self.state['Dropship'] = None
elif event_type == 'approachbody': elif event_type == 'approachbody':
self.planet = entry['Body']
self.state['Body'] = entry['Body'] self.state['Body'] = entry['Body']
self.state['BodyID'] = entry.get('BodyID') self.state['BodyID'] = entry.get('BodyID')
self.state['BodyType'] = 'Planet' # Best guess. Journal says always planet. self.state['BodyType'] = 'Planet' # Best guess. Journal says always planet.
@ -911,7 +909,6 @@ class EDLogs(FileSystemEventHandler): # type: ignore # See below
# FIXME: In the plugins/eddn.py version of this tracking we # FIXME: In the plugins/eddn.py version of this tracking we
# explicitly do NOT clear this information for `supercruiseentry', # explicitly do NOT clear this information for `supercruiseentry',
# but it is also doing some Status.jon checking. # but it is also doing some Status.jon checking.
self.planet = None
self.state['Body'] = None self.state['Body'] = None
self.state['BodyID'] = None self.state['BodyID'] = None
self.state['BodyType'] = None self.state['BodyType'] = None
@ -1599,7 +1596,7 @@ class EDLogs(FileSystemEventHandler): # type: ignore # See below
elif event_type == 'joinacrew': elif event_type == 'joinacrew':
self.state['Captain'] = entry['Captain'] self.state['Captain'] = entry['Captain']
self.state['Role'] = 'Idle' self.state['Role'] = 'Idle'
self.state['Body'] = self.planet = None self.state['Body'] = None
self.state['BodyID'] = None self.state['BodyID'] = None
self.system = None self.system = None
self.station = None self.station = None
@ -1619,7 +1616,7 @@ class EDLogs(FileSystemEventHandler): # type: ignore # See below
elif event_type == 'quitacrew': elif event_type == 'quitacrew':
self.state['Captain'] = None self.state['Captain'] = None
self.state['Role'] = None self.state['Role'] = None
self.state['Body'] = self.planet = None self.state['Body'] = None
self.state['BodyID'] = None self.state['BodyID'] = None
self.state['BodyType'] = None self.state['BodyType'] = None
self.system = None self.system = None
@ -1714,11 +1711,6 @@ class EDLogs(FileSystemEventHandler): # type: ignore # See below
# There should be a `Backpack` event as you 'come to' in the # There should be a `Backpack` event as you 'come to' in the
# new location, so no need to zero out BackPack here. # new location, so no need to zero out BackPack here.
# HACK (not game related / 2021-06-2): self.planet is moved into a more general self.state['Body'].
# This exists to help plugins doing what they SHOULDN'T BE cope. It will be removed at some point.
if self.state['Body'] is None or self.state['BodyType'] == 'Planet':
self.planet = self.state['Body']
return entry return entry
except Exception as ex: except Exception as ex: