Skip to content

Commit

Permalink
Fix a silent fail if path is a file gorakhargosh#1034 (Windows only).
Browse files Browse the repository at this point in the history
  • Loading branch information
TobiasRzepka committed Oct 4, 2024
1 parent 6a4f1cf commit 1ee35f1
Showing 1 changed file with 13 additions and 2 deletions.
15 changes: 13 additions & 2 deletions src/watchdog/observers/read_directory_changes.py
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,14 @@ def __init__(
super().__init__(event_queue, watch, timeout=timeout, event_filter=event_filter)
self._lock = threading.Lock()
self._whandle: HANDLE | None = None
self._watched_files: dict[str, str] = {}

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, basename = os.path.split(watch_path)
self._watched_files[self.watch.path] = basename
self._whandle = get_directory_handle(watch_path)

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

Expand All @@ -71,7 +76,13 @@ 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)
try:
basename = self._watched_files[self.watch.path] # Is a file?
if basename != winapi_event.src_path:
continue
src_path = self.watch.path
except KeyError:
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 1ee35f1

Please sign in to comment.