From bf5f95397fc83652f023670b14da508b894ef568 Mon Sep 17 00:00:00 2001 From: TheGeneralist <180094941+thegeneralist01@users.noreply.github.com> Date: Sun, 2 Aug 2026 11:23:13 +0200 Subject: [PATCH] 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. --- crates/archivr-core/src/archive.rs | 1 + flake.nix | 2 -- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/crates/archivr-core/src/archive.rs b/crates/archivr-core/src/archive.rs index 4f48860..e84d4a2 100644 --- a/crates/archivr-core/src/archive.rs +++ b/crates/archivr-core/src/archive.rs @@ -460,6 +460,7 @@ pub fn list_entries_for_collection( "{} {} \ JOIN collection_entries ce ON ce.entry_id = e.id \ WHERE ce.collection_id = ?1 \ + AND e.parent_entry_id IS NULL \ AND (CAST(?2 AS INTEGER) & 12 != 0 \ OR (ce.visibility_bits & CAST(?2 AS INTEGER)) != 0) \ GROUP BY e.id \ diff --git a/flake.nix b/flake.nix index 8a2d1bb..95f177b 100644 --- a/flake.nix +++ b/flake.nix @@ -4,12 +4,10 @@ nixConfig = { extra-substituters = [ "https://cache.thegeneralist01.com/" - "https://cache.garnix.io/" "https://cache.nixos.org/" ]; extra-trusted-public-keys = [ "cache.thegeneralist01.com:jkKcenR877r7fQuWq6cr0JKv2piqBWmYLAYsYsSJnT4=" - "cache.garnix.io:CTFPyKSLcx5RMJKfLo5EEPUObbA78b0YQ2DTCJXqr9g=" ]; };