nodes/ComfyAssets-ComfyUI_PromptManager
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(annotations): compare the change time only between fstat reads

Browse Source 
Python 3.12+ on Windows reports the change time from stat but the
creation time from fstat, so a freshly written file whose creation and
write straddle a clock tick failed the pre-read identity check with
CaptureChanged. The path-versus-descriptor checks now compare size,
mtime_ns and dev/ino; ctime_ns is compared between the fstat before
and after the copy, where it still detects a same-size rewrite with a
restored mtime on POSIX.

The symlinked-root test asserted the locator against the unresolved
temp path, which macOS (/var -> /private/var) and Windows (short names)
resolve differently; it now compares against the real path.
This commit is contained in:
Vito Sansevero
2026-10-22 05:34:32 -07:00
parent 0e6ec0647f
commit b9636ce88c
3 changed files with 26 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
utils/media_capture.py
+19 -10
View File
@@ -146,13 +146,18 @@ class _Entry:
self.doomed = False
def _same_file(before: os.stat_result, after: os.stat_result) -> bool:
"""Size, mtime and change time must agree; device/inode where meaningful."""
if (
before.st_size != after.st_size
or before.st_mtime_ns != after.st_mtime_ns
or before.st_ctime_ns != after.st_ctime_ns
):
def _same_file(
before: os.stat_result, after: os.stat_result, *, change_time: bool
) -> bool:
"""Size and mtime must agree, device/inode where meaningful.
The change time is compared only between two reads of the same kind
(``fstat`` before and after the copy): Windows reports the creation time
from ``fstat`` but, on Python 3.12+, the change time from ``stat``.
"""
if before.st_size != after.st_size or before.st_mtime_ns != after.st_mtime_ns:
return False
if change_time and before.st_ctime_ns != after.st_ctime_ns:
return False
if before.st_ino and after.st_ino and before.st_ino != after.st_ino:
return False
@@ -483,7 +488,7 @@ class CaptureStore:
raise CaptureChanged(f"The file could not be opened: {error}") from None
with os.fdopen(fd, "rb") as stream:
opened = os.fstat(stream.fileno())
if not _same_file(before, opened):
if not _same_file(before, opened, change_time=False):
raise CaptureChanged("The file changed before it was read")
while True:
chunk = self._read(stream, CHUNK_SIZE)
@@ -496,13 +501,17 @@ class CaptureStore:
if sink is not None:
sink.write(chunk)
after = os.fstat(stream.fileno())
if total != before.st_size or not _same_file(before, after):
if (
total != before.st_size
or not _same_file(opened, after, change_time=True)
or not _same_file(before, after, change_time=False)
):
raise CaptureChanged("The file changed while it was read")
try:
current = os.stat(candidate)
except OSError:
raise CaptureChanged("The file is no longer there") from None
if not _same_file(before, current):
if not _same_file(before, current, change_time=False):
raise CaptureChanged("The path names another file now")
if os.path.normcase(os.path.realpath(candidate)) != locator:
raise CaptureChanged("The path resolves elsewhere now")