From 7d3d09f60b0ed0ec9014e33662c223c0596b6d9b Mon Sep 17 00:00:00 2001 From: David Sangrey Date: Mon, 6 Jan 2025 15:42:55 -0500 Subject: [PATCH] [#2324] Update Watchdog --- dashboard.py | 2 +- monitor.py | 4 ++-- requirements.txt | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dashboard.py b/dashboard.py index a57264c0..cae2cc96 100644 --- a/dashboard.py +++ b/dashboard.py @@ -87,7 +87,7 @@ class Dashboard(FileSystemEventHandler): if not self.observed and sys.platform == 'win32': logger.debug('Starting observer...') - self.observed = cast(BaseObserver, self.observer).schedule(self, self.currentdir) + self.observed = cast(BaseObserver, self.observer).schedule(self, self.currentdir) # type: ignore logger.debug('Done') logger.info(f'{(sys.platform != "win32") and "Polling" or "Monitoring"} Dashboard "{self.currentdir}"') diff --git a/monitor.py b/monitor.py index e19d6ad5..53832a61 100644 --- a/monitor.py +++ b/monitor.py @@ -337,9 +337,9 @@ class EDLogs(FileSystemEventHandler): def on_created(self, event: 'FileSystemEvent') -> None: """Watchdog callback when, e.g. client (re)started.""" - if not event.is_directory and self._RE_LOGFILE.search(basename(event.src_path)): + if not event.is_directory and self._RE_LOGFILE.search(str(basename(event.src_path))): - self.logfile = event.src_path + self.logfile = event.src_path # type: ignore def worker(self) -> None: # noqa: C901, CCR001 """ diff --git a/requirements.txt b/requirements.txt index e3296d4a..b409af63 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,6 +1,6 @@ requests==2.32.3 pillow==10.4.0 -watchdog==4.0.1 +watchdog==6.0.0 simplesystray==0.1.0; sys_platform == 'win32' semantic-version==2.10.0 # For manipulating folder permissions and the like.