fricklerhandwerk/Fediversity
1
0
Fork 0
forked from Fediversity/Fediversity
Code Pull requests Activity

fix relative path computation

Browse source
This commit is contained in:
Valentin Gagarin 2024-11-27 12:51:38 +01:00
parent a8dcc9f298
commit 25cfa6716a
2 changed files with 25 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
website/lib.nix
View file

@ -99,22 +99,22 @@ rec {
relativePath = path1': path2':
let
inherit (lib.path) subpath;
inherit (lib) lists;
inherit (lib) lists length take drop min max;
inherit (lists) replicate findFirstIndex zipLists;
path1 = subpath.components path1';
prefix1 = with lib; take (length path1 - 1) path1;
path2 = subpath.components path2';
prefix2 = with lib; take (length path2 - 1) path2;
prefix1 = take (length path1 - 1) path1;
commonPrefixLength = with lists;
findFirstIndex (i: i.fst != i.snd)
(length prefix1)
(zipLists prefix1 prefix2);
relativeComponents = with lists;
[ "." ] ++ (replicate (length prefix1 - commonPrefixLength) "..") ++ (drop commonPrefixLength path2);
common-prefix-length = findFirstIndex (i: i.fst != i.snd)
(min (length prefix1) (length path2 - 1))
(zipLists prefix1 path2);
parent-levels = max 0 (length prefix1 - common-prefix-length);
relative-components = [ "." ] ++
(replicate parent-levels "..") ++
(drop common-prefix-length path2);
in
join "/" relativeComponents;
join "/" relative-components;
/**
Recursively list all Nix files from a directory, except the top-level `default.nix`

18
website/tests.nix
View file

@ -4,8 +4,18 @@ let
inherit (import ./. { }) lib;
in
{
test-relativePath = {
expr = with lib; relativePath "bar" "baz";
expected = "./baz";
};
test-relativePath = with lib;
let
testData = [
{ from = "bar"; to = "baz"; expected = "./baz"; }
{ from = "foo/bar"; to = "foo/baz"; expected = "./baz"; }
{ from = "foo"; to = "bar/baz"; expected = "./bar/baz"; }
{ from = "foo/bar"; to = "baz"; expected = "./../baz"; }
{ from = "foo/bar/baz"; to = "foo"; expected = "./../../foo"; }
];
in
{
expr = map (case: relativePath case.from case.to) testData;
expected = map (case: case.expected) testData;
};
}