From f8057925a55c5afdb6e17bd5251075a7e3f63837 Mon Sep 17 00:00:00 2001 From: Athanasius Date: Mon, 29 Mar 2021 13:50:18 +0100 Subject: [PATCH 1/2] Odyssey: Support JournalAlpha..log files --- monitor.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/monitor.py b/monitor.py index 35adda58..817c06db 100644 --- a/monitor.py +++ b/monitor.py @@ -58,7 +58,7 @@ class EDLogs(FileSystemEventHandler): # type: ignore # See below _POLL = 1 # Polling is cheap, so do it often _RE_CANONICALISE = re.compile(r'\$(.+)_name;') _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): # TODO(A_D): A bunch of these should be switched to default values (eg '' for strings) and no longer be Optional From f53d2cfb7cdf1886008d701d6430055856602051 Mon Sep 17 00:00:00 2001 From: Athanasius Date: Mon, 29 Mar 2021 15:41:57 +0100 Subject: [PATCH 2/2] Remove "If it's not Fleet Carriers it's beta" check Odyssey Alpha confirmed to have 'alpha' in gameversion. --- monitor.py | 5 ----- 1 file changed, 5 deletions(-) diff --git a/monitor.py b/monitor.py index 817c06db..8dc4b4ca 100644 --- a/monitor.py +++ b/monitor.py @@ -384,11 +384,6 @@ class EDLogs(FileSystemEventHandler): # type: ignore # See below self.version = entry['gameversion'] 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']: - logger.warning(f'Forcing is_beta to True due to gameversion: {entry["gameversion"]}') - self.is_beta = True - self.cmdr = None self.mode = None self.group = None