Skip to content

Commit

Permalink
Fix a silent fail if path is a file #1034 (Windows only).
Browse files Browse the repository at this point in the history
  • Loading branch information
TobiasRzepka committed Sep 9, 2024
1 parent 4e9a86d commit 2d05e76
Showing 1 changed file with 10 additions and 2 deletions.
12 changes: 10 additions & 2 deletions src/watchdog/observers/read_directory_changes.py
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,10 @@ def __init__(
self._whandle: HANDLE | None = None

def on_thread_start(self) -> None:
self._whandle = get_directory_handle(self.watch.path)
watch_path = self.watch.path
if os.path.isfile(watch_path):
watch_path = os.path.dirname(watch_path)
self._whandle = get_directory_handle(watch_path)

if platform.python_implementation() == "PyPy":

Expand All @@ -71,7 +74,12 @@ def queue_events(self, timeout: float) -> None:
with self._lock:
last_renamed_src_path = ""
for winapi_event in winapi_events:
src_path = os.path.join(self.watch.path, winapi_event.src_path)
if os.path.isfile(self.watch.path):
if os.path.basename(self.watch.path) != winapi_event.src_path:
continue
src_path = self.watch.path
else:
src_path = os.path.join(self.watch.path, winapi_event.src_path)

if winapi_event.is_renamed_old:
last_renamed_src_path = src_path
Expand Down

0 comments on commit 2d05e76

Please sign in to comment.