luna/catacomb
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Nest all platforms under channels_root (was: siblings)

Browse source 
Previously platform_root resolved YouTube to channels_root verbatim and
non-YouTube to siblings under channels_root.parent(). That assumed the
user's library was split across two levels:

  /library/yt-offline/   ← config.backup.directory (YouTube)
  /library/bandcamp/     ← sibling
  /library/tiktok/       ← sibling

In practice users (myself included) keep everything under one umbrella:

  /library/yt-offline/
    channels/    ← YouTube
    bandcamp/
    tiktok/
    music/
    …

Make that the canonical layout. platform_root now returns
channels_root.join(dir_name) for every platform including YouTube
(which keeps its `channels` dir_name for back-compat with existing
on-disk trees that already have the channels/ subdir populated).

library_root is now == channels_root in both app.rs and web.rs — the
two-level concept is gone. The field stays as a distinct name so
file_url() and the /files/ static-file mount keep working without
churn at every call site. music_root and music dir also moved from
channels_root.with_file_name("music") to channels_root.join("music").

Tests in platform.rs updated to the new layout. 74 pass.

Note: this is a breaking change for installs that had the sibling
layout. The fix is to mv the platform dirs into the channels_root.
The next commit walks the user through that for my install.

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
This commit is contained in:
Luna 2026-05-27 10:38:01 -07:00
parent 4cead6cf93
commit 4f15ab873f
4 changed files with 37 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/app.rs
View file

@ -240,11 +240,13 @@ impl App {
let channels_root = config.backup.directory.clone();
let settings_dir = channels_root.display().to_string();
let _ = std::fs::create_dir_all(&channels_root);
let library_root = channels_root
.parent()
.map(|p| p.to_path_buf())
.unwrap_or_else(|| channels_root.clone());
let _ = std::fs::create_dir_all(&library_root);
// library_root is the parent of every platform's per-creator
// folder. With the post-2026-05 nested layout every platform
// (including YouTube's `channels/`) lives under channels_root,
// so the two paths are the same. `library_root` is kept as a
// separate field for places that previously expected the
// sibling-platform layout (file_url, /files/ mount, maintenance).
let library_root = channels_root.clone();
// Pre-create every platform's folder so scans see them.
for &p in Platform::all() {
let dir = platform::platform_root(&channels_root, p);
@ -275,7 +277,8 @@ impl App {
let flags = db.get_video_flags().unwrap_or_default();
let resume_positions = db.get_positions().unwrap_or_default();
let music_root = channels_root.with_file_name("music");
// Music dir nests under channels_root like the platform dirs.
let music_root = channels_root.join("music");
let music_library = library::scan_music(&music_root);
let max_concurrent = config.backup.max_concurrent;