teutat3s/os
2
0
Fork 0
forked from pub-solar/os
Code Pull requests Activity

Merge #225

Browse source 
225: lib: only readDir if path exists with safeReadDir r=nrdxp a=Pacman99

After doing this for the second time, I realized it might be good to make a lib function for it and do it across lib.
Create a function called `safeReadDir` that only uses `builtins.readDir` if the path exists. With `optionalAttrs` any function that relies on the output won't fail since they still get an empty attrset.
Then replace all uses of `readDir` with the safe version.

Co-authored-by: Pacman99 <pachum99@gmail.com>
This commit is contained in:
bors[bot] 2021-04-01 20:08:55 +00:00 committed by GitHub
parent f14dcdaf78 3d1501c384
commit 01b0555117
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 16 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/attrs.nix
View file

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

2
lib/default.nix
View file

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

4
lib/devos/mkProfileAttrs.nix
View file

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

2
lib/devos/recImport.nix
View file

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

5
lib/lists.nix
View file

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

8
tests/lib.nix
View file

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