Add lyrics pipeline, playlist views, admin toggles, and player polish
Lyrics pipeline (Whisper + Demucs + description alignment):
- New GenerateLyricsJob runs WhisperX with VAD filtering and forced word
alignment, writes per-track JSON to NAS.
- New DecorateLyricsJob calls the active LLM provider to bake one to
several emojis into each line (heavy decoration prompt).
- LyricsDescriptionParser strips heading content, section markers, and
emoji-decoration from a song's description while preserving every
language verbatim.
- correct_whisper_with_description aligner: strong-match anchors only,
vocal-region-aware gap-fill so missing verses land on actual singing.
- Owner UI for generate/regenerate/edit/delete in the player gear.
Admin pages:
- /admin/lyrics toggles for VAD, vocal gap-fill, Demucs, master
- /admin/gpu extracted GPU section, encoder picker, FFmpeg path
- /admin/backup extracted users-and-settings export/import
- /admin/settings now AI/LLM only with provider list and Test button
- /admin/nas-storage hosts NAS settings, repair, disable flow, browser
- Shared partials/settings-styles for a uniform look across pages.
Playlist view tracking:
- Migration adds playlists.view_count and playlist_views dedup table.
- Playlist::bumpViewIfNew increments per device with a one-hour window.
- Tracked from /playlists/{id}, /playlists/share/{token}, /ps/{token},
and /videos/{id}?playlist={token}. Dispatched after-response so it
never blocks the page render.
- Loading a playlist on the video page now runs one query instead of
the four the old getNextVideo/getPreviousVideo path triggered.
- View counts shown on every playlist card and the playlist hero.
Player polish:
- Floating mini-player is draggable, persists its position in
localStorage, clamps to viewport on resize.
- Mini disabled entirely on mobile (less than 768px).
- New gear-menu Mini Player toggle (persists in localStorage) lets the
user disable both scroll-activation and SPA-nav-activation.
- Close button keeps media playing when used on the player's own page.
- SPA navigator now swaps a #page-scripts container so per-page JS
(channel tabs, etc.) gets re-executed after content swaps.
Storage layout:
- Runtime data moved from /storage/* to /data/* and gitignored.
- /ml/venv, /ml/cache, /ml/__pycache__ excluded.
Co-Authored-By: Claude Opus 4.7 <[email protected]>
This commit is contained in:
1 parent
73527f3781
commit
f98e5415a3
60 files changed
+7920
-2675
No files matched your search
@@ -75,6 +75,40 @@ class Video extends Model
|
||||
return $this->slides()->count() > 1;
|
||||
}
|
||||
|
||||
/**
|
||||
* Resolve the slide list for a given audio track, applying the sharing rule:
|
||||
* 1. Slides explicitly owned by this track (audio_track_id = $trackId).
|
||||
* 2. Slides owned by the primary (audio_track_id IS NULL = song-wide / legacy).
|
||||
* 3. Slides owned by any other track (first track in id order).
|
||||
* 4. Empty (caller falls back to cover image).
|
||||
*
|
||||
* Pass `null` for the primary audio (the one stored on the videos row).
|
||||
*
|
||||
* @return \Illuminate\Support\Collection<int,\App\Models\VideoSlide>
|
||||
*/
|
||||
public function slidesForTrack(?int $audioTrackId)
|
||||
{
|
||||
$all = $this->slides; // eager-loaded collection of every slide
|
||||
|
||||
if ($audioTrackId !== null) {
|
||||
$own = $all->where('audio_track_id', $audioTrackId)->values();
|
||||
if ($own->isNotEmpty()) return $own;
|
||||
}
|
||||
|
||||
// Primary / song-wide bucket (audio_track_id IS NULL).
|
||||
$primary = $all->whereNull('audio_track_id')->values();
|
||||
if ($primary->isNotEmpty()) return $primary;
|
||||
|
||||
// Borrow from the first track (by id) that has any.
|
||||
$byTrack = $all->whereNotNull('audio_track_id')->groupBy('audio_track_id');
|
||||
if ($byTrack->isNotEmpty()) {
|
||||
$firstTrackId = $byTrack->keys()->sort()->first();
|
||||
return $byTrack[$firstTrackId]->values();
|
||||
}
|
||||
|
||||
return collect();
|
||||
}
|
||||
|
||||
// ── Local filesystem path helpers ─────────────────────────────────────────
|
||||
|
||||
/**
|
||||
|
||||
Reference in new issue
Block a user