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

monitor/tracking: Move .stationtype to state['StationType']

Browse Source 
* Nothing outside of monitor.py uses this, but it's of the same nature as
  StationName and MarketID, so do this for consistency.

For now we'll leave monitor.stationservices as-is.
This commit is contained in:
Athanasius 2023-01-09 17:00:31 +00:00
parent 31e8d0372d
commit ef1642181a
No known key found for this signature in database
GPG Key ID: 772697E181BB2767
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
PLUGINS.md
View File

@ -662,6 +662,7 @@ Content of `state` (updated to the current journal entry):
| `BodyType`[3][4] | `Optional[str]` | The type of body that `Body` refers to | | `BodyType`[3][4] | `Optional[str]` | The type of body that `Body` refers to |
| `StationName`[3] | `Optional[str]` | Name of the station we're docked at, if applicable | | `StationName`[3] | `Optional[str]` | Name of the station we're docked at, if applicable |
| `MarketID`[3] | `Optional[str]` | MarketID of the station we're docked at, if applicable | | `MarketID`[3] | `Optional[str]` | MarketID of the station we're docked at, if applicable |
| `StationType`[3] | `Optional[str]` | Type of the station we're docked at, if applicable |
[1] - Contents of `NavRoute` not changed if a `NavRouteClear` event is seen, [1] - Contents of `NavRoute` not changed if a `NavRouteClear` event is seen,
but plugins will see the `NavRouteClear` event. but plugins will see the `NavRouteClear` event.
@ -808,7 +809,7 @@ now track in the same manner as prior core EDDN plugin code. Check the
documentation above for some caveats. Do not just blindly use this data, or documentation above for some caveats. Do not just blindly use this data, or
the 'Body' name value. the 'Body' name value.
`StationName` and `MarketID` added to the `state` dictionary. `StationName`, `MarketID`, and `StationType` added to the `state` dictionary.
___ ___

23
monitor.py
View File

@ -116,7 +116,6 @@ class EDLogs(FileSystemEventHandler): # type: ignore # See below
self.mode: str | None = None self.mode: str | None = None
self.group: str | None = None self.group: str | None = None
self.cmdr: str | None = None self.cmdr: str | None = None
self.stationtype: str | None = None
self.started: int | None = None # Timestamp of the LoadGame event self.started: int | None = None # Timestamp of the LoadGame event
self._navroute_retries_remaining = 0 self._navroute_retries_remaining = 0
@ -311,7 +310,7 @@ class EDLogs(FileSystemEventHandler): # type: ignore # See below
self.state['BodyType'] = None self.state['BodyType'] = None
self.state['StationName'] = None self.state['StationName'] = None
self.state['MarketID'] = None self.state['MarketID'] = None
self.stationtype = None self.state['StationType'] = None
self.stationservices = None self.stationservices = None
self.is_beta = False self.is_beta = False
self.state['OnFoot'] = False self.state['OnFoot'] = False
@ -542,7 +541,7 @@ class EDLogs(FileSystemEventHandler): # type: ignore # See below
entry['Docked'] = True entry['Docked'] = True
entry['MarketID'] = self.state['MarketID'] entry['MarketID'] = self.state['MarketID']
entry['StationName'] = self.state['StationName'] entry['StationName'] = self.state['StationName']
entry['StationType'] = self.stationtype entry['StationType'] = self.state['StationType']
else: else:
entry['Docked'] = False entry['Docked'] = False
@ -586,7 +585,7 @@ class EDLogs(FileSystemEventHandler): # type: ignore # See below
self.state['BodyID'] = None self.state['BodyID'] = None
self.state['StationName'] = None self.state['StationName'] = None
self.state['MarketID'] = None self.state['MarketID'] = None
self.stationtype = None self.state['StationType'] = None
self.stationservices = None self.stationservices = None
self.started = None self.started = None
self.__init_state() self.__init_state()
@ -625,7 +624,7 @@ class EDLogs(FileSystemEventHandler): # type: ignore # See below
self.state['BodyType'] = None self.state['BodyType'] = None
self.state['StationName'] = None self.state['StationName'] = None
self.state['MarketID'] = None self.state['MarketID'] = None
self.stationtype = None self.state['StationType'] = None
self.stationservices = None self.stationservices = None
self.started = timegm(strptime(entry['timestamp'], '%Y-%m-%dT%H:%M:%SZ')) self.started = timegm(strptime(entry['timestamp'], '%Y-%m-%dT%H:%M:%SZ'))
# Don't set Ship, ShipID etc since this will reflect Fighter or SRV if starting in those # Don't set Ship, ShipID etc since this will reflect Fighter or SRV if starting in those
@ -758,7 +757,7 @@ class EDLogs(FileSystemEventHandler): # type: ignore # See below
elif event_type == 'undocked': elif event_type == 'undocked':
self.state['StationName'] = None self.state['StationName'] = None
self.state['MarketID'] = None self.state['MarketID'] = None
self.stationtype = None self.state['StationType'] = None
self.stationservices = None self.stationservices = None
self.state['IsDocked'] = False self.state['IsDocked'] = False
@ -847,7 +846,7 @@ class EDLogs(FileSystemEventHandler): # type: ignore # See below
self.state['IsDocked'] = True self.state['IsDocked'] = True
self.state['StationName'] = entry.get('StationName') # It may be None self.state['StationName'] = entry.get('StationName') # It may be None
self.state['MarketID'] = entry.get('MarketID') # It may be None self.state['MarketID'] = entry.get('MarketID') # It may be None
self.stationtype = entry.get('StationType') # It may be None self.state['StationType'] = entry.get('StationType') # It may be None
self.stationservices = entry.get('StationServices') # None under E:D < 2.4 self.stationservices = entry.get('StationServices') # None under E:D < 2.4
# No need to set self.state['Taxi'] or Dropship here, if it's # No need to set self.state['Taxi'] or Dropship here, if it's
@ -959,7 +958,7 @@ class EDLogs(FileSystemEventHandler): # type: ignore # See below
if event_type == 'fsdjump': if event_type == 'fsdjump':
self.state['StationName'] = None self.state['StationName'] = None
self.state['MarketID'] = None self.state['MarketID'] = None
self.stationtype = None self.state['StationType'] = None
self.stationservices = None self.stationservices = None
else: else:
@ -971,7 +970,7 @@ class EDLogs(FileSystemEventHandler): # type: ignore # See below
self.state['StationName'] = entry.get('Body') self.state['StationName'] = entry.get('Body')
self.state['MarketID'] = entry.get('MarketID') # May be None self.state['MarketID'] = entry.get('MarketID') # May be None
self.stationtype = entry.get('StationType') # May be None self.state['StationType'] = entry.get('StationType') # May be None
self.stationservices = entry.get('StationServices') # None in Odyssey for on-foot 'Location' self.stationservices = entry.get('StationServices') # None in Odyssey for on-foot 'Location'
############################################################### ###############################################################
@ -1010,7 +1009,7 @@ class EDLogs(FileSystemEventHandler): # type: ignore # See below
############################################################### ###############################################################
self.state['StationName'] = None self.state['StationName'] = None
self.state['MarketID'] = None self.state['MarketID'] = None
self.stationtype = None self.state['StationType'] = None
self.stationservices = None self.stationservices = None
############################################################### ###############################################################
@ -1715,7 +1714,7 @@ class EDLogs(FileSystemEventHandler): # type: ignore # See below
self.state['BodyType'] = None self.state['BodyType'] = None
self.state['StationName'] = None self.state['StationName'] = None
self.state['MarketID'] = None self.state['MarketID'] = None
self.stationtype = None self.state['StationType'] = None
self.stationservices = None self.stationservices = None
self.state['OnFoot'] = False self.state['OnFoot'] = False
@ -1734,7 +1733,7 @@ class EDLogs(FileSystemEventHandler): # type: ignore # See below
self.state['BodyType'] = None self.state['BodyType'] = None
self.state['StationName'] = None self.state['StationName'] = None
self.state['MarketID'] = None self.state['MarketID'] = None
self.stationtype = None self.state['StationType'] = None
self.stationservices = None self.stationservices = None
# TODO: on_foot: Will we get an event after this to know ? # TODO: on_foot: Will we get an event after this to know ?