backups/flake_env
1
0
Fork 0
mirror of https://git.sr.ht/~bryan_bennett/flake_env synced 2025-12-16 06:31:24 +01:00
Code Issues Projects Releases Packages Wiki Activity

Filter missing watches before hashing

Browse source
This commit is contained in:
Bryan Bennett 2024-08-17 09:36:21 -04:00
parent efa64a4734
commit 8627db86be
No known key found for this signature in database
GPG key ID: EE149E4215408DE9
4 changed files with 14 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

8
bin/flake_env.re
View file

@ -6,9 +6,9 @@ let main = () => {
| Ok((layout_directory, flake_specifier, other_args)) => | Ok((layout_directory, flake_specifier, other_args)) =>
switch (preflight(layout_directory)) { switch (preflight(layout_directory)) {
| Ok () => | Ok () =>
switch (Lib.Watches.get()) { switch (Lib.Watches.get_extant()) {
| Ok(watches) => | Ok(watches) =>
let paths = Array.map(watch => watch.path, watches); let paths = List.map(watch => watch.path, watches);
let hash = let hash =
switch (Util.hash_files(paths)) { switch (Util.hash_files(paths)) {
| Ok(hsh) => hsh | Ok(hsh) => hsh
@ -24,8 +24,8 @@ let main = () => {
| (true, true) => | (true, true) =>
let profile_rc_mtime = Unix.stat(profile_rc).st_mtime; let profile_rc_mtime = Unix.stat(profile_rc).st_mtime;
let all_older = let all_older =
Array.map(watch => watch.modtime, watches) List.map(watch => watch.modtime, watches)
|> Array.for_all(watch_mtime => |> List.for_all(watch_mtime =>
watch_mtime <= int_of_float(profile_rc_mtime) watch_mtime <= int_of_float(profile_rc_mtime)
); );
if (all_older) { if (all_older) {

1
lib/flake_env__util.re
View file

@ -44,7 +44,6 @@ let hash_files = filenames => {
let ctx = Sha1.init(); let ctx = Sha1.init();
let files_to_hash = let files_to_hash =
filenames filenames
|> Array.to_list
|> List.filter(f => |> List.filter(f =>
Sys.file_exists(f) Sys.file_exists(f)
? true ? true

7
lib/flake_env__watches.re
View file

@ -28,6 +28,13 @@ let get = () => {
}; };
}; };
let get_extant = () => {
get()
|> Result.map(watches =>
watches |> Array.to_list |> List.filter(a => a.exists)
);
};
let get_path = doc => { let get_path = doc => {
let pth = doc |> member("path") |> to_string; let pth = doc |> member("path") |> to_string;
String.sub(pth, 11, String.length(pth) - 11); String.sub(pth, 11, String.length(pth) - 11);

6
tests/flake_env_test_util.re
View file

@ -75,7 +75,7 @@ let test_hash_one = () => {
check_result_string( check_result_string(
"Hash matches", "Hash matches",
Ok("6ead949bf4bcae230b9ed9cd11e578e34ce9f9ea"), Ok("6ead949bf4bcae230b9ed9cd11e578e34ce9f9ea"),
hash_files([|"spit_version.sh"|]), hash_files(["spit_version.sh"]),
); );
}; };
@ -83,7 +83,7 @@ let test_hash_multiple = () => {
check_result_string( check_result_string(
"Hash matches", "Hash matches",
Ok("f109b7892a541ed1e3cf39314cd25d21042b984f"), Ok("f109b7892a541ed1e3cf39314cd25d21042b984f"),
hash_files([|"spit_version.sh", "spit_version.sh"|]), hash_files(["spit_version.sh", "spit_version.sh"]),
); );
}; };
@ -91,7 +91,7 @@ let test_hash_filters_nonexistent = () => {
check_result_string( check_result_string(
"Hash matches", "Hash matches",
Ok("6ead949bf4bcae230b9ed9cd11e578e34ce9f9ea"), Ok("6ead949bf4bcae230b9ed9cd11e578e34ce9f9ea"),
hash_files([|"spit_version.sh", "FOOBARBAZ"|]), hash_files(["spit_version.sh", "FOOBARBAZ"]),
); );
}; };