lib: only readDir if path exists with safeReadDir

This commit is contained in:
Pacman99 2021-03-30 12:47:54 -07:00
parent f14dcdaf78
commit 3d1501c384
6 changed files with 16 additions and 7 deletions

View File

@ -40,4 +40,6 @@ rec {
lib.isDerivation v && !meta.broken && builtins.elem system platforms);
in
lib.filterAttrs filter packages;
safeReadDir = path: lib.optionalAttrs (builtins.pathExists path) (builtins.readDir path);
}

View File

@ -17,7 +17,7 @@ lib.makeExtensible (final:
lists = callLibs ./lists.nix;
strings = callLibs ./strings.nix;
inherit (attrs) mapFilterAttrs genAttrs'
inherit (attrs) mapFilterAttrs genAttrs' safeReadDir
pathsToImportedAttrs concatAttrs filterPackages;
inherit (lists) pathsIn;
inherit (strings) rgxToString;

View File

@ -1,4 +1,4 @@
{ lib, ... }:
{ lib, dev, ... }:
let mkProfileAttrs =
/**
@ -16,7 +16,7 @@ let mkProfileAttrs =
let
imports =
let
files = builtins.readDir dir;
files = dev.safeReadDir dir;
p = n: v:
v == "directory"

View File

@ -9,4 +9,4 @@ dev.mapFilterAttrs
let name = lib.removeSuffix ".nix" n; in lib.nameValuePair (name) (_import name)
else
lib.nameValuePair ("") (null))
(builtins.readDir dir)
(dev.safeReadDir dir)

View File

@ -1,9 +1,8 @@
{ lib, ... }:
{ lib, dev, ... }:
{
pathsIn = dir:
let
fullPath = name: "${toString dir}/${name}";
in
map fullPath (lib.attrNames (lib.optionalAttrs
(builtins.pathExists dir) (builtins.readDir dir)));
map fullPath (lib.attrNames (dev.safeReadDir dir));
}

View File

@ -69,6 +69,14 @@ lib.runTests {
(rgxToString "hat" "foohatbar" == "hat")
];
testSafeReadDir = {
expr = safeReadDir "${self}/tests/profiles" // safeReadDir "${self}/nonexistentdir";
expected = {
foo = "directory";
t = "directory";
};
};
testSuites =
let
profiles = os.mkProfileAttrs (toString ./profiles);