youwen5/alexandria
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor: remove shards from by-name

Browse source
This commit is contained in:
Youwen Wu 2024-10-20 01:51:46 -07:00
parent 588a1dc5a9
commit c6f1cdeb0f
Signed by: youwen5
GPG key ID: 865658ED1FE61EC3
4 changed files with 55 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
2024/flake.nix
View file

@ -66,7 +66,10 @@
# };
# digression-linear-algebra = alexandriaLib.callTypstProject (import ./documents/by-name/digression-linear-algebra/package.nix);
# };
legacyPackages = alexandriaLib.parsePkgs ./documents;
legacyPackages = (
(alexandriaLib.indexByName ./documents/by-name)
// (alexandriaLib.indexByCourse ./documents/by-course)
);
# apps = rec {
# default = watch;
# build = flake-utils.lib.mkApp {

5
2024/nix/lib/default.nix
View file

@ -16,5 +16,8 @@ rec {
inherit cleanTypstSource;
}
);
parsePkgs = (import ./parsePkgs.nix) (defaultArgs // { inherit callTypstProject; });
indexByName = (import ./indexByName.nix) (defaultArgs // { inherit callTypstProject; });
indexByCourse = (import ./indexByCourse.nix) (
defaultArgs // { inherit callTypstProject indexByName; }
);
}

42
2024/nix/lib/indexByCourse.nix Normal file
View file

@ -0,0 +1,42 @@
{
pkgs,
callTypstProject,
indexByName,
...
}:
baseDirectory:
let
inherit (pkgs) lib;
inherit (lib.attrsets)
mapAttrs
mapAttrsToList
mergeAttrsList
;
inherit (builtins) readDir;
in
let
# Package files for a single shard
# Type: String -> String -> AttrsOf Path
namesForShard =
shard: type:
if type != "directory" then
# Ignore all non-directories. Technically only README.md is allowed as a file in the base directory, so we could alternatively:
# - Assume that README.md is the only file and change the condition to `shard == "README.md"` for a minor performance improvement.
# This would however cause very poor error messages if there's other files.
# - Ensure that README.md is the only file, throwing a better error message if that's not the case.
# However this would make for a poor code architecture, because one type of error would have to be duplicated in the validity checks and here.
# Additionally in either of those alternatives, we would have to duplicate the hardcoding of "README.md"
{ }
else
# mapAttrs (name: _: baseDirectory + "/${shard}/${name}/package.nix") (
# readDir (baseDirectory + "/${shard}")
# );
mapAttrs (a: b: indexByName (baseDirectory + "/${a}")) (readDir baseDirectory);
in
# mapAttrs (a: b: builtins.trace (builtins.tryEval a) b) (
# mergeAttrsList (mapAttrsToList namesForShard (readDir baseDirectory))
# )
mapAttrs (a: b: (callTypstProject (import (/. + b)))) (
mergeAttrsList (mapAttrsToList namesForShard (readDir baseDirectory))
)

9
2024/nix/lib/parsePkgs.nix → 2024/nix/lib/indexByName.nix
View file

@ -13,7 +13,7 @@ let
# Package files for a single shard
# Type: String -> String -> AttrsOf Path
namesForShard =
shard: type:
name: type:
if type != "directory" then
# Ignore all non-directories. Technically only README.md is allowed as a file in the base directory, so we could alternatively:
# - Assume that README.md is the only file and change the condition to `shard == "README.md"` for a minor performance improvement.
@ -23,9 +23,10 @@ let
# Additionally in either of those alternatives, we would have to duplicate the hardcoding of "README.md"
{ }
else
mapAttrs (name: _: baseDirectory + "/${shard}/${name}/package.nix") (
readDir (baseDirectory + "/${shard}")
);
# mapAttrs (name: _: baseDirectory + "/${shard}/${name}/package.nix") (
# readDir (baseDirectory + "/${shard}")
# );
mapAttrs (name: _: baseDirectory + "/${name}/package.nix") (readDir baseDirectory);
in
# mapAttrs (a: b: builtins.trace (builtins.tryEval a) b) (