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

Extra paranoia about game version for forthcoming Odyssey Alpha

Browse Source 
1. Pick up 'JournalAlpha' files if they ever are a thing.
2. Pick up 'alpha' in gameversion to set is_beta = True.
3. For now any gameversion without 'Fleet Carriers Update' is considered
   a beta.
This commit is contained in:
Athanasius 2021-03-23 12:37:05 +00:00
parent 274b25b5ca
commit f9034076d8
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
monitor.py
View File

@ -58,7 +58,7 @@ class EDLogs(FileSystemEventHandler): # type: ignore # See below
_POLL = 1 # Polling is cheap, so do it often _POLL = 1 # Polling is cheap, so do it often
_RE_CANONICALISE = re.compile(r'\$(.+)_name;') _RE_CANONICALISE = re.compile(r'\$(.+)_name;')
_RE_CATEGORY = re.compile(r'\$MICRORESOURCE_CATEGORY_(.+);') _RE_CATEGORY = re.compile(r'\$MICRORESOURCE_CATEGORY_(.+);')
_RE_LOGFILE = re.compile(r'^Journal(Beta)?\.[0-9]{12}\.[0-9]{2}\.log$') _RE_LOGFILE = re.compile(r'^Journal(Alpha|Beta)?\.[0-9]{12}\.[0-9]{2}\.log$')
def __init__(self): def __init__(self):
# TODO(A_D): A bunch of these should be switched to default values (eg '' for strings) and no longer be Optional # TODO(A_D): A bunch of these should be switched to default values (eg '' for strings) and no longer be Optional
@ -382,7 +382,12 @@ class EDLogs(FileSystemEventHandler): # type: ignore # See below
if event_type == 'Fileheader': if event_type == 'Fileheader':
self.live = False self.live = False
self.version = entry['gameversion'] self.version = entry['gameversion']
self.is_beta = 'beta' in entry['gameversion'].lower() self.is_beta = any(v in entry['gameversion'].lower() for v in ('alpha', 'beta'))
# TODO: This is an extra paranoia check, because we don't yet know what will (not) be in the Odyssey alpha string.
if ('Fleet Carriers Update' not in entry['gameversion']):
self.is_beta = True
self.cmdr = None self.cmdr = None
self.mode = None self.mode = None
self.group = None self.group = None