colin/nix-files
1
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

refactor: modules/data/feeds: fewer file-level inherits

Browse Source
This commit is contained in:
Colin
2024-09-28 09:55:12 +00:00
parent 09cd3ec2a5
commit aa7e1dfd33
1 changed files with 6 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
modules/data/feeds/default.nix
View File

@@ -1,18 +1,13 @@
{ lib, sane-lib, ... }:
let
inherit (builtins) concatLists concatStringsSep foldl' fromJSON map readDir readFile;
inherit (lib) hasSuffix listToAttrs mapAttrsToList removeSuffix splitString;
inherit (sane-lib) enumerateFilePaths;
# given a path to a .json file relative to sources, construct the best feed object we can.
# the .json file could be empty, in which case we make assumptions about the feed based
# on its fs path.
# Type: feedFromSourcePath :: String -> { name = String; value = feed; }
feedFromSourcePath = json-path:
assert hasSuffix "/default.json" json-path;
assert lib.hasSuffix "/default.json" json-path;
let
canonical-name = removeSuffix "/default.json" json-path;
canonical-name = lib.removeSuffix "/default.json" json-path;
default-url = "https://${canonical-name}";
feed-details = { url = default-url; } // (tryImportJson (./sources/${json-path}));
in { name = canonical-name; value = mkFeed feed-details; };
@@ -25,13 +20,13 @@ let
# or {} if the path is empty.
tryImportJson = path:
let
as-str = readFile path;
as-str = builtins.readFile path;
in
if as-str == "" then
{}
else
fromJSON as-str;
builtins.fromJSON as-str;
sources = enumerateFilePaths ./sources;
sources = sane-lib.enumerateFilePaths ./sources;
in
listToAttrs (map feedFromSourcePath sources)
lib.listToAttrs (builtins.map feedFromSourcePath sources)