Robot/watchexec
1
0
Fork 0
mirror of https://github.com/watchexec/watchexec.git synced 2024-11-13 07:41:11 +01:00
Code Issues Projects Releases Packages Wiki Activity

Change env summarise to return &str as keys for ease of use

Browse source
This commit is contained in:
Félix Saparelli 2021-12-29 20:52:17 +13:00
parent ed72c4998e
commit 53d9a65e5f
No known key found for this signature in database
GPG key ID: B948C4BAE44FC474
2 changed files with 41 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
lib/src/paths.rs
View file

@ -2,7 +2,7 @@
use std::{
collections::HashMap,
ffi::{OsStr, OsString},
ffi::OsString,
path::{Path, PathBuf},
};
@ -66,7 +66,7 @@ where
/// byte order and joined with the platform-specific path separator (`:` for unix, `;` for Windows).
pub fn summarise_events_to_env<'events>(
events: impl IntoIterator<Item = &'events Event>,
) -> HashMap<&'static OsStr, OsString> {
) -> HashMap<&'static str, OsString> {
#[cfg(unix)]
const ENV_SEP: &str = ":";
#[cfg(not(unix))]
@ -118,14 +118,14 @@ pub fn summarise_events_to_env<'events>(
for (kind, paths) in kind_buckets {
use notify::event::{AccessKind::*, AccessMode::*, EventKind::*, ModifyKind::*};
grouped_buckets
.entry(OsStr::new(match kind {
.entry(match kind {
Modify(Data(_)) | Access(Close(Write)) => "WRITTEN",
Modify(Metadata(_)) => "META_CHANGED",
Remove(_) => "REMOVED",
Create(_) => "CREATED",
Modify(Name(_)) => "RENAMED",
_ => "OTHERWISE_CHANGED",
}))
})
.or_insert_with(Vec::new)
.extend(paths.into_iter().map(|p| {
if let Some(suffix) = common_path
@ -139,7 +139,7 @@ pub fn summarise_events_to_env<'events>(
}));
}
let mut res: HashMap<&'static OsStr, OsString> = grouped_buckets
let mut res: HashMap<&'static str, OsString> = grouped_buckets
.into_iter()
.map(|(kind, mut paths)| {
let mut joined =
@ -158,7 +158,7 @@ pub fn summarise_events_to_env<'events>(
.collect();
if let Some(common_path) = common_path {
res.insert(OsStr::new("COMMON_PATH"), common_path.into_os_string());
res.insert("COMMON_PATH", common_path.into_os_string());
}
res

76
lib/tests/env_reporting.rs
View file

@ -1,7 +1,4 @@
use std::{
collections::HashMap,
ffi::{OsStr, OsString},
};
use std::{collections::HashMap, ffi::OsString};
use notify::event::CreateKind;
use watchexec::{
@ -49,8 +46,8 @@ fn single_created() {
assert_eq!(
summarise_events_to_env(&events),
HashMap::from([
(OsStr::new("CREATED"), OsString::from("file.txt")),
(OsStr::new("COMMON_PATH"), ospath("")),
("CREATED", OsString::from("file.txt")),
("COMMON_PATH", ospath("")),
])
);
}
@ -64,8 +61,8 @@ fn single_meta() {
assert_eq!(
summarise_events_to_env(&events),
HashMap::from([
(OsStr::new("META_CHANGED"), OsString::from("file.txt")),
(OsStr::new("COMMON_PATH"), ospath("")),
("META_CHANGED", OsString::from("file.txt")),
("COMMON_PATH", ospath("")),
])
);
}
@ -76,8 +73,8 @@ fn single_removed() {
assert_eq!(
summarise_events_to_env(&events),
HashMap::from([
(OsStr::new("REMOVED"), OsString::from("file.txt")),
(OsStr::new("COMMON_PATH"), ospath("")),
("REMOVED", OsString::from("file.txt")),
("COMMON_PATH", ospath("")),
])
);
}
@ -91,8 +88,8 @@ fn single_renamed() {
assert_eq!(
summarise_events_to_env(&events),
HashMap::from([
(OsStr::new("RENAMED"), OsString::from("file.txt")),
(OsStr::new("COMMON_PATH"), ospath("")),
("RENAMED", OsString::from("file.txt")),
("COMMON_PATH", ospath("")),
])
);
}
@ -106,8 +103,8 @@ fn single_written() {
assert_eq!(
summarise_events_to_env(&events),
HashMap::from([
(OsStr::new("WRITTEN"), OsString::from("file.txt")),
(OsStr::new("COMMON_PATH"), ospath("")),
("WRITTEN", OsString::from("file.txt")),
("COMMON_PATH", ospath("")),
])
);
}
@ -118,8 +115,8 @@ fn single_otherwise() {
assert_eq!(
summarise_events_to_env(&events),
HashMap::from([
(OsStr::new("OTHERWISE_CHANGED"), OsString::from("file.txt")),
(OsStr::new("COMMON_PATH"), ospath("")),
("OTHERWISE_CHANGED", OsString::from("file.txt")),
("COMMON_PATH", ospath("")),
])
);
}
@ -146,13 +143,13 @@ fn all_types_once() {
assert_eq!(
summarise_events_to_env(&events),
HashMap::from([
(OsStr::new("CREATED"), OsString::from("create.txt")),
(OsStr::new("META_CHANGED"), OsString::from("metadata.txt")),
(OsStr::new("REMOVED"), OsString::from("remove.txt")),
(OsStr::new("RENAMED"), OsString::from("rename.txt")),
(OsStr::new("WRITTEN"), OsString::from("modify.txt")),
(OsStr::new("OTHERWISE_CHANGED"), OsString::from("any.txt")),
(OsStr::new("COMMON_PATH"), ospath("")),
("CREATED", OsString::from("create.txt")),
("META_CHANGED", OsString::from("metadata.txt")),
("REMOVED", OsString::from("remove.txt")),
("RENAMED", OsString::from("rename.txt")),
("WRITTEN", OsString::from("modify.txt")),
("OTHERWISE_CHANGED", OsString::from("any.txt")),
("COMMON_PATH", ospath("")),
])
);
}
@ -172,7 +169,7 @@ fn single_type_multipath() {
summarise_events_to_env(&events),
HashMap::from([
(
OsStr::new("CREATED"),
"CREATED",
OsString::from(
"".to_string()
+ "deeper/sub/folder.txt"
@ -181,7 +178,7 @@ fn single_type_multipath() {
+ "sub/folder.txt"
)
),
(OsStr::new("COMMON_PATH"), ospath("")),
("COMMON_PATH", ospath("")),
])
);
}
@ -196,10 +193,10 @@ fn single_type_divergent_paths() {
summarise_events_to_env(&events),
HashMap::from([
(
OsStr::new("CREATED"),
"CREATED",
OsString::from("".to_string() + "dom/folder.txt" + ENV_SEP + "sub/folder.txt")
),
(OsStr::new("COMMON_PATH"), ospath("")),
("COMMON_PATH", ospath("")),
])
);
}
@ -220,16 +217,13 @@ fn multitype_multipath() {
summarise_events_to_env(&events),
HashMap::from([
(
OsStr::new("CREATED"),
"CREATED",
OsString::from("".to_string() + "root.txt" + ENV_SEP + "sibling.txt"),
),
(OsStr::new("META_CHANGED"), OsString::from("sub/folder.txt"),),
(OsStr::new("REMOVED"), OsString::from("dom/folder.txt"),),
(
OsStr::new("OTHERWISE_CHANGED"),
OsString::from("deeper/sub/folder.txt"),
),
(OsStr::new("COMMON_PATH"), ospath("")),
("META_CHANGED", OsString::from("sub/folder.txt"),),
("REMOVED", OsString::from("dom/folder.txt"),),
("OTHERWISE_CHANGED", OsString::from("deeper/sub/folder.txt"),),
("COMMON_PATH", ospath("")),
])
);
}
@ -254,10 +248,10 @@ fn multiple_paths_in_one_event() {
summarise_events_to_env(&events),
HashMap::from([
(
OsStr::new("OTHERWISE_CHANGED"),
"OTHERWISE_CHANGED",
OsString::from("".to_string() + "one.txt" + ENV_SEP + "two.txt")
),
(OsStr::new("COMMON_PATH"), ospath("")),
("COMMON_PATH", ospath("")),
])
);
}
@ -280,10 +274,10 @@ fn mixed_non_paths_events() {
summarise_events_to_env(&events),
HashMap::from([
(
OsStr::new("OTHERWISE_CHANGED"),
"OTHERWISE_CHANGED",
OsString::from("".to_string() + "one.txt" + ENV_SEP + "two.txt")
),
(OsStr::new("COMMON_PATH"), ospath("")),
("COMMON_PATH", ospath("")),
])
);
}
@ -316,7 +310,7 @@ fn multipath_is_sorted() {
summarise_events_to_env(&events),
HashMap::from([
(
OsStr::new("OTHERWISE_CHANGED"),
"OTHERWISE_CHANGED",
OsString::from(
"".to_string()
+ "0123.txt" + ENV_SEP + "a.txt"
@ -324,7 +318,7 @@ fn multipath_is_sorted() {
+ "c.txt" + ENV_SEP + "ᄁ.txt"
)
),
(OsStr::new("COMMON_PATH"), ospath("")),
("COMMON_PATH", ospath("")),
])
);
}