From 32de4cbd934894e7be3dcb2c695229f8056f28cf Mon Sep 17 00:00:00 2001 From: sterni Date: Wed, 18 Aug 2021 11:38:59 +0200 Subject: [PATCH] refactor(users/grfn/gws.fyi): implement isDirectory in pure nix Another day, another import from derivation avoided by builtins.unsafeDiscardStringContext! Change-Id: I67274b1ba13ba980bb3346b22f2955c702aa3151 Reviewed-on: https://cl.tvl.fyi/c/depot/+/3372 Tested-by: BuildkiteCI Reviewed-by: grfn Reviewed-by: tazjin --- nix/utils/default.nix | 65 ++++++++++++++++++++++++++++ users/grfn/gws.fyi/orgExportHTML.nix | 12 +---- 2 files changed, 67 insertions(+), 10 deletions(-) diff --git a/nix/utils/default.nix b/nix/utils/default.nix index 2d765c0c4..bb28ca40a 100644 --- a/nix/utils/default.nix +++ b/nix/utils/default.nix @@ -58,9 +58,74 @@ let else builtins.throw "Don't know how to get (base)name of " + lib.generators.toPretty {} p; + /* Get the type of a path itself as it would be returned for a + directory child by builtins.readDir. + + Type: path(-like) -> option + + Example: + pathType ./foo.c + => "regular" + + pathType /home/lukas + => "directory" + + pathType ./result + => "symlink" + + pathType /does/not/exist + => null + */ + pathType = path: + let + # baseNameOf is very annoyed if we proceed with string context. + # We need to call toString to prevent unsafeDiscardStringContext + # from importing a path into store which messes with base- and + # dirname of course. + path'= builtins.unsafeDiscardStringContext (toString path); + # To read the containing directory we absolutely need + # to keep the string context, otherwise a derivation + # would not be realized before our check (at eval time) + containingDir = builtins.readDir (builtins.dirOf path); + in + containingDir.${builtins.baseNameOf path'} or null; + + pathType' = path: + let + p = pathType path; + in + if p == null + then builtins.throw "${lib.generators.toPretty {} path} does not exist" + else p; + + /* Check whether the given path is a directory. + Throws if the path in question doesn't exist. + + Type: path(-like) -> bool + */ + isDirectory = path: pathType' path == "directory"; + + /* Check whether the given path is a regular file. + Throws if the path in question doesn't exist. + + Type: path(-like) -> bool + */ + isRegularFile = path: pathType' path == "regular"; + + /* Check whether the given path is a symbolic link. + Throws if the path in question doesn't exist. + + Type: path(-like) -> bool + */ + isSymlink = path: pathType' path == "symlink"; + in { inherit drvTargets storePathName + pathType + isDirectory + isRegularFile + isSymlink ; } diff --git a/users/grfn/gws.fyi/orgExportHTML.nix b/users/grfn/gws.fyi/orgExportHTML.nix index e918e697d..ac28580a5 100644 --- a/users/grfn/gws.fyi/orgExportHTML.nix +++ b/users/grfn/gws.fyi/orgExportHTML.nix @@ -1,4 +1,4 @@ -{ pkgs, ... }: +{ pkgs, depot, ... }: with pkgs; with lib; @@ -22,21 +22,13 @@ let bn = builtins.baseNameOf src; filename = elemAt (splitString "." bn) 0; - isDirectory = import (runCommand "isDirectory" {} '' - if [ -d ${src} ]; then - echo "true" > $out - else - echo "false" > $out - fi - ''); - outName = if isNull headline then let bn = builtins.baseNameOf src; filename = elemAt (splitString "." bn) 0; in - if isDirectory + if depot.nix.utils.isDirectory src then filename else filename + ".html" else "${filename}-${replaceStrings [" "] ["-"] filename}.html";