From 43bae134182d615f0a424beb66917ecbe5b838d8 Mon Sep 17 00:00:00 2001 From: Athanasius Date: Fri, 18 Mar 2022 09:42:04 +0000 Subject: [PATCH] EDMC.py: Use monitor.journal_newest_filename() --- EDMC.py | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/EDMC.py b/EDMC.py index 6c7163d7..ed36dfba 100755 --- a/EDMC.py +++ b/EDMC.py @@ -7,9 +7,8 @@ import json import locale import os import queue -import re import sys -from os.path import getmtime, join +from os.path import getmtime from time import sleep, time from typing import TYPE_CHECKING, Any, List, Optional @@ -65,8 +64,6 @@ l10n.Translations.install_dummy() SERVER_RETRY = 5 # retry pause for Companion servers [s] EXIT_SUCCESS, EXIT_SERVER, EXIT_CREDENTIALS, EXIT_VERIFICATION, EXIT_LAGGING, EXIT_SYS_ERR, EXIT_ARGS = range(7) -JOURNAL_RE = re.compile(r'^Journal(Beta)?\.[0-9]{12}\.[0-9]{2}\.log$') - def versioncmp(versionstring) -> List: """Quick and dirty version comparison assuming "strict" numeric only version numbers.""" @@ -225,10 +222,7 @@ sys.path: {sys.path}''' monitor.currentdir = config.default_journal_dir logger.debug(f'logdir = "{monitor.currentdir}"') - logfiles = sorted((x for x in os.listdir(monitor.currentdir) if JOURNAL_RE.search(x)), - key=lambda x: x.split('.')[1:]) - - logfile = join(monitor.currentdir, logfiles[-1]) + logfile = monitor.journal_newest_filename(monitor.currentdir) logger.debug(f'Using logfile "{logfile}"') with open(logfile, 'r', encoding='utf-8') as loghandle: