1
Fork 0
mirror of https://github.com/thegeneralist01/archivr synced 2026-10-09 12:55:00 +02:00

fix: exclude child entries from collection listing

list_entries_for_collection was missing AND e.parent_entry_id IS NULL,
causing child entries (playlist/channel videos) to appear alongside
their parent in the flat archive view. list_root_entries and
search_entries already had this guard; the collection path did not.

Also removes garnix from flake.nix nixConfig.
This commit is contained in:
TheGeneralist 2026-08-02 11:23:13 +02:00
parent 95cd46978d
commit bf5f95397f
Signed by: thegeneralist01
SSH key fingerprint: SHA256:pp9qddbCNmVNoSjevdvQvM5z0DHN7LTa8qBMbcMq/R4
2 changed files with 1 additions and 2 deletions

View file

@ -460,6 +460,7 @@ pub fn list_entries_for_collection(
"{} {} \ "{} {} \
JOIN collection_entries ce ON ce.entry_id = e.id \ JOIN collection_entries ce ON ce.entry_id = e.id \
WHERE ce.collection_id = ?1 \ WHERE ce.collection_id = ?1 \
AND e.parent_entry_id IS NULL \
AND (CAST(?2 AS INTEGER) & 12 != 0 \ AND (CAST(?2 AS INTEGER) & 12 != 0 \
OR (ce.visibility_bits & CAST(?2 AS INTEGER)) != 0) \ OR (ce.visibility_bits & CAST(?2 AS INTEGER)) != 0) \
GROUP BY e.id \ GROUP BY e.id \

View file

@ -4,12 +4,10 @@
nixConfig = { nixConfig = {
extra-substituters = [ extra-substituters = [
"https://cache.thegeneralist01.com/" "https://cache.thegeneralist01.com/"
"https://cache.garnix.io/"
"https://cache.nixos.org/" "https://cache.nixos.org/"
]; ];
extra-trusted-public-keys = [ extra-trusted-public-keys = [
"cache.thegeneralist01.com:jkKcenR877r7fQuWq6cr0JKv2piqBWmYLAYsYsSJnT4=" "cache.thegeneralist01.com:jkKcenR877r7fQuWq6cr0JKv2piqBWmYLAYsYsSJnT4="
"cache.garnix.io:CTFPyKSLcx5RMJKfLo5EEPUObbA78b0YQ2DTCJXqr9g="
]; ];
}; };