Layout and search fix
🏗️ Build and Test JellyTau / Run Tests (push) Failing after 2m4s
🏗️ Build and Test JellyTau / Android Compile Check (push) Has been skipped
Traceability Validation / Check Requirement Traces (push) Successful in 23s
Build & Release / Run Tests (push) Failing after 2m45s
Build & Release / Build Linux (push) Has been skipped
Build & Release / Build Android (push) Has been skipped
Build & Release / Create Release (push) Has been skipped
🏗️ Build and Test JellyTau / Run Tests (push) Failing after 2m4s
🏗️ Build and Test JellyTau / Android Compile Check (push) Has been skipped
Traceability Validation / Check Requirement Traces (push) Successful in 23s
Build & Release / Run Tests (push) Failing after 2m45s
Build & Release / Build Linux (push) Has been skipped
Build & Release / Build Android (push) Has been skipped
Build & Release / Create Release (push) Has been skipped
This commit is contained in:
@@ -1,5 +1,6 @@
|
||||
// Offline repository - queries SQLite database for cached data
|
||||
use std::sync::Arc;
|
||||
use std::sync::atomic::{AtomicBool, Ordering};
|
||||
|
||||
use async_trait::async_trait;
|
||||
use log::debug;
|
||||
@@ -7,6 +8,30 @@ use log::debug;
|
||||
use super::{MediaRepository, types::*};
|
||||
use crate::storage::db_service::{DatabaseService, Query, QueryParam, RusqliteService};
|
||||
|
||||
/// Whether offline library queries may include catalog items that are merely
|
||||
/// *browsed/synced* but not downloaded (the greyed-out "browse the whole server"
|
||||
/// view). Defaults to `true` so online browsing (which reads this same cache as
|
||||
/// a fast path) still sees the full catalog.
|
||||
///
|
||||
/// While offline, the frontend drives this from the "Show all server media"
|
||||
/// toggle: OFF means library pages show only downloaded/local media, ON reveals
|
||||
/// the full greyed-out catalog. See `set_include_catalog_browse` and the
|
||||
/// `showServerCatalog` UI flag. Fixes the bug where offline library pages showed
|
||||
/// every server item regardless of the toggle.
|
||||
static INCLUDE_CATALOG_BROWSE: AtomicBool = AtomicBool::new(true);
|
||||
|
||||
/// Set whether offline `get_items` includes non-downloaded (synced-only) catalog
|
||||
/// items. Called from the frontend: `true` when online or when the offline
|
||||
/// "Show all server media" toggle is on; `false` when offline with the toggle
|
||||
/// off (show downloaded/local media only).
|
||||
pub fn set_include_catalog_browse(include: bool) {
|
||||
INCLUDE_CATALOG_BROWSE.store(include, Ordering::Relaxed);
|
||||
}
|
||||
|
||||
fn include_catalog_browse() -> bool {
|
||||
INCLUDE_CATALOG_BROWSE.load(Ordering::Relaxed)
|
||||
}
|
||||
|
||||
pub struct OfflineRepository {
|
||||
db_service: Arc<RusqliteService>,
|
||||
server_id: String,
|
||||
@@ -558,7 +583,20 @@ impl MediaRepository for OfflineRepository {
|
||||
// Use CTE to find items that are either:
|
||||
// 1. Playable items (Audio, Movie, Episode) with completed downloads (offline mode)
|
||||
// 2. Container items (MusicAlbum, Series, Season) with at least one downloaded child (offline mode)
|
||||
// 3. Cached items with recent synced_at timestamp (online mode - for fast browsing)
|
||||
// 3. Cached items with recent synced_at timestamp (fast online browsing, or the
|
||||
// offline "Show all server media" catalog view) — only when the catalog-browse
|
||||
// flag is set. When offline with the toggle off, this branch is omitted so the
|
||||
// page shows downloaded/local media only. See `set_include_catalog_browse`.
|
||||
let catalog_branch = if include_catalog_browse() {
|
||||
"UNION
|
||||
|
||||
-- Cached items for fast browsing (online) or the offline catalog view
|
||||
SELECT DISTINCT i.id
|
||||
FROM items i
|
||||
WHERE i.synced_at IS NOT NULL"
|
||||
} else {
|
||||
""
|
||||
};
|
||||
let sql = format!(
|
||||
"WITH available_items AS (
|
||||
-- Playable items with completed downloads
|
||||
@@ -578,12 +616,7 @@ impl MediaRepository for OfflineRepository {
|
||||
WHERE d.status = 'completed'
|
||||
AND i.item_type IN ('MusicAlbum', 'Series', 'Season', 'BoxSet', 'Folder', 'CollectionFolder')
|
||||
|
||||
UNION
|
||||
|
||||
-- Cached items for fast browsing (when online)
|
||||
SELECT DISTINCT i.id
|
||||
FROM items i
|
||||
WHERE i.synced_at IS NOT NULL
|
||||
{catalog_branch}
|
||||
)
|
||||
SELECT i.id, i.name, i.item_type, i.server_id, i.parent_id, i.library_id, i.overview, i.genres,
|
||||
i.runtime_ticks, i.production_year, i.community_rating, i.official_rating,
|
||||
@@ -1874,6 +1907,57 @@ mod tests {
|
||||
assert_eq!(tracks.items[0].id, "track-1");
|
||||
}
|
||||
|
||||
/// Regression: offline library pages must honor the "Show all server media"
|
||||
/// toggle. With `include_catalog_browse` off, `get_items` returns only
|
||||
/// downloaded media — not the whole synced catalog. With it on, the full
|
||||
/// (synced-but-not-downloaded) catalog is revealed. Fixes the bug where
|
||||
/// offline library pages showed every server item regardless of the toggle.
|
||||
#[tokio::test]
|
||||
async fn test_get_items_toggle_gates_synced_catalog() {
|
||||
use crate::storage::db_service::DatabaseService;
|
||||
let db_service = create_test_db();
|
||||
|
||||
for sql in [
|
||||
// Two movies in a library, both merely synced (browsed) — no download.
|
||||
"INSERT INTO items (id, server_id, name, item_type, library_id, synced_at) \
|
||||
VALUES ('movie-dl', 'test-server', 'Downloaded', 'Movie', 'lib-1', '2026-01-01')",
|
||||
"INSERT INTO items (id, server_id, name, item_type, library_id, synced_at) \
|
||||
VALUES ('movie-cat', 'test-server', 'CatalogOnly', 'Movie', 'lib-1', '2026-01-01')",
|
||||
// Only the first movie is actually downloaded.
|
||||
"INSERT INTO downloads (item_id, status) VALUES ('movie-dl', 'completed')",
|
||||
// A library row so the library-parent EXISTS clause matches.
|
||||
"INSERT INTO libraries (id, server_id, name) VALUES ('lib-1', 'test-server', 'Movies')",
|
||||
] {
|
||||
db_service.execute(Query::new(sql)).await.unwrap();
|
||||
}
|
||||
|
||||
let repo = OfflineRepository::new(
|
||||
db_service.clone(),
|
||||
"test-server".to_string(),
|
||||
"test-user".to_string(),
|
||||
);
|
||||
let opts = Some(GetItemsOptions {
|
||||
include_item_types: Some(vec!["Movie".to_string()]),
|
||||
..Default::default()
|
||||
});
|
||||
|
||||
// Toggle OFF: only the downloaded movie is returned.
|
||||
set_include_catalog_browse(false);
|
||||
let local_only = repo.get_items("lib-1", opts.clone()).await.unwrap();
|
||||
let ids: Vec<&str> = local_only.items.iter().map(|i| i.id.as_str()).collect();
|
||||
assert_eq!(ids, vec!["movie-dl"], "toggle off should show downloaded media only");
|
||||
|
||||
// Toggle ON: both the downloaded and the catalog-only movie are returned.
|
||||
set_include_catalog_browse(true);
|
||||
let full_catalog = repo.get_items("lib-1", opts).await.unwrap();
|
||||
let mut ids: Vec<&str> = full_catalog.items.iter().map(|i| i.id.as_str()).collect();
|
||||
ids.sort();
|
||||
assert_eq!(ids, vec!["movie-cat", "movie-dl"], "toggle on should reveal the full catalog");
|
||||
|
||||
// Restore default for other tests sharing this process-global flag.
|
||||
set_include_catalog_browse(true);
|
||||
}
|
||||
|
||||
/// Regression: TV episodes link to their season/series via `season_id` /
|
||||
/// `series_id` (NOT `parent_id`, which is NULL in the cache). A downloaded
|
||||
/// episode must make both its Season and Series available offline, and
|
||||
|
||||
Reference in New Issue
Block a user