reivilibre
/
mirror-zola
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix: treat any data change as a modification (#2542) 

For unknown reasons, it seems some environments emit a `DataChange::Any` event,
rather than specifying content or size, when a file is edited. As an example:

    [src/fs_utils.rs:72:9] &event = DebouncedEvent {
        event: Event {
            kind: Modify(
                Data(
                    Any,
                ),
            ),
            paths: [
                "/home/redacted/content/blog/2024-06-23_example.md",
            ],
            attr:tracker: None,
            attr:flag: None,
            attr:info: None,
            attr:source: None,
        },
        time: Instant {
            tv_sec: 78544,
            tv_nsec: 936740729,
        },
    }

Consequently, because this isn't treated by Zola as a modification, the
site is not rebuilt, which regresses on previous behavior.

This patch fixes this particular case by treating any data modification
events as a modification.

Closes: https://github.com/getzola/zola/issues/2536
This commit is contained in:
Luke Hsiao 2024-06-24 14:05:50 -06:00 committed by Vincent Prouillet
parent 233e1cdcbd
commit 9774d761e3
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/fs_utils.rs
View File

@ -38,8 +38,7 @@ fn get_relevant_event_kind(event_kind: &EventKind) -> Option<SimpleFileSystemEve
EventKind::Create(CreateKind::File) | EventKind::Create(CreateKind::Folder) => { EventKind::Create(CreateKind::File) | EventKind::Create(CreateKind::Folder) => {
Some(SimpleFileSystemEventKind::Create) Some(SimpleFileSystemEventKind::Create)
} }
EventKind::Modify(ModifyKind::Data(DataChange::Size)) EventKind::Modify(ModifyKind::Data(_))
| EventKind::Modify(ModifyKind::Data(DataChange::Content))
// Intellij modifies file metadata on edit. // Intellij modifies file metadata on edit.
// https://github.com/passcod/notify/issues/150#issuecomment-494912080 // https://github.com/passcod/notify/issues/150#issuecomment-494912080
| EventKind::Modify(ModifyKind::Metadata(MetadataKind::WriteTime)) | EventKind::Modify(ModifyKind::Metadata(MetadataKind::WriteTime))
@ -181,6 +180,14 @@ mod tests {
EventKind::Modify(ModifyKind::Data(DataChange::Content)), EventKind::Modify(ModifyKind::Data(DataChange::Content)),
Some(SimpleFileSystemEventKind::Modify), Some(SimpleFileSystemEventKind::Modify),
), ),
(
EventKind::Modify(ModifyKind::Data(DataChange::Any)),
Some(SimpleFileSystemEventKind::Modify),
),
(
EventKind::Modify(ModifyKind::Data(DataChange::Other)),
Some(SimpleFileSystemEventKind::Modify),
),
( (
EventKind::Modify(ModifyKind::Metadata(MetadataKind::WriteTime)), EventKind::Modify(ModifyKind::Metadata(MetadataKind::WriteTime)),
Some(SimpleFileSystemEventKind::Modify), Some(SimpleFileSystemEventKind::Modify),
@ -202,7 +209,7 @@ mod tests {
]; ];
for (case, expected) in cases.iter() { for (case, expected) in cases.iter() {
let ek = get_relevant_event_kind(&case); let ek = get_relevant_event_kind(&case);
assert_eq!(ek, *expected); assert_eq!(ek, *expected, "case: {:?}", case);
} }
} }