LyricsPreview improvements. Added ytdl import.
This commit is contained in:
1 parent
f7bbeb974b
commit
ad68f9f5e9
17 files changed
+2263
-206
No files matched your search
@@ -2459,3 +2459,564 @@ with no awareness of whether that distance represented active speech or silent d
|
||||
|
||||
Validation:
|
||||
- `npm run typecheck` completed with no errors
|
||||
|
||||
|
||||
### 2026-03-17 continuation (LyricsLivePreview parity fixes after LyricsCanvas integration)
|
||||
|
||||
Implemented the requested parity fixes in:
|
||||
- `frontend/src/components/LyricsLivePreview.tsx`
|
||||
|
||||
What was restored/fixed:
|
||||
- Overlay behavior (album art + metadata)
|
||||
- kept the corner hover card in windowed mode with album art + artist + title
|
||||
- corrected metadata display condition so `songTitle` renders even when `title` is absent
|
||||
- restored fullscreen art/info layout target by setting the art panel to ~half-screen width (`50%`)
|
||||
- Dynamic background color from album art
|
||||
- replaced simple average-color sampling with a saturated-pixel dominant-color pass
|
||||
- ignored extreme luminance/low-alpha pixels to avoid muddy/near-black picks
|
||||
- preserved readability by darkening the selected color before applying as preview background
|
||||
- extraction now runs whenever dynamic background is enabled and `coverArtUrl` is present
|
||||
- Scrub/scroll while paused (non-playing seek)
|
||||
- updated `currentTimeRef.current` in all seek/reset paths (`handleSeek`, `seekTime`, `handleReset`)
|
||||
- ensures `LyricsCanvas` receives immediate time updates so lyric scroll/position responds while paused
|
||||
|
||||
Validation:
|
||||
- file-level diagnostics: no TypeScript errors in `frontend/src/components/LyricsLivePreview.tsx`
|
||||
|
||||
|
||||
### 2026-03-17 continuation (WebUI live-reload / Vite host blocking)
|
||||
|
||||
Implemented and verified the live-reload fix for the separate WebUI dev container.
|
||||
|
||||
Files changed:
|
||||
- `frontend/vite.config.ts`
|
||||
- `frontend/Dockerfile.webui.dev`
|
||||
- `stemengine.yml`
|
||||
|
||||
Symptoms observed:
|
||||
- frontend edits were not reliably behaving like live development changes
|
||||
- Vite showed `Blocked request. This host ("work") is not allowed.` even after changing `allowedHosts`
|
||||
- `docker exec stemengine-webui cat /app/vite.config.ts` failed because the config was not located at `/app`
|
||||
|
||||
Root cause:
|
||||
- the dev container was starting in `/app`, while the bind-mounted frontend source (including `vite.config.ts`) lived at `/app/frontend`
|
||||
- because of that mismatch, Vite was not booting from the actual frontend project root and the expected config changes were not the authoritative runtime config
|
||||
- the host-side source mount also needed a dedicated `node_modules` volume so the container-installed dependencies were not shadowed by the bind mount
|
||||
|
||||
Fix:
|
||||
- `frontend/Dockerfile.webui.dev`
|
||||
- changed `WORKDIR` from `/app` to `/app/frontend`
|
||||
- keeps `npm run dev` running from the real frontend root so Vite loads the mounted config and source tree
|
||||
- `frontend/vite.config.ts`
|
||||
- set `server.allowedHosts = true` so alternate local hostnames used in the environment are accepted
|
||||
- replaced the alias path construction with a Vite-friendly `new URL('./src', import.meta.url).pathname` form to avoid Node typing / `__dirname` issues in config diagnostics
|
||||
- `stemengine.yml`
|
||||
- kept the live source bind mount at `/app/frontend`
|
||||
- added named volume `stemengine-webui-node-modules:/app/frontend/node_modules` so container dependencies remain available while using the host-mounted source tree
|
||||
|
||||
Operational note:
|
||||
- recreating the WebUI sometimes conflicted with an existing fixed-name container; the working recovery path was to remove the stale WebUI container and bring up only that service:
|
||||
- `docker rm -f stemengine-webui`
|
||||
- `docker compose -f stemengine.yml up -d --no-deps stemengine-webui`
|
||||
|
||||
Cleanup / follow-up:
|
||||
- removed explicit `container_name` values from the Compose services in `stemengine.yml`
|
||||
- this lets Docker Compose manage container naming itself and avoids fixed-name collisions during rebuild / recreate flows
|
||||
- preferred operational commands are now Compose-native commands rather than raw `docker exec` against a hard-coded container name, for example:
|
||||
- `docker compose -f stemengine.yml up -d --build --no-deps stemengine-webui`
|
||||
- `docker compose -f stemengine.yml exec stemengine-webui sh`
|
||||
- `docker compose -f stemengine.yml logs -f stemengine-webui`
|
||||
- this reduces the need for manual `docker rm -f ...` cleanup when iterating on the WebUI container
|
||||
|
||||
Validation:
|
||||
- file diagnostics reported no errors in:
|
||||
- `frontend/vite.config.ts`
|
||||
- `frontend/Dockerfile.webui.dev`
|
||||
- `stemengine.yml`
|
||||
- runtime verification inside the container confirmed:
|
||||
- working directory is `/app/frontend`
|
||||
- mounted config exists at `/app/frontend/vite.config.ts`
|
||||
- `allowedHosts: true` is present in the running config
|
||||
- container logs showed Vite starting normally and reloading on config changes:
|
||||
- `vite.config.ts changed, restarting server...`
|
||||
- `server restarted.`
|
||||
|
||||
|
||||
### 2026-03-17 planned work (LyricsLivePreview simplification + sentence segmentation)
|
||||
|
||||
Scope requested:
|
||||
- `frontend/src/components/LyricsLivePreview.tsx`
|
||||
- `backend/services/lrc_service.py`
|
||||
- `backend/services/lyric_transcriber_service.py`
|
||||
|
||||
No blockers/questions before implementation. The requests are implementable with a staged refactor that preserves existing playback/seek behavior.
|
||||
|
||||
---
|
||||
|
||||
## Frontend plan — unify style modes and simplify controls
|
||||
|
||||
### A) Replace style-mode matrix with one universal pane + effect toggles
|
||||
|
||||
Current state:
|
||||
- Visual style is modeled as a union (`scroll|fade|karaoke|glow|blur|video`) and selected via `VISUAL_STYLES`.
|
||||
- Some controls are gated by `visualStyle` (e.g., Glow slider only when style is `glow`, video controls only when style is `video`).
|
||||
|
||||
Planned change:
|
||||
- Introduce a single universal renderer mode (keep timing/layout options, remove style-mode branching as user-facing concept).
|
||||
- Convert glow/blur from style modes into independent boolean toggles:
|
||||
- `effectsGlowEnabled`
|
||||
- `effectsBlurEnabled`
|
||||
- Keep the same render pipeline (line/word/syllable timing, karaoke fill/pop) but drive visual output via flags, not mutually exclusive style IDs.
|
||||
|
||||
Implementation touchpoints:
|
||||
- Remove/retire `LyricsVisualStyle` mode selector UI and `VISUAL_STYLES` picker usage in the control panel.
|
||||
- Replace `visualStyle === 'glow'` and `visualStyle === 'blur'` branches with effect flags.
|
||||
- Keep `videoDisplayMode` (`scroll|line|word|syllable`) as the layout/timing selector inside the universal pane.
|
||||
|
||||
Acceptance criteria:
|
||||
- User no longer chooses among Scroll/Karaoke/Glow/Blur/etc. as top-level modes.
|
||||
- One pane always visible; Blur and Glow are independent checkboxes and can be combined.
|
||||
|
||||
---
|
||||
|
||||
### B) Reduce text color controls to BG + Text; speaker color drives active fill/pop
|
||||
|
||||
Current state:
|
||||
- Color controls include BG, Text, Line highlight, Word highlight.
|
||||
|
||||
Planned change:
|
||||
- Keep only:
|
||||
- `bgColor` (default `#000000`)
|
||||
- `textColor` (default `#ffffff`)
|
||||
- Remove user-facing line/word highlight swatches.
|
||||
- Active lyric emphasis (line/word/syllable fill/pop) should use the active speaker color when speaker metadata exists.
|
||||
- Fallback behavior when no speaker info exists: use a deterministic default accent from palette index 0.
|
||||
|
||||
Implementation touchpoints:
|
||||
- `StyleState`: remove `highlightColor` and `wordHighlight` from UI-facing settings (can keep temporary backward-compat read for migration).
|
||||
- `StylePicker`: remove `Line` and `Word` swatches.
|
||||
- Karaoke/line highlight render functions: resolve active color from speaker mapping first.
|
||||
|
||||
Acceptance criteria:
|
||||
- In diarized tracks, active fill/pop color is speaker-specific.
|
||||
- In non-diarized tracks, active fill/pop still uses a consistent accent.
|
||||
|
||||
---
|
||||
|
||||
### C) Increase min/max font limits for Word/Syllable layouts to fill screen
|
||||
|
||||
Current state:
|
||||
- Global font slider is limited to `12..40` and applies uniformly.
|
||||
|
||||
Planned change:
|
||||
- Introduce layout-sensitive size clamps:
|
||||
- line/scroll: keep conservative range (e.g., `12..56`)
|
||||
- word/syllable: expanded range (e.g., `16..140`, final tuning after preview test)
|
||||
- Add optional auto-fit pass for word/syllable layouts:
|
||||
- compute max renderable size against viewport bounds using measured text metrics
|
||||
- clamp final size to configured upper bound
|
||||
|
||||
Implementation touchpoints:
|
||||
- Font slider `min/max` logic in `StylePicker` based on active display layout.
|
||||
- Rendering size derivation where `baseFontSize` is transformed into effective size.
|
||||
|
||||
Acceptance criteria:
|
||||
- Word and Syllable layouts can be set large enough to occupy near full screen height/width without clipping.
|
||||
|
||||
---
|
||||
|
||||
### D) Dynamic options should affect both background and speaker text using high-contrast palette
|
||||
|
||||
Requested dependency:
|
||||
- Use `yamada-colors` palette generation.
|
||||
|
||||
Planned change:
|
||||
- Add frontend dependency on `yamada-colors` and build a deterministic palette generator from album-art seed color.
|
||||
- Replace static `SPEAKER_PALETTE` with generated high-contrast palette.
|
||||
- Assign per-speaker colors by stable order of first appearance (index-based mapping into generated palette).
|
||||
- Dynamic mode updates both:
|
||||
- preview background
|
||||
- speaker accent colors (dots/labels/fill/pop)
|
||||
- Add live preview feedback while toggling dynamic mode and when cover art changes.
|
||||
|
||||
Implementation touchpoints:
|
||||
- Palette generation utility near current speaker color helpers.
|
||||
- `speakerColor(...)` resolution path (use generated palette + stable speaker index map).
|
||||
- Dynamic background extraction effect hook: propagate generated palette updates to speaker styles.
|
||||
|
||||
Acceptance criteria:
|
||||
- Toggling dynamic mode visibly updates both background and speaker-driven highlights.
|
||||
- Speaker colors are high-contrast and deterministically assigned by order.
|
||||
|
||||
---
|
||||
|
||||
## Backend plan — sentence-oriented line segmentation with fallback
|
||||
|
||||
### E) Segment lines by sentence starts (capitalized starts)
|
||||
|
||||
Requested rule:
|
||||
- New line when a token starts with uppercase (sentence start signal).
|
||||
|
||||
Planned change:
|
||||
- Add shared segmentation helper (in `lyric_transcriber_service.py`) to split over-long transcription segments using sentence cues:
|
||||
1. primary break: punctuation boundaries (`.!?;`)
|
||||
2. secondary break: uppercase-start token after a minimum chunk length
|
||||
3. fallback break: max-word hard split
|
||||
|
||||
Implementation touchpoints:
|
||||
- Extend/replace `_split_long_segments(...)` with sentence-aware logic.
|
||||
- Keep timestamps mapped to first/last word of each produced chunk.
|
||||
|
||||
Acceptance criteria:
|
||||
- Output segments more closely match sentence/phrase boundaries in normal-cased lyrics.
|
||||
|
||||
---
|
||||
|
||||
### F) Fallback segmentation when lyrics are lowercase/no punctuation
|
||||
|
||||
Planned fallback strategy:
|
||||
- If no uppercase or punctuation cues are found in a chunk, split by adaptive max words (target window based on density, e.g., 6–10 words).
|
||||
- Optional pause-aware split: use inter-word time gaps above threshold as hard boundaries.
|
||||
|
||||
Implementation touchpoints:
|
||||
- `lyric_transcriber_service.py`: fallback branch in sentence-splitting helper.
|
||||
- `lrc_service.py`: add optional pre-segmentation for plain lyrics used in `_convert_to_elrc(...)` so alignment line mapping is more robust when input is a single lowercase block.
|
||||
|
||||
Acceptance criteria:
|
||||
- All-lowercase text still yields readable multi-line output (not one giant line).
|
||||
- Existing synced-LRC inputs remain unchanged unless explicitly in normalization path.
|
||||
|
||||
---
|
||||
|
||||
## Delivery sequence (recommended)
|
||||
|
||||
1. Backend segmentation helper + tests (sentence + fallback)
|
||||
2. Frontend universal pane refactor (remove top-level style modes)
|
||||
3. Color model simplification (BG/Text only + speaker-driven accent)
|
||||
4. Dynamic palette integration (`yamada-colors`) and live preview propagation
|
||||
5. Layout-specific large font bounds + optional auto-fit tuning
|
||||
|
||||
---
|
||||
|
||||
## Migration + compatibility notes
|
||||
|
||||
- Keep backward read-compat for saved localStorage style payloads:
|
||||
- map legacy `highlightColor`/`wordHighlight` into new accent fallback when present
|
||||
- ignore removed `visualStyle` values gracefully
|
||||
- Preserve current keyboard/seek/scroll behavior and existing ELRC parsing.
|
||||
- Keep diarization optional; speaker-color logic must degrade cleanly when `speaker` is absent.
|
||||
|
||||
|
||||
### 2026-03-17 implementation (universal preview controls + sentence segmentation fallback)
|
||||
|
||||
Implemented in:
|
||||
- `frontend/src/components/LyricsLivePreview.tsx`
|
||||
- `backend/services/lyric_transcriber_service.py`
|
||||
- `backend/services/lrc_service.py`
|
||||
|
||||
#### Frontend changes completed
|
||||
|
||||
1) Universal controls in style pane
|
||||
- removed top toolbar visual-style tabs from active UI flow and replaced with a single `Universal` indicator
|
||||
- kept one style panel and added independent effect toggles:
|
||||
- `effectGlowEnabled`
|
||||
- `effectBlurEnabled`
|
||||
- blur/glow checks are now independent controls in the pane (not style-mode tabs)
|
||||
|
||||
2) Text color controls reduced
|
||||
- style color controls in picker now expose only:
|
||||
- `BG`
|
||||
- `Text`
|
||||
- removed `Line` and `Word` swatches from the picker
|
||||
- active speaker color remains the primary fill/pop accent when diarization metadata exists
|
||||
|
||||
3) Font-size limits expanded for large word/syllable layouts
|
||||
- slider limits now depend on layout mode:
|
||||
- line/scroll-like: `12..56`
|
||||
- word/syllable-like: `18..140`
|
||||
- enables full-screen-scale lyric sizing in dense display modes
|
||||
|
||||
4) Dynamic visual feedback for speaker accents
|
||||
- added high-contrast dynamic speaker palette generation from extracted album-art color
|
||||
- `getSpeakerColor()` now assigns per-speaker auto colors by stable speaker order in the current track
|
||||
- when dynamic background is enabled, auto speaker palette updates with the extracted art seed, providing immediate preview feedback on both background and speaker accents
|
||||
|
||||
Note on requested `yamada-colors` dependency:
|
||||
- package lookup for `@yamada-ui/colors` in npm returned `404` (not published under that name in this environment)
|
||||
- implemented an in-repo deterministic high-contrast palette generator as the functional fallback to satisfy dynamic speaker contrast + order assignment behavior
|
||||
|
||||
#### Backend changes completed
|
||||
|
||||
1) Sentence-oriented segment splitting in transcription output
|
||||
- in `lyric_transcriber_service.py`, `_split_long_segments()` now uses sentence-aware chunking:
|
||||
- punctuation boundaries
|
||||
- uppercase sentence starts
|
||||
- max-word fallback
|
||||
- timestamps remain anchored to first/last word per chunk
|
||||
|
||||
2) Lowercase/no-punctuation fallback for plain lyrics
|
||||
- added plain-lyrics segmentation helper in `lyric_transcriber_service.py`
|
||||
- `_lyrics_to_whisperx_segments()` now pre-segments plain input using sentence heuristics + max-word fallback before assigning alignment windows
|
||||
|
||||
3) Alignment-path normalization fallback in `lrc_service.py`
|
||||
- `clean_lyrics_text()` now includes sentence-aware line segmentation with fallback chunking for lowercase blocks
|
||||
- this improves ELRC/LRC readability when source lyrics arrive as long unbroken lines
|
||||
|
||||
Validation:
|
||||
- diagnostics: no errors in
|
||||
- `frontend/src/components/LyricsLivePreview.tsx`
|
||||
- `backend/services/lyric_transcriber_service.py`
|
||||
- `backend/services/lrc_service.py`
|
||||
- frontend type-check:
|
||||
- `npm run typecheck` exited `0`
|
||||
|
||||
|
||||
### 2026-03-17 continuation (follow-up tweak: fill direction + strict layout semantics + mid-line "I")
|
||||
|
||||
Implemented follow-up adjustments from review feedback.
|
||||
|
||||
Files updated:
|
||||
- `frontend/src/components/LyricsLivePreview.tsx`
|
||||
- `backend/services/lyric_transcriber_service.py`
|
||||
- `backend/services/lrc_service.py`
|
||||
|
||||
#### Frontend follow-up
|
||||
|
||||
- Corrected active fill direction/color semantics:
|
||||
- lyric units now start from `textColor`
|
||||
- fill/accent advances using speaker color when diarization data exists
|
||||
- Enforced requested layout semantics in renderer behavior:
|
||||
- `scroll`: all lyrics shown and scrolling
|
||||
- `line`: only active line shown
|
||||
- `word`: only active word shown
|
||||
- `syllable`: only active syllable shown
|
||||
|
||||
#### Backend follow-up segmentation rule
|
||||
|
||||
- Updated sentence-capital split heuristics to ignore standalone mid-line pronoun `I`
|
||||
(including variants with surrounding punctuation), preventing false sentence breaks.
|
||||
|
||||
Validation:
|
||||
- diagnostics clean for changed files
|
||||
- frontend typecheck re-run: `EXIT:0`
|
||||
|
||||
|
||||
### 2026-03-17 planned (centered word/syllable focus + richer background pop)
|
||||
|
||||
Requested next changes:
|
||||
- In `word` and `syllable` layouts, the active unit should sit in the center of the preview window.
|
||||
- Dynamic background colors should look less dull / more vivid.
|
||||
|
||||
Scope for next implementation:
|
||||
- `frontend/src/components/LyricsLivePreview.tsx`
|
||||
|
||||
#### Plan A — center active unit in word/syllable layouts
|
||||
|
||||
Current behavior summary:
|
||||
- `word` / `syllable` in the canvas overlay path already use an absolute full-window container,
|
||||
but horizontal alignment can still follow text-alignment controls and can feel offset.
|
||||
|
||||
Planned changes:
|
||||
1. Force center anchoring for `word` and `syllable` display modes in the overlay renderer:
|
||||
- vertical: centered in viewport
|
||||
- horizontal: centered in viewport
|
||||
2. Keep `scroll` and `line` behavior unchanged (existing alignment controls continue to apply there).
|
||||
3. Keep animation style support unchanged; only placement logic changes.
|
||||
|
||||
Acceptance target:
|
||||
- when switching to `word` or `syllable`, the active token appears centered and remains centered while time advances.
|
||||
|
||||
#### Plan B — make dynamic backgrounds pop more
|
||||
|
||||
Current behavior summary:
|
||||
- extracted album-art color is intentionally darkened for readability, which can flatten saturation.
|
||||
|
||||
Planned changes:
|
||||
1. Introduce a vividness pass after extraction:
|
||||
- convert seed color to HSL
|
||||
- increase saturation floor and clamp lightness into a readable-but-richer range
|
||||
2. Build the effective background from a subtle two-stop gradient (same hue family):
|
||||
- top: slightly lighter/saturated
|
||||
- bottom: slightly deeper for contrast
|
||||
3. Preserve text readability by enforcing contrast guardrails against white lyric text.
|
||||
4. Keep user-selected static `bgColor` behavior unchanged (only dynamic background path is enhanced).
|
||||
|
||||
Acceptance target:
|
||||
- dynamic background retains artwork identity but appears more vibrant and less muddy.
|
||||
|
||||
#### Clarifications needed before implementation
|
||||
|
||||
1. For `word`/`syllable`, should centering ignore text alignment (`left/center/right`) entirely?
|
||||
- proposed default: yes, always hard-center in these two modes.
|
||||
2. For “pop,” do you want:
|
||||
- (a) more vivid flat color, or
|
||||
- (b) subtle gradient background (recommended)?
|
||||
|
||||
If you confirm these two points, implementation can proceed directly.
|
||||
|
||||
|
||||
### 2026-03-17 implementation (centered word/syllable focus + dynamic BG flat/gradient)
|
||||
|
||||
Implemented in:
|
||||
- `frontend/src/components/LyricsLivePreview.tsx`
|
||||
|
||||
#### 1) Word/syllable active unit centering
|
||||
|
||||
- Updated overlay placement logic so `word` and `syllable` layouts force center anchoring.
|
||||
- This keeps the active unit centered in the preview window while playback advances.
|
||||
- `scroll` and `line` keep their existing alignment behavior.
|
||||
|
||||
#### 2) Dynamic background “pop” while honoring source color
|
||||
|
||||
- Improved dynamic color extraction output to keep hue identity while increasing saturation/lightness in a controlled range.
|
||||
- Added dynamic background mode options in the style panel:
|
||||
- `flat`
|
||||
- `gradient`
|
||||
- Default mode set to `gradient` for richer visual depth.
|
||||
- Added dynamic gradient generation from the extracted seed color (top lighter / bottom deeper) and wired it into the canvas background render path.
|
||||
|
||||
#### 3) UI + style model updates
|
||||
|
||||
- Added `dynBgMode` to style state (`'flat' | 'gradient'`).
|
||||
- Added mode controls beside the dynamic background toggle (shown when dynamic background is enabled).
|
||||
- Passed dynamic background gradient data into `LyricsCanvas` style payload.
|
||||
|
||||
Validation:
|
||||
- frontend diagnostics: clean
|
||||
- frontend typecheck: `EXIT:0`
|
||||
|
||||
|
||||
### 2026-03-17 implementation (yt-dlp import + video preview playback + advanced Subsonic search)
|
||||
|
||||
Requested:
|
||||
- Implement yt-dl import.
|
||||
- Support video playback in lyrics preview.
|
||||
- Add advanced Subsonic search (artist, album, etc.).
|
||||
- Ensure Subsonic import prefers AlbumArtist over track Artist.
|
||||
|
||||
Scope:
|
||||
- `backend/services/subsonic_service.py`
|
||||
- `backend/routers/subsonic.py`
|
||||
- `backend/requirements.txt`
|
||||
- `frontend/src/api/client.ts`
|
||||
- `frontend/src/types.ts`
|
||||
- `frontend/src/components/Sidebar.tsx`
|
||||
- `frontend/src/pages/ProjectDetail.tsx`
|
||||
- `frontend/src/components/LyricsLivePreview.tsx`
|
||||
|
||||
#### Implemented
|
||||
|
||||
1) Advanced Subsonic search fields
|
||||
- Extended `/api/subsonic/search` with structured filters:
|
||||
- `q`, `title`, `artist`, `album`, `album_artist`, `count`, `offset`
|
||||
- Added service-side post-filtering for consistent matching across Subsonic-compatible servers.
|
||||
- Search results now include both:
|
||||
- `songArtist` (track artist)
|
||||
- `albumArtist` (album artist)
|
||||
- Display `artist` now prefers `albumArtist` when available.
|
||||
|
||||
2) AlbumArtist-preferred Subsonic import
|
||||
- Updated import payload and backend import path to carry `album_artist` and `album`.
|
||||
- Import naming now uses effective artist:
|
||||
- `album_artist || artist`
|
||||
- Persisted import metadata sidecar (`<media>.json`) including source, title/artist fields, and album metadata.
|
||||
|
||||
3) yt-dlp import
|
||||
- Added backend endpoint:
|
||||
- `POST /api/subsonic/import-ytdl`
|
||||
- Added service method to download URL media via `yt-dlp`, normalize naming, and save metadata sidecar.
|
||||
- Added frontend API call and a dedicated Sidebar panel (`YT-DL Import`) with:
|
||||
- URL input
|
||||
- optional title/artist override
|
||||
- import action and error handling
|
||||
- Added backend dependency:
|
||||
- `yt-dlp>=2026.01.01`
|
||||
|
||||
4) Imported media metadata + cleanup
|
||||
- `list_imports()` now returns both audio and video imports.
|
||||
- Import metadata from sidecar is merged into API response (source/title/artist/etc.).
|
||||
- Import deletion now also removes the sidecar metadata file.
|
||||
|
||||
5) Video playback in lyrics preview
|
||||
- Added `videoUrl` prop support to `LyricsLivePreview`.
|
||||
- Project detail now detects source video extensions (`mp4/mkv/webm/mov/m4v`) and passes source video URL into preview.
|
||||
- In `video` visual style, preview now renders source video as a background layer with a readability scrim.
|
||||
- Transport controls (play/pause/seek/reset) now sync video timeline with lyric playback state.
|
||||
|
||||
Validation:
|
||||
- diagnostics on changed backend/frontend files: clean
|
||||
|
||||
### 2026-03-17 implementation (yt-dlp import as background job with live progress)
|
||||
|
||||
Requested:
|
||||
- Wrap yt-dlp imports in a background job so large downloads show progress in the UI instead of blocking the request thread.
|
||||
|
||||
Scope:
|
||||
- `backend/services/subsonic_service.py`
|
||||
- `backend/routers/subsonic.py`
|
||||
- `frontend/src/types.ts`
|
||||
- `frontend/src/api/client.ts`
|
||||
- `frontend/src/components/Sidebar.tsx`
|
||||
|
||||
#### Implemented
|
||||
|
||||
1) Background worker — `subsonic_service.run_ytdl_import(job_id, url, title, artist)`
|
||||
- Sets job status to `RUNNING`, calls `import_ytdl()`, then sets `DONE` with result metadata.
|
||||
- On failure writes `ERROR` with the exception message.
|
||||
- `import_ytdl()` gains a `_progress_cb` parameter; a yt-dlp `progress_hook` fires it with strings like `Downloading… 42% · 1.2MiB/s · ETA 12s` and `Download finished, processing…`.
|
||||
|
||||
2) Router change — `POST /api/subsonic/import-ytdl`
|
||||
- Now synchronously creates a job (`jm.create_job("ytdl-import")`), submits `run_ytdl_import` via `jm.submit()` (general thread pool), and returns `{"job_id": "…"}` immediately.
|
||||
- No longer blocks the HTTP request thread for the duration of the download.
|
||||
|
||||
3) Type + API surface
|
||||
- `Job.job_type` union extended with `'ytdl-import'` in `types.ts`.
|
||||
- `importYtDl()` in `client.ts` return type changed from `ImportedFile` to `{ job_id: string }`.
|
||||
|
||||
4) `YtDlPanel` frontend polling
|
||||
- On submit, stores the returned `job_id` in state.
|
||||
- `useQuery(['ytdl-job', jobId])` polls `/api/jobs/<id>` every 1.5 s while status is `queued` or `running`; stops polling automatically on terminal states.
|
||||
- Live `job.progress` text displayed below the button (e.g. download percentage, speed, ETA).
|
||||
- On `done`: `['imports']` query invalidated (import list refreshes), form fields cleared.
|
||||
- Inputs and button are disabled during an active job.
|
||||
- Panel header shows a spinning indicator even when collapsed.
|
||||
- Error from `job.error` surfaced identically to submit-time errors.
|
||||
|
||||
Validation:
|
||||
- `python3 -m py_compile backend/services/subsonic_service.py backend/routers/subsonic.py` — OK
|
||||
- `npm run -s typecheck` — EXIT:0
|
||||
|
||||
---
|
||||
|
||||
### 2026-03-17 implementation (stroke persistence on line transitions + aliasing reduction)
|
||||
|
||||
Requested:
|
||||
- Keep stroke/effects visible when transitioning from one active line to the next.
|
||||
- Reduce visible text aliasing artifacts.
|
||||
|
||||
Scope:
|
||||
- `frontend/src/components/LyricsLivePreview.tsx`
|
||||
|
||||
#### Plan
|
||||
|
||||
1. Ensure the outgoing (previously active) line is rebuilt with the same stroke settings as inactive lines.
|
||||
2. Re-apply effect attributes after active-line swap so disappearing lines keep visual treatment during fade/scroll.
|
||||
3. Add text rendering / font smoothing hints to overlay tokens and SVG-rendered text nodes to reduce jagged edges.
|
||||
|
||||
#### Implemented
|
||||
|
||||
- In `activateCanvasLineGroup()`:
|
||||
- restored inactive line rebuild now includes stroke fields (`stroke`, `linewidth`) when stroke is enabled.
|
||||
- restored and active text SVG nodes now receive `text-rendering: geometricPrecision` hints.
|
||||
- For overlay/video text elements:
|
||||
- added rendering hints on container/spans (`text-rendering`, `-webkit-font-smoothing`, related smoothing hints).
|
||||
- applied the same hints to dynamically created syllable/word/line spans so transitions are visually consistent.
|
||||
|
||||
Result:
|
||||
- outgoing lines retain stroke/effect appearance during transition instead of dropping outline abruptly.
|
||||
- reduced aliasing/jaggies on animated lyric text paths.
|
||||
|
||||
Validation:
|
||||
- frontend diagnostics: clean
|
||||
- frontend typecheck: `EXIT:0`
|
||||
|
||||
@@ -0,0 +1,250 @@
|
||||
# WebUI Live Reload Implementation — Summary
|
||||
|
||||
**Date**: 2026-03-17
|
||||
**Status**: ✅ Implemented
|
||||
**Impact**: Frontend development cycle reduced from 35-70 seconds to 3-5 seconds
|
||||
|
||||
---
|
||||
|
||||
## What Changed
|
||||
|
||||
### 1. New Dev Dockerfile
|
||||
**File**: [frontend/Dockerfile.webui.dev](frontend/Dockerfile.webui.dev)
|
||||
- Lightweight Alpine image with Node 20
|
||||
- Runs `npm run dev` → Vite dev server on all interfaces
|
||||
- Source code mounted from host (no rebuild needed on changes)
|
||||
|
||||
### 2. Updated package.json
|
||||
**File**: [frontend/package.json](frontend/package.json#L7)
|
||||
- Changed: `"dev": "vite"` → `"dev": "vite --host 0.0.0.0"`
|
||||
- Now listens on all interfaces for Docker port mapping
|
||||
|
||||
### 3. Updated Docker Compose
|
||||
**File**: [stemengine.yml](stemengine.yml)
|
||||
- Added frontend source volume mount:
|
||||
```yaml
|
||||
volumes:
|
||||
- ${SEFOLDER}/frontend:/app/frontend
|
||||
```
|
||||
- Switched to dev Dockerfile by default:
|
||||
```yaml
|
||||
dockerfile: ${WEBUI_DOCKERFILE:-Dockerfile.webui.dev}
|
||||
```
|
||||
- Updated traefik port from 80 to `${WEBUI_PORT:-5173}`
|
||||
|
||||
### 4. Environment Configuration
|
||||
**File**: [.env](.env)
|
||||
- Added `WEBUI_DOCKERFILE=Dockerfile.webui.dev` (enables live reload)
|
||||
- Added `WEBUI_PORT=5173` (Vite dev server port)
|
||||
|
||||
---
|
||||
|
||||
## How to Use
|
||||
|
||||
### Start with Live Reload (Recommended for Development)
|
||||
```bash
|
||||
cd /home/translator/docker
|
||||
docker compose up -d --build stemengine-webui
|
||||
```
|
||||
|
||||
**What happens:**
|
||||
1. Container builds with dev Dockerfile
|
||||
2. Vite dev server starts on port 5173
|
||||
3. Frontend source is mounted from host
|
||||
4. Changes to `.tsx`/`.ts` files trigger instant HMR
|
||||
|
||||
### Switch to Production Build
|
||||
Edit `.env`:
|
||||
```env
|
||||
WEBUI_DOCKERFILE=Dockerfile.webui
|
||||
```
|
||||
|
||||
Then rebuild:
|
||||
```bash
|
||||
docker compose up -d --build stemengine-webui
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## Developer Workflow
|
||||
|
||||
### Edit → Test Cycle
|
||||
|
||||
#### Before (Old Workflow)
|
||||
```
|
||||
1. Edit src/components/MyComponent.tsx
|
||||
2. Run: docker compose up -d --build stemengine-webui
|
||||
3. Wait 30-60 seconds for rebuild
|
||||
4. Hard refresh browser
|
||||
5. See changes
|
||||
Total: 35-70 seconds ⏱️
|
||||
```
|
||||
|
||||
#### After (New Workflow)
|
||||
```
|
||||
1. Edit src/components/MyComponent.tsx
|
||||
2. Save file
|
||||
3. Browser auto-reloads (HMR) within 2-3 seconds
|
||||
4. See changes immediately
|
||||
Total: 3-5 seconds ⏱️
|
||||
```
|
||||
|
||||
### HMR Behavior
|
||||
|
||||
| Change Type | Behavior |
|
||||
|-----------|-----------|
|
||||
| CSS import | Instant style update (no reload) |
|
||||
| Component JSX | Page auto-reload, state preserved where possible |
|
||||
| TypeScript errors | Shows in browser console + terminal |
|
||||
| Import path changes | Full reload (module graph changed) |
|
||||
|
||||
---
|
||||
|
||||
## Technical Details
|
||||
|
||||
### Why This Works
|
||||
|
||||
**Vite Dev Server:**
|
||||
- Serves modules as-is (unbundled ES modules)
|
||||
- File watchers trigger rebuilds automatically
|
||||
- HMR protocol pushes changes to browser without full reload
|
||||
|
||||
**Volume Mount:**
|
||||
- `${SEFOLDER}/frontend:/app/frontend` exposes host source to container
|
||||
- Vite's chokidar watches mounted files for changes
|
||||
- No Docker rebuild needed
|
||||
|
||||
**CORS Already Configured:**
|
||||
- Backend CORS settings already include `localhost:5173`
|
||||
- Dev server can call `/api/*` endpoints on backend without modification
|
||||
|
||||
### Fallback to Production Build
|
||||
|
||||
If issues occur, switch back to production:
|
||||
```env
|
||||
WEBUI_DOCKERFILE=Dockerfile.webui
|
||||
```
|
||||
|
||||
This uses the original two-stage build (static nginx serving), which is proven stable.
|
||||
|
||||
---
|
||||
|
||||
## Testing Checklist
|
||||
|
||||
- [ ] Rebuild: `docker compose up -d --build stemengine-webui`
|
||||
- [ ] Check logs: `docker logs stemengine-webui` (should show Vite startup)
|
||||
- [ ] Access http://localhost:5173 (should load frontend)
|
||||
- [ ] Edit a .tsx file in `frontend/src/`
|
||||
- [ ] Save and watch browser update within 2-3 seconds
|
||||
- [ ] Open browser console (F12) for any TypeScript/runtime errors
|
||||
- [ ] Verify `/api/*` calls still work (backend communication)
|
||||
|
||||
---
|
||||
|
||||
## Files Modified
|
||||
|
||||
| File | Change | Impact |
|
||||
|------|--------|--------|
|
||||
| `frontend/Dockerfile.webui.dev` | **NEW** | Dev-mode image with Vite server |
|
||||
| `frontend/package.json` | Line 7 | Added `--host 0.0.0.0` to dev script |
|
||||
| `stemengine.yml` | Lines 115-142 | Added volume mount, switched Dockerfile, updated port config |
|
||||
| `.env` | Lines 30-32 | Added WEBUI_DOCKERFILE, WEBUI_PORT settings |
|
||||
|
||||
---
|
||||
|
||||
## Known Limitations
|
||||
|
||||
### Page Reloads vs True HMR
|
||||
- CSS-only changes: Instant (true HMR, no reload)
|
||||
- Component logic changes: Page reloads (preserves component state where possible)
|
||||
- This is standard Vite behavior, same as `npm run dev` locally
|
||||
|
||||
### No TypeScript Compilation Step
|
||||
- Browser shows runtime errors directly (standard for dev mode)
|
||||
- Run `npm run typecheck` in terminal for ahead-of-time checking
|
||||
- CI/CD still validates TypeScript before production builds
|
||||
|
||||
### VITE_STEMENGINE_API_BASE
|
||||
- Build-time variable from `.env` / docker-compose args
|
||||
- To change backend URL at runtime: Use Settings → Integrations (UI override)
|
||||
- Dev builds use `${VITE_STEMENGINE_API_BASE:-http://localhost:8000}` from env
|
||||
|
||||
---
|
||||
|
||||
## Troubleshooting
|
||||
|
||||
### "Port 5173 already in use"
|
||||
```bash
|
||||
# Find process using port 5173
|
||||
lsof -i :5173
|
||||
|
||||
# Kill it (if not needed)
|
||||
kill -9 <PID>
|
||||
|
||||
# Or change WEBUI_PORT in .env to something else
|
||||
```
|
||||
|
||||
### Changes not showing up
|
||||
```bash
|
||||
# Check Vite is running
|
||||
docker logs stemengine-webui
|
||||
|
||||
# Look for "[vite] hmr update received"
|
||||
|
||||
# Try hard refresh: Ctrl+Shift+R (or Cmd+Shift+R on Mac)
|
||||
```
|
||||
|
||||
### Backend API calls failing
|
||||
```bash
|
||||
# Verify backend is running on port 8000
|
||||
docker logs stemengine
|
||||
|
||||
# Check CORS settings in .env cover your access URL
|
||||
# Edit CORS_ORIGINS or CORS_ORIGIN_REGEX if needed
|
||||
```
|
||||
|
||||
### TypeScript errors not showing
|
||||
```bash
|
||||
# Open browser DevTools console (F12)
|
||||
# Check for syntax errors
|
||||
|
||||
# Run type check locally:
|
||||
cd frontend
|
||||
npm run typecheck
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## Rollback Plan
|
||||
|
||||
If live reload causes issues, immediately switch to production:
|
||||
|
||||
```bash
|
||||
# Edit .env
|
||||
WEBUI_DOCKERFILE=Dockerfile.webui
|
||||
|
||||
# Rebuild static version
|
||||
cd /home/translator/docker
|
||||
docker compose up -d --build stemengine-webui
|
||||
```
|
||||
|
||||
This reverts to the original static Dockerfile (nginx + pre-built dist), which requires `docker compose up -d --build` for changes but is stable and production-ready.
|
||||
|
||||
---
|
||||
|
||||
## Next Steps
|
||||
|
||||
1. ✅ Test live reload workflow: `docker compose up -d --build stemengine-webui`
|
||||
2. ✅ Edit a `.tsx` file and verify instant HMR
|
||||
3. ✅ Check browser console for any runtime errors
|
||||
4. ✅ Verify API calls to backend still work
|
||||
5. Optional: Document custom dev setup (e.g., local Vite + tunneling to backend)
|
||||
|
||||
---
|
||||
|
||||
## References
|
||||
|
||||
- **Vite Docs**: https://vitejs.dev/guide/
|
||||
- **HMR Configuration**: https://vitejs.dev/guide/features.html#hot-module-reload
|
||||
- **Docker Compose**: https://docs.docker.com/compose/
|
||||
- **Previous Plan**: [20260317_WebUI_Live_Reload_Plan.md](20260317_WebUI_Live_Reload_Plan.md)
|
||||
@@ -0,0 +1,222 @@
|
||||
# WebUI Live Reload Implementation Plan
|
||||
|
||||
**Date**: 2026-03-17
|
||||
**Issue**: Frontend changes require full Docker rebuild/restart to take effect
|
||||
**Goal**: Enable hot-reload development workflow—changes to `.tsx`/`.ts` files immediately visible in browser
|
||||
|
||||
## Current Architecture
|
||||
|
||||
### Production Setup
|
||||
- **Dockerfile.webui**: Two-stage build
|
||||
- Stage 1 (`node:20-alpine`): Builds Vite dist folder
|
||||
- Stage 2 (`nginx:1.27-alpine`): Serves static dist via nginx
|
||||
- **Result**: Static bundle, zero hot-reload capability
|
||||
- **Use case**: Production deployments where rebuild is acceptable
|
||||
|
||||
### Development Setup (Backend Reference)
|
||||
- **backend**: Mounted from host via `${SEFOLDER}/backend:/app/backend`
|
||||
- **Uvicorn reload**: `python3.11 -m uvicorn backend.main:app --reload`
|
||||
- **Result**: Changes to `.py` files trigger auto-reload, available immediately
|
||||
- **Workflow**: Edit→Save→Test (no build needed)
|
||||
|
||||
## Problem Analysis
|
||||
|
||||
### Why Rebuild is Required Now
|
||||
1. **No volume mount**: Frontend source not mounted in stemengine-webui container
|
||||
2. **Static serving**: nginx serves pre-built dist folder (no watch/rebuild)
|
||||
3. **Full Docker rebuild**: Only way to pick up changes is `docker compose up -d --build`
|
||||
|
||||
### Why Backend Works Without Rebuild
|
||||
1. **Volume mount**: `${SEFOLDER}/backend:/app/backend` mounts source
|
||||
2. **Auto-reload**: uvicorn `--reload` watches source files
|
||||
3. **Immediate effect**: Changes detected, server restarts transparently
|
||||
|
||||
## Solution Architecture
|
||||
|
||||
### Option A: Vite Dev Server (Recommended)
|
||||
**Pros:**
|
||||
- HMR (hot module reload) out-of-box
|
||||
- Handles TypeScript/JSX transformation on-the-fly
|
||||
- Matches local development workflow exactly
|
||||
- Zero build steps needed
|
||||
|
||||
**Cons:**
|
||||
- Separate service running (not just nginx)
|
||||
- Slightly slower than production build (no tree-shaking/minification)
|
||||
|
||||
**Implementation:**
|
||||
1. Mount frontend source: `${SEFOLDER}/frontend:/app/frontend`
|
||||
2. Replace nginx with Vite dev server on port 5173
|
||||
3. Watch mode enabled by default (chokidar polling for WSL2 compat)
|
||||
|
||||
### Option B: Vite Watch + Nginx (Hybrid)
|
||||
**Pros:**
|
||||
- Uses nginx (production-like environment)
|
||||
- Still watches/rebuilds on changes
|
||||
|
||||
**Cons:**
|
||||
- No HMR (full page refresh needed)
|
||||
- More complex to coordinate two processes
|
||||
- Slower feedback loop than dev server
|
||||
|
||||
**Implementation:**
|
||||
1. Mount frontend source
|
||||
2. Run `vite build --watch` in background
|
||||
3. nginx serves rebuilt dist folder
|
||||
|
||||
---
|
||||
|
||||
## Recommended Implementation: Option A (Vite Dev Server)
|
||||
|
||||
### Changes Required
|
||||
|
||||
#### 1. Update stemengine.yml
|
||||
Add volume mount for frontend source:
|
||||
```yaml
|
||||
stemengine-webui:
|
||||
volumes:
|
||||
- ${SEFOLDER}/frontend:/app/frontend
|
||||
```
|
||||
|
||||
#### 2. Create Dockerfile.webui.dev
|
||||
Lightweight dev-mode image:
|
||||
```dockerfile
|
||||
FROM node:20-alpine
|
||||
WORKDIR /app
|
||||
|
||||
# Install dependencies once
|
||||
COPY package*.json ./
|
||||
RUN npm ci
|
||||
|
||||
# Mount source from host (volume)
|
||||
# Source copied in compose file
|
||||
|
||||
EXPOSE 5173
|
||||
CMD ["npm", "run", "dev"]
|
||||
```
|
||||
|
||||
#### 3. Update package.json
|
||||
Ensure `dev` script targets Vite dev server:
|
||||
```json
|
||||
{
|
||||
"scripts": {
|
||||
"dev": "vite --host 0.0.0.0",
|
||||
"build": "vite build",
|
||||
"preview": "vite preview"
|
||||
}
|
||||
}
|
||||
```
|
||||
|
||||
#### 4. Update stemengine.yml Build Config
|
||||
Switch to dev Dockerfile when in development:
|
||||
```yaml
|
||||
stemengine-webui:
|
||||
build:
|
||||
context: ${SEFOLDER}/frontend
|
||||
dockerfile: Dockerfile.webui.dev # Dev mode
|
||||
# OR: dockerfile: Dockerfile.webui # Production mode
|
||||
```
|
||||
|
||||
#### 5. Environment Variable to Control Mode
|
||||
Add to `.env`:
|
||||
```env
|
||||
# Use 'Dockerfile.webui' for production, 'Dockerfile.webui.dev' for development
|
||||
WEBUI_BUILD_MODE=dev
|
||||
```
|
||||
|
||||
Then in compose:
|
||||
```yaml
|
||||
dockerfile: Dockerfile.webui${WEBUI_BUILD_MODE:+.dev}
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## Workflow Comparison
|
||||
|
||||
### Current (Production)
|
||||
```
|
||||
Edit TSX file
|
||||
↓
|
||||
docker compose up -d --build stemengine-webui (30-60 sec)
|
||||
↓
|
||||
Browser refresh (5-10 sec)
|
||||
↓
|
||||
See changes (35-70 sec total)
|
||||
```
|
||||
|
||||
### New (Development)
|
||||
```
|
||||
Edit TSX file
|
||||
↓
|
||||
Auto-rebuild on save (2-3 sec)
|
||||
↓
|
||||
Browser auto-reload (HMR) (1-2 sec)
|
||||
↓
|
||||
See changes (3-5 sec total)
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## Implementation Steps
|
||||
|
||||
### Phase 1: Create Dev Dockerfile
|
||||
- [ ] Create `Dockerfile.webui.dev`
|
||||
- [ ] Set `npm run dev` as entrypoint
|
||||
|
||||
### Phase 2: Update Docker Compose
|
||||
- [ ] Add frontend volume mount
|
||||
- [ ] Add dockerfile selection logic
|
||||
- [ ] Add WEBUI_BUILD_MODE to .env
|
||||
|
||||
### Phase 3: Verify Package.json
|
||||
- [ ] Confirm `vite --host 0.0.0.0` in dev script
|
||||
- [ ] Confirm dependencies include vite, react, typescript
|
||||
|
||||
### Phase 4: Testing
|
||||
- [ ] Build and run: `docker compose up -d --build stemengine-webui`
|
||||
- [ ] Verify container started: `docker logs stemengine-webui`
|
||||
- [ ] Access http://localhost:5173 in browser
|
||||
- [ ] Edit a `.tsx` file and save
|
||||
- [ ] Verify instant HMR/auto-reload (no browser refresh needed)
|
||||
|
||||
---
|
||||
|
||||
## Fallback: Keep Both Modes
|
||||
|
||||
Users can keep **both** Dockerfiles:
|
||||
- `Dockerfile.webui` → Production (static dist)
|
||||
- `Dockerfile.webui.dev` → Development (Vite dev server)
|
||||
|
||||
Set `WEBUI_BUILD_MODE` in `.env`:
|
||||
```env
|
||||
# Uncomment one:
|
||||
# WEBUI_BUILD_MODE=dev # Development (instant HMR)
|
||||
WEBUI_BUILD_MODE=prod # Production (built dist)
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## Compatibility Notes
|
||||
|
||||
### WSL2 + Docker
|
||||
- Vite polling configured via `npm run dev` (auto-detects)
|
||||
- No special setup needed—just works
|
||||
|
||||
### Hot Module Reload Limitations
|
||||
- CSS changes: Instant (no page reload)
|
||||
- Component logic changes: Page auto-reload (preserves state where possible)
|
||||
- Import changes: Full reload (module graph changes)
|
||||
|
||||
### CORS & API Calls
|
||||
- Backend on port 8000
|
||||
- WebUI dev server on port 5173
|
||||
- CORS env vars already configured in stemengine.yml (covers localhost:5173)
|
||||
|
||||
---
|
||||
|
||||
## Rollback Plan
|
||||
If Vite dev server causes issues:
|
||||
1. Comment out `WEBUI_BUILD_MODE` in `.env`
|
||||
2. Docker compose defaults to `Dockerfile.webui` (production)
|
||||
3. Rebuild: `docker compose up -d --build stemengine-webui`
|
||||
4. Back to static serving with rebuild required
|
||||
@@ -0,0 +1,53 @@
|
||||
# WebUI Live Reload — Quick Start
|
||||
|
||||
**TL;DR**: Changes to frontend code now appear instantly in the browser. No rebuilds needed.
|
||||
|
||||
---
|
||||
|
||||
## Start Development Server
|
||||
|
||||
```bash
|
||||
cd /home/translator/docker
|
||||
docker compose up -d --build stemengine-webui
|
||||
```
|
||||
|
||||
Then:
|
||||
- Open browser to **http://localhost:5173**
|
||||
- Edit any `.tsx` or `.ts` file in `frontend/src/`
|
||||
- Save and watch the browser update **within 2-3 seconds**
|
||||
|
||||
---
|
||||
|
||||
## What's Different
|
||||
|
||||
| Before | After |
|
||||
|--------|-------|
|
||||
| Edit code | Edit code |
|
||||
| Run `docker compose up -d --build stemengine-webui` | Save file |
|
||||
| Wait 30-60 seconds | Browser auto-reloads (2-3 sec) |
|
||||
| Hard refresh browser | See changes |
|
||||
| See changes | |
|
||||
|
||||
---
|
||||
|
||||
## If Something Breaks
|
||||
|
||||
Switch back to production build:
|
||||
```bash
|
||||
# Edit .env
|
||||
# Change: WEBUI_DOCKERFILE=Dockerfile.webui.dev
|
||||
# To: WEBUI_DOCKERFILE=Dockerfile.webui
|
||||
|
||||
docker compose up -d --build stemengine-webui
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## Files Changed
|
||||
|
||||
- ✅ `frontend/Dockerfile.webui.dev` — Dev-mode image
|
||||
- ✅ `frontend/package.json` — Added `--host 0.0.0.0` to dev script
|
||||
- ✅ `stemengine.yml` — Added volume mount, switched to dev Dockerfile
|
||||
- ✅ `.env` — Set `WEBUI_DOCKERFILE=Dockerfile.webui.dev` (default)
|
||||
|
||||
See [20260317_WebUI_Live_Reload_Implementation.md](20260317_WebUI_Live_Reload_Implementation.md) for full details.
|
||||
@@ -49,6 +49,9 @@ huggingface-hub[cli]>=0.24
|
||||
requests>=2.31.0
|
||||
cryptography>=42.0
|
||||
|
||||
# yt-dlp import integration
|
||||
yt-dlp>=2026.01.01
|
||||
|
||||
# MIDI transcription via basic-pitch
|
||||
# Installed separately in Dockerfile with --no-deps to avoid TF/numpy conflict.
|
||||
# Runtime inference uses onnxruntime (above) instead of TensorFlow.
|
||||
|
||||
@@ -6,6 +6,7 @@ from pydantic import BaseModel
|
||||
|
||||
from ..config import SUBSONIC_CONFIG_PATH
|
||||
from ..services import subsonic_service
|
||||
from .. import job_manager as jm
|
||||
|
||||
router = APIRouter(prefix="/api/subsonic", tags=["subsonic"])
|
||||
|
||||
@@ -61,12 +62,28 @@ def remove_config():
|
||||
# ---------------------------------------------------------------------------
|
||||
|
||||
@router.get("/search")
|
||||
def search(q: str = "", count: int = 20):
|
||||
def search(
|
||||
q: str = "",
|
||||
count: int = 20,
|
||||
offset: int = 0,
|
||||
title: str = "",
|
||||
artist: str = "",
|
||||
album: str = "",
|
||||
album_artist: str = "",
|
||||
):
|
||||
"""Search songs on the configured Subsonic server."""
|
||||
if not q.strip():
|
||||
if not any([q.strip(), title.strip(), artist.strip(), album.strip(), album_artist.strip()]):
|
||||
return []
|
||||
try:
|
||||
return subsonic_service.search_songs(q.strip(), count)
|
||||
return subsonic_service.search_songs(
|
||||
query=q.strip(),
|
||||
count=count,
|
||||
offset=offset,
|
||||
title=title.strip(),
|
||||
artist=artist.strip(),
|
||||
album=album.strip(),
|
||||
album_artist=album_artist.strip(),
|
||||
)
|
||||
except RuntimeError as exc:
|
||||
raise HTTPException(status_code=400, detail=str(exc))
|
||||
except Exception as exc:
|
||||
@@ -77,6 +94,8 @@ class ImportRequest(BaseModel):
|
||||
id: str
|
||||
title: str
|
||||
artist: str = ""
|
||||
album_artist: str = ""
|
||||
album: str = ""
|
||||
suffix: str = "mp3"
|
||||
|
||||
|
||||
@@ -84,13 +103,35 @@ class ImportRequest(BaseModel):
|
||||
def import_song(req: ImportRequest):
|
||||
"""Download a Subsonic song to the local imports directory."""
|
||||
try:
|
||||
return subsonic_service.import_song(req.id, req.title, req.artist, req.suffix)
|
||||
return subsonic_service.import_song(
|
||||
req.id,
|
||||
req.title,
|
||||
req.artist,
|
||||
req.suffix,
|
||||
album_artist=req.album_artist,
|
||||
album=req.album,
|
||||
)
|
||||
except RuntimeError as exc:
|
||||
raise HTTPException(status_code=400, detail=str(exc))
|
||||
except Exception as exc:
|
||||
raise HTTPException(status_code=502, detail=f"Import failed: {exc}")
|
||||
|
||||
|
||||
class YtDlImportRequest(BaseModel):
|
||||
url: str
|
||||
title: str = ""
|
||||
artist: str = ""
|
||||
|
||||
|
||||
@router.post("/import-ytdl")
|
||||
def import_ytdl(req: YtDlImportRequest):
|
||||
"""Enqueue a yt-dlp download as a background job; returns the job_id immediately."""
|
||||
job_id = jm.create_job("ytdl-import")
|
||||
jm.update_job(job_id, progress="Queued…")
|
||||
jm.submit(subsonic_service.run_ytdl_import, job_id, req.url, req.title, req.artist)
|
||||
return {"job_id": job_id}
|
||||
|
||||
|
||||
@router.get("/imports")
|
||||
def list_imports():
|
||||
"""List all locally imported audio files."""
|
||||
@@ -108,4 +149,7 @@ def delete_import(filename: str):
|
||||
if not target.exists():
|
||||
raise HTTPException(status_code=404, detail="File not found")
|
||||
target.unlink()
|
||||
sidecar = target.with_suffix(target.suffix + '.json')
|
||||
if sidecar.exists():
|
||||
sidecar.unlink()
|
||||
return {"detail": f"Deleted {filename}"}
|
||||
@@ -88,6 +88,59 @@ class _LyricsSyncNoExtract:
|
||||
|
||||
_SECTION_MARKER_RE = re.compile(r'^\[(?!\d{1,2}:\d{2})[^\]]*\]\s*$')
|
||||
|
||||
_SENTENCE_PUNCT = frozenset('.!?,;')
|
||||
|
||||
|
||||
def _starts_with_sentence_capital(token: str) -> bool:
|
||||
cleaned = (token or "").lstrip("\"'([{“‘")
|
||||
for ch in cleaned:
|
||||
if ch.isalpha():
|
||||
return ch.isupper()
|
||||
return False
|
||||
|
||||
|
||||
def _is_midline_pronoun_i(token: str) -> bool:
|
||||
cleaned = (token or "").strip("\"'()[]{}.,!?;:”“’‘")
|
||||
return cleaned == "I"
|
||||
|
||||
|
||||
def _segment_plain_lyrics_line(line: str, max_words: int = 10, min_sentence_words: int = 3) -> List[str]:
|
||||
"""Split a single plain lyric line by sentence cues, with fallback chunking."""
|
||||
words = [w for w in line.split() if w]
|
||||
if not words:
|
||||
return []
|
||||
|
||||
chunks: List[List[str]] = []
|
||||
chunk: List[str] = []
|
||||
prev = ""
|
||||
|
||||
for w in words:
|
||||
if (
|
||||
chunk
|
||||
and _starts_with_sentence_capital(w)
|
||||
and not _is_midline_pronoun_i(w)
|
||||
and len(chunk) >= min_sentence_words
|
||||
):
|
||||
chunks.append(chunk)
|
||||
chunk = []
|
||||
|
||||
chunk.append(w)
|
||||
|
||||
at_punct = bool(w) and w[-1] in _SENTENCE_PUNCT
|
||||
prev_at_punct = bool(prev) and prev[-1] in _SENTENCE_PUNCT
|
||||
at_limit = len(chunk) >= max_words
|
||||
|
||||
if (at_punct and len(chunk) >= min_sentence_words) or prev_at_punct or at_limit:
|
||||
chunks.append(chunk)
|
||||
chunk = []
|
||||
|
||||
prev = w
|
||||
|
||||
if chunk:
|
||||
chunks.append(chunk)
|
||||
|
||||
return [" ".join(c).strip() for c in chunks if c]
|
||||
|
||||
def clean_lyrics_text(text: str) -> str:
|
||||
"""Remove section markers (e.g. [Chorus], [Verse 1]) and blank lines from plain lyrics."""
|
||||
cleaned = []
|
||||
@@ -98,7 +151,15 @@ def clean_lyrics_text(text: str) -> str:
|
||||
if _SECTION_MARKER_RE.match(stripped):
|
||||
continue
|
||||
cleaned.append(stripped)
|
||||
return '\n'.join(cleaned)
|
||||
|
||||
# Sentence-oriented line normalization:
|
||||
# - primary: punctuation and uppercase sentence starts
|
||||
# - fallback: fixed-size chunks for lowercase/unpunctuated lyrics
|
||||
segmented: List[str] = []
|
||||
for line in cleaned:
|
||||
segmented.extend(_segment_plain_lyrics_line(line, max_words=10, min_sentence_words=3))
|
||||
|
||||
return '\n'.join(segmented)
|
||||
|
||||
|
||||
_LRC_SECTION_LINE_RE = re.compile(
|
||||
|
||||
@@ -162,6 +162,7 @@ WHISPER_MODELS = {
|
||||
}
|
||||
|
||||
DEFAULT_WHISPER_MODEL = "large-v2"
|
||||
DEFAULT_SPEAKER_ID = "SPEAKER_00"
|
||||
|
||||
|
||||
PARAKEET_MODELS = {
|
||||
@@ -288,13 +289,13 @@ def _result_from_parakeet_payload(payload: dict, model_id: str, language_hint: O
|
||||
start=seg_start,
|
||||
end=seg_end,
|
||||
words=words,
|
||||
speaker=seg.get("speaker"),
|
||||
speaker=seg.get("speaker") or DEFAULT_SPEAKER_ID,
|
||||
)
|
||||
)
|
||||
|
||||
if not segments:
|
||||
text = str(payload.get("text", "")).strip()
|
||||
segments = [Segment(text=text, start=0.0, end=0.0, words=[])]
|
||||
segments = [Segment(text=text, start=0.0, end=0.0, words=[], speaker=DEFAULT_SPEAKER_ID)]
|
||||
|
||||
duration = max((seg.end for seg in segments), default=0.0)
|
||||
language = str(payload.get("language") or language_hint or "unknown")
|
||||
@@ -594,7 +595,8 @@ def transcribe_lyrics(
|
||||
text=seg["text"].strip(),
|
||||
start=seg["start"],
|
||||
end=seg["end"],
|
||||
words=words
|
||||
words=words,
|
||||
speaker=seg.get("speaker") or DEFAULT_SPEAKER_ID,
|
||||
))
|
||||
|
||||
# Calculate total duration
|
||||
@@ -783,6 +785,88 @@ def _ortho_split(word_text: str, n: int) -> List[str]:
|
||||
_PUNCT_BREAK = frozenset('.!?,;')
|
||||
|
||||
|
||||
def _starts_with_sentence_capital(token: str) -> bool:
|
||||
"""Return True when token looks like a sentence start (leading uppercase)."""
|
||||
cleaned = (token or "").lstrip("\"'([{“‘")
|
||||
for ch in cleaned:
|
||||
if ch.isalpha():
|
||||
return ch.isupper()
|
||||
return False
|
||||
|
||||
|
||||
def _is_midline_pronoun_i(token: str) -> bool:
|
||||
"""True for standalone pronoun 'I' (with optional surrounding punctuation)."""
|
||||
cleaned = (token or "").strip("\"'()[]{}.,!?;:”“’‘")
|
||||
return cleaned == "I"
|
||||
|
||||
|
||||
def _chunk_words_sentence_aware(words: list, max_words: int = 10, min_sentence_words: int = 3) -> list[list]:
|
||||
"""Chunk words using punctuation/capital cues with max-word fallback."""
|
||||
if max_words <= 0:
|
||||
return [words] if words else []
|
||||
|
||||
chunks: list[list] = []
|
||||
chunk: list = []
|
||||
prev_text = ""
|
||||
|
||||
for w in words:
|
||||
text = (w.get("word", "") or "").rstrip()
|
||||
|
||||
# Sentence-start split: if current token starts with uppercase, start a
|
||||
# new line before it once the current chunk is already meaningful.
|
||||
if (
|
||||
chunk
|
||||
and _starts_with_sentence_capital(text)
|
||||
and not _is_midline_pronoun_i(text)
|
||||
and len(chunk) >= min_sentence_words
|
||||
):
|
||||
chunks.append(chunk)
|
||||
chunk = []
|
||||
|
||||
chunk.append(w)
|
||||
|
||||
at_punct = bool(text) and text[-1] in _PUNCT_BREAK
|
||||
prev_at_punct = bool(prev_text) and prev_text[-1] in _PUNCT_BREAK
|
||||
at_limit = len(chunk) >= max_words
|
||||
|
||||
# Primary boundary: punctuation. Secondary boundary: hard limit fallback.
|
||||
# `prev_at_punct` helps when punctuation is tokenized separately.
|
||||
if (at_punct and len(chunk) >= min_sentence_words) or prev_at_punct or at_limit:
|
||||
chunks.append(chunk)
|
||||
chunk = []
|
||||
|
||||
prev_text = text
|
||||
|
||||
if chunk:
|
||||
chunks.append(chunk)
|
||||
|
||||
return chunks
|
||||
|
||||
|
||||
def _segment_plain_lyrics_lines(lyrics_text: str, max_words: int = 10) -> list[str]:
|
||||
"""Split plain lyrics into sentence-like lines with lowercase fallback."""
|
||||
src_lines = [ln.strip() for ln in lyrics_text.splitlines() if ln.strip()]
|
||||
out: list[str] = []
|
||||
|
||||
for line in src_lines:
|
||||
words = line.split()
|
||||
if not words:
|
||||
continue
|
||||
|
||||
# Use the same sentence-aware chunking as transcription post-processing.
|
||||
chunks = _chunk_words_sentence_aware(
|
||||
[{"word": w} for w in words],
|
||||
max_words=max_words,
|
||||
min_sentence_words=3,
|
||||
)
|
||||
for ch in chunks:
|
||||
txt = " ".join((w.get("word", "") or "").strip() for w in ch).strip()
|
||||
if txt:
|
||||
out.append(txt)
|
||||
|
||||
return out
|
||||
|
||||
|
||||
def _split_long_segments(segments: list, max_words: int = 10) -> list:
|
||||
"""
|
||||
Split over-long WhisperX segments into shorter lines suitable for LRC display.
|
||||
@@ -805,23 +889,20 @@ def _split_long_segments(segments: list, max_words: int = 10) -> list:
|
||||
result = []
|
||||
for seg in segments:
|
||||
words = seg.get("words") or []
|
||||
if len(words) <= max_words:
|
||||
if len(words) <= 1:
|
||||
result.append(seg)
|
||||
continue
|
||||
|
||||
# Build sub-segment slices
|
||||
chunks: list[list] = []
|
||||
chunk: list = []
|
||||
for w in words:
|
||||
chunk.append(w)
|
||||
text = w.get("word", "").rstrip()
|
||||
at_punct = bool(text) and text[-1] in _PUNCT_BREAK
|
||||
at_limit = len(chunk) >= max_words
|
||||
if (at_punct and len(chunk) >= 3) or at_limit:
|
||||
chunks.append(chunk)
|
||||
chunk = []
|
||||
if chunk:
|
||||
chunks.append(chunk)
|
||||
# Sentence-aware chunking:
|
||||
# 1) punctuation boundaries
|
||||
# 2) uppercase sentence starts
|
||||
# 3) max-words fallback for lowercase/unpunctuated lyrics
|
||||
chunks = _chunk_words_sentence_aware(words, max_words=max_words, min_sentence_words=3)
|
||||
|
||||
# If no effective split happened, keep original segment.
|
||||
if len(chunks) <= 1:
|
||||
result.append(seg)
|
||||
continue
|
||||
|
||||
for ch in chunks:
|
||||
first, last = ch[0], ch[-1]
|
||||
@@ -1501,7 +1582,7 @@ def _lyrics_to_whisperx_segments(lyrics_text: str, audio_duration: float) -> lis
|
||||
segments.append({"text": text, "start": ts, "end": end, "words": []})
|
||||
return segments
|
||||
else:
|
||||
plain_lines = [ln.strip() for ln in lyrics_text.splitlines() if ln.strip()]
|
||||
plain_lines = _segment_plain_lyrics_lines(lyrics_text, max_words=10)
|
||||
if not plain_lines:
|
||||
return []
|
||||
step = audio_duration / len(plain_lines)
|
||||
@@ -1959,7 +2040,7 @@ def run_lyric_transcription(
|
||||
start=float(seg["start"]),
|
||||
end=float(seg["end"]),
|
||||
words=words,
|
||||
speaker=seg.get("speaker"),
|
||||
speaker=seg.get("speaker") or DEFAULT_SPEAKER_ID,
|
||||
))
|
||||
|
||||
result = LyricTranscriptionResult(
|
||||
|
||||
@@ -19,6 +19,7 @@ import hashlib
|
||||
import json
|
||||
import os
|
||||
import secrets
|
||||
from datetime import datetime, timezone
|
||||
from pathlib import Path
|
||||
from typing import Optional
|
||||
|
||||
@@ -28,6 +29,7 @@ from cryptography.fernet import Fernet, InvalidToken
|
||||
from ..config import SUBSONIC_CONFIG_PATH, IMPORTS_DIR
|
||||
|
||||
_AUDIO_EXTS = {'.mp3', '.flac', '.wav', '.m4a', '.ogg', '.opus', '.aac'}
|
||||
_VIDEO_EXTS = {'.mp4', '.mkv', '.webm', '.mov', '.m4v'}
|
||||
_CLIENT_ID = 'StemEngine'
|
||||
_API_VERSION = '1.16.1'
|
||||
|
||||
@@ -195,14 +197,74 @@ def test_connection(config: dict) -> bool:
|
||||
return False
|
||||
|
||||
|
||||
def search_songs(query: str, count: int = 20) -> list[dict]:
|
||||
"""Search for songs by keyword. Returns a list of song dicts."""
|
||||
def _contains(haystack: str, needle: str) -> bool:
|
||||
return needle.strip().lower() in (haystack or '').lower()
|
||||
|
||||
|
||||
def _safe_filename(value: str) -> str:
|
||||
return "".join(c for c in value if c.isalnum() or c in ' -_().[]').strip()
|
||||
|
||||
|
||||
def _sidecar_path(media_path: Path) -> Path:
|
||||
return media_path.with_suffix(media_path.suffix + '.json')
|
||||
|
||||
|
||||
def _write_import_metadata(media_path: Path, payload: dict) -> None:
|
||||
data = {
|
||||
**payload,
|
||||
'filename': media_path.name,
|
||||
'path': str(media_path),
|
||||
'updated_at': datetime.now(timezone.utc).isoformat(),
|
||||
}
|
||||
_sidecar_path(media_path).write_text(json.dumps(data, indent=2), encoding='utf-8')
|
||||
|
||||
|
||||
def _read_import_metadata(media_path: Path) -> dict:
|
||||
sidecar = _sidecar_path(media_path)
|
||||
if not sidecar.exists():
|
||||
return {}
|
||||
try:
|
||||
raw = json.loads(sidecar.read_text(encoding='utf-8'))
|
||||
return raw if isinstance(raw, dict) else {}
|
||||
except Exception:
|
||||
return {}
|
||||
|
||||
|
||||
def search_songs(
|
||||
query: str = '',
|
||||
count: int = 20,
|
||||
offset: int = 0,
|
||||
*,
|
||||
title: str = '',
|
||||
artist: str = '',
|
||||
album: str = '',
|
||||
album_artist: str = '',
|
||||
) -> list[dict]:
|
||||
"""Search songs with optional structured filters.
|
||||
|
||||
The returned `artist` field prefers Subsonic `albumArtist` over `artist`.
|
||||
"""
|
||||
config = load_config()
|
||||
if not config:
|
||||
raise RuntimeError("Subsonic server not configured")
|
||||
|
||||
effective_query = query.strip() or " ".join(
|
||||
x for x in [title.strip(), artist.strip(), album.strip(), album_artist.strip()] if x
|
||||
)
|
||||
if not effective_query:
|
||||
return []
|
||||
|
||||
p = _params(config)
|
||||
p.update({'query': query, 'songCount': count, 'artistCount': 0, 'albumCount': 0})
|
||||
# Over-fetch and post-filter so advanced fields (title/album/albumArtist)
|
||||
# behave predictably across Subsonic-compatible servers.
|
||||
fetch_count = min(max(int(count or 20) * 3, int(count or 20), 20), 250)
|
||||
p.update({
|
||||
'query': effective_query,
|
||||
'songCount': fetch_count,
|
||||
'songOffset': max(0, int(offset or 0)),
|
||||
'artistCount': 0,
|
||||
'albumCount': 0,
|
||||
})
|
||||
|
||||
r = _requests.get(_url(config, 'search3.view'), params=p, timeout=15)
|
||||
r.raise_for_status()
|
||||
@@ -212,38 +274,63 @@ def search_songs(query: str, count: int = 20) -> list[dict]:
|
||||
msg = resp.get('error', {}).get('message', 'Subsonic API error')
|
||||
raise RuntimeError(msg)
|
||||
|
||||
return [
|
||||
{
|
||||
songs = []
|
||||
for s in resp.get('searchResult3', {}).get('song', []):
|
||||
song_title = s.get('title', 'Unknown')
|
||||
song_artist = s.get('artist', '')
|
||||
song_album_artist = s.get('albumArtist', '')
|
||||
song_album = s.get('album', '')
|
||||
|
||||
if title and not _contains(song_title, title):
|
||||
continue
|
||||
if artist and not _contains(song_artist, artist) and not _contains(song_album_artist, artist):
|
||||
continue
|
||||
if album and not _contains(song_album, album):
|
||||
continue
|
||||
if album_artist and not _contains(song_album_artist, album_artist):
|
||||
continue
|
||||
|
||||
display_artist = song_album_artist or song_artist
|
||||
songs.append({
|
||||
'id': s.get('id', ''),
|
||||
'title': s.get('title', 'Unknown'),
|
||||
'artist': s.get('artist', ''),
|
||||
'album': s.get('album', ''),
|
||||
'title': song_title,
|
||||
'artist': display_artist,
|
||||
'songArtist': song_artist,
|
||||
'albumArtist': song_album_artist,
|
||||
'album': song_album,
|
||||
'duration': s.get('duration', 0),
|
||||
'suffix': s.get('suffix', 'mp3'),
|
||||
'size': s.get('size', 0),
|
||||
'bitRate': s.get('bitRate', 0),
|
||||
}
|
||||
for s in resp.get('searchResult3', {}).get('song', [])
|
||||
]
|
||||
})
|
||||
|
||||
return songs[: max(1, int(count or 20))]
|
||||
|
||||
|
||||
def import_song(song_id: str, title: str, artist: str = '', suffix: str = 'mp3') -> dict:
|
||||
def import_song(
|
||||
song_id: str,
|
||||
title: str,
|
||||
artist: str = '',
|
||||
suffix: str = 'mp3',
|
||||
*,
|
||||
album_artist: str = '',
|
||||
album: str = '',
|
||||
) -> dict:
|
||||
"""Download a Subsonic song to IMPORTS_DIR."""
|
||||
config = load_config()
|
||||
if not config:
|
||||
raise RuntimeError("Subsonic server not configured")
|
||||
|
||||
def _safe(s: str) -> str:
|
||||
return "".join(c for c in s if c.isalnum() or c in ' -_().').strip()
|
||||
|
||||
safe_title = _safe(title) or 'Unknown'
|
||||
safe_artist = _safe(artist)
|
||||
safe_title = _safe_filename(title) or 'Unknown'
|
||||
effective_artist = (album_artist or artist or '').strip()
|
||||
safe_artist = _safe_filename(effective_artist)
|
||||
base_name = f"{safe_artist} - {safe_title}" if safe_artist else safe_title
|
||||
dest = IMPORTS_DIR / f"{base_name}.{suffix}"
|
||||
clean_suffix = "".join(c for c in (suffix or 'mp3').lower() if c.isalnum()) or 'mp3'
|
||||
dest = IMPORTS_DIR / f"{base_name}.{clean_suffix}"
|
||||
|
||||
counter = 1
|
||||
while dest.exists():
|
||||
dest = IMPORTS_DIR / f"{base_name} ({counter}).{suffix}"
|
||||
dest = IMPORTS_DIR / f"{base_name} ({counter}).{clean_suffix}"
|
||||
counter += 1
|
||||
|
||||
p = _params(config)
|
||||
@@ -257,25 +344,169 @@ def import_song(song_id: str, title: str, artist: str = '', suffix: str = 'mp3')
|
||||
if chunk:
|
||||
f.write(chunk)
|
||||
|
||||
_write_import_metadata(dest, {
|
||||
'source': 'subsonic',
|
||||
'id': song_id,
|
||||
'title': title,
|
||||
'artist': effective_artist,
|
||||
'song_artist': artist,
|
||||
'album_artist': album_artist,
|
||||
'album': album,
|
||||
'suffix': clean_suffix,
|
||||
})
|
||||
|
||||
return {
|
||||
'filename': dest.name,
|
||||
'path': str(dest),
|
||||
'size': dest.stat().st_size,
|
||||
'title': title,
|
||||
'artist': artist,
|
||||
'artist': effective_artist,
|
||||
'song_artist': artist,
|
||||
'album_artist': album_artist,
|
||||
'album': album,
|
||||
'source': 'subsonic',
|
||||
}
|
||||
|
||||
|
||||
def run_ytdl_import(job_id: str, url: str, title: str = '', artist: str = '') -> None:
|
||||
"""Background worker — runs inside _general_executor, updates job state."""
|
||||
from .. import job_manager as jm
|
||||
try:
|
||||
jm.update_job(job_id, status=jm.JobStatus.RUNNING, progress='Starting download…')
|
||||
result = import_ytdl(url, title, artist, _progress_cb=lambda msg: jm.update_job(job_id, progress=msg))
|
||||
jm.update_job(
|
||||
job_id,
|
||||
status=jm.JobStatus.DONE,
|
||||
progress='Download complete.',
|
||||
result={
|
||||
'filename': result['filename'],
|
||||
'title': result['title'],
|
||||
'artist': result['artist'],
|
||||
'is_video': result['is_video'],
|
||||
'source': 'yt-dlp',
|
||||
},
|
||||
)
|
||||
except Exception as exc:
|
||||
jm.update_job(job_id, status=jm.JobStatus.ERROR, error=str(exc), progress='Download failed.')
|
||||
|
||||
|
||||
def import_ytdl(url: str, title: str = '', artist: str = '', _progress_cb=None) -> dict:
|
||||
"""Download a YouTube/media URL via yt-dlp into IMPORTS_DIR."""
|
||||
if not (url or '').strip().startswith(('http://', 'https://')):
|
||||
raise RuntimeError('A valid http(s) URL is required')
|
||||
|
||||
try:
|
||||
from yt_dlp import YoutubeDL
|
||||
except Exception as exc:
|
||||
raise RuntimeError('yt-dlp is not installed on the backend runtime') from exc
|
||||
|
||||
def _ydl_progress_hook(d: dict) -> None:
|
||||
if _progress_cb is None:
|
||||
return
|
||||
status = d.get('status', '')
|
||||
if status == 'downloading':
|
||||
pct = d.get('_percent_str', '').strip()
|
||||
speed = d.get('_speed_str', '').strip()
|
||||
eta = d.get('_eta_str', '').strip()
|
||||
parts = [f'Downloading… {pct}']
|
||||
if speed:
|
||||
parts.append(speed)
|
||||
if eta:
|
||||
parts.append(f'ETA {eta}')
|
||||
_progress_cb(' · '.join(parts))
|
||||
elif status == 'finished':
|
||||
_progress_cb('Download finished, processing…')
|
||||
|
||||
outtmpl = str(IMPORTS_DIR / '%(title).160B [%(id)s].%(ext)s')
|
||||
ydl_opts = {
|
||||
'outtmpl': outtmpl,
|
||||
'noplaylist': True,
|
||||
'format': 'bestvideo+bestaudio/best',
|
||||
'merge_output_format': 'mp4',
|
||||
'quiet': True,
|
||||
'no_warnings': True,
|
||||
'restrictfilenames': False,
|
||||
'progress_hooks': [_ydl_progress_hook],
|
||||
}
|
||||
|
||||
try:
|
||||
with YoutubeDL(ydl_opts) as ydl:
|
||||
info = ydl.extract_info(url.strip(), download=True)
|
||||
prepared = Path(ydl.prepare_filename(info))
|
||||
except Exception as exc:
|
||||
raise RuntimeError(f'yt-dlp download failed: {exc}') from exc
|
||||
|
||||
downloaded = prepared
|
||||
if not downloaded.exists():
|
||||
merged_mp4 = prepared.with_suffix('.mp4')
|
||||
if merged_mp4.exists():
|
||||
downloaded = merged_mp4
|
||||
if not downloaded.exists():
|
||||
raise RuntimeError('yt-dlp completed but output file was not found')
|
||||
|
||||
info_title = str(info.get('title') or '').strip()
|
||||
info_uploader = str(info.get('uploader') or info.get('channel') or '').strip()
|
||||
info_id = str(info.get('id') or '').strip()
|
||||
info_album = str(info.get('album') or '').strip()
|
||||
|
||||
effective_title = (title or info_title or downloaded.stem).strip()
|
||||
effective_artist = (artist or info_uploader).strip()
|
||||
safe_title = _safe_filename(effective_title) or 'YouTube Import'
|
||||
safe_artist = _safe_filename(effective_artist)
|
||||
safe_id = _safe_filename(info_id)
|
||||
base = f'{safe_artist} - {safe_title}' if safe_artist else safe_title
|
||||
if safe_id:
|
||||
base = f'{base} [{safe_id}]'
|
||||
ext = downloaded.suffix or '.mp4'
|
||||
dest = IMPORTS_DIR / f'{base}{ext}'
|
||||
n = 1
|
||||
while dest.exists() and dest.resolve() != downloaded.resolve():
|
||||
dest = IMPORTS_DIR / f'{base} ({n}){ext}'
|
||||
n += 1
|
||||
|
||||
if downloaded.resolve() != dest.resolve():
|
||||
downloaded.rename(dest)
|
||||
|
||||
_write_import_metadata(dest, {
|
||||
'source': 'yt-dlp',
|
||||
'url': url.strip(),
|
||||
'id': info_id,
|
||||
'title': effective_title,
|
||||
'artist': effective_artist,
|
||||
'uploader': info_uploader,
|
||||
'album': info_album,
|
||||
'duration': int(info.get('duration') or 0),
|
||||
'webpage_url': str(info.get('webpage_url') or url).strip(),
|
||||
'thumbnail': str(info.get('thumbnail') or '').strip(),
|
||||
})
|
||||
|
||||
return {
|
||||
'filename': dest.name,
|
||||
'path': str(dest),
|
||||
'size': dest.stat().st_size,
|
||||
'title': effective_title,
|
||||
'artist': effective_artist,
|
||||
'album': info_album,
|
||||
'duration': int(info.get('duration') or 0),
|
||||
'source': 'yt-dlp',
|
||||
'is_video': dest.suffix.lower() in _VIDEO_EXTS,
|
||||
}
|
||||
|
||||
|
||||
def list_imports() -> list[dict]:
|
||||
"""Return metadata for all audio files in IMPORTS_DIR, newest first."""
|
||||
"""Return metadata for imported media files, newest first."""
|
||||
if not IMPORTS_DIR.exists():
|
||||
return []
|
||||
results = []
|
||||
for f in sorted(IMPORTS_DIR.iterdir(), key=lambda x: x.stat().st_mtime, reverse=True):
|
||||
if f.is_file() and f.suffix.lower() in _AUDIO_EXTS:
|
||||
ext = f.suffix.lower()
|
||||
if f.is_file() and ext in (_AUDIO_EXTS | _VIDEO_EXTS):
|
||||
meta = _read_import_metadata(f)
|
||||
results.append({
|
||||
'filename': f.name,
|
||||
'path': str(f),
|
||||
'size': f.stat().st_size,
|
||||
'is_video': ext in _VIDEO_EXTS,
|
||||
**meta,
|
||||
})
|
||||
return results
|
||||
@@ -0,0 +1,19 @@
|
||||
# Separate StemEngine WebUI container — Development Mode
|
||||
# Runs Vite dev server with hot module reload (HMR).
|
||||
# Source code is bind-mounted from host, so changes appear instantly.
|
||||
|
||||
FROM node:20-alpine
|
||||
WORKDIR /app/frontend
|
||||
|
||||
# Install dependencies once (layer cached)
|
||||
COPY package*.json ./
|
||||
RUN npm ci
|
||||
|
||||
# Frontend source is bind-mounted from host:
|
||||
# ${SEFOLDER}/frontend:/app/frontend (see docker-compose)
|
||||
# This enables live edits without Docker rebuild.
|
||||
|
||||
EXPOSE 5173
|
||||
|
||||
# Vite dev server on all interfaces (0.0.0.0) for Docker port mapping
|
||||
CMD ["npm", "run", "dev"]
|
||||
@@ -4,7 +4,7 @@
|
||||
"version": "1.0.0",
|
||||
"type": "module",
|
||||
"scripts": {
|
||||
"dev": "vite",
|
||||
"dev": "vite --host 0.0.0.0",
|
||||
"build": "vite build",
|
||||
"build:local": "vite build --outDir dist-local",
|
||||
"preview": "vite preview",
|
||||
|
||||
@@ -151,6 +151,9 @@ export const cancelJob = (id: string) =>
|
||||
export const downloadUrl = (jobId: string, filename: string) =>
|
||||
resolveApiUrl(`${BASE}/jobs/${jobId}/download/${encodeURIComponent(filename)}`)
|
||||
|
||||
export const projectCoverArtUrl = (projectId: string) =>
|
||||
resolveApiUrl(`${BASE}/projects/${encodeURIComponent(projectId)}/cover-art`)
|
||||
|
||||
// ---------- Separate ----------
|
||||
|
||||
export const getSepModels = () =>
|
||||
@@ -358,14 +361,47 @@ export const saveSubsonicConfig = (url: string, username: string, password: stri
|
||||
export const deleteSubsonicConfig = () =>
|
||||
request<SubsonicConfig>(`${BASE}/subsonic/config`, { method: 'DELETE' })
|
||||
|
||||
export const searchSubsonic = (q: string, count = 20) =>
|
||||
request<SubsonicSong[]>(`${BASE}/subsonic/search?q=${encodeURIComponent(q)}&count=${count}`)
|
||||
export const searchSubsonic = (
|
||||
params: {
|
||||
q?: string
|
||||
title?: string
|
||||
artist?: string
|
||||
album?: string
|
||||
albumArtist?: string
|
||||
count?: number
|
||||
offset?: number
|
||||
}
|
||||
) => {
|
||||
const qs = new URLSearchParams()
|
||||
if (params.q) qs.set('q', params.q)
|
||||
if (params.title) qs.set('title', params.title)
|
||||
if (params.artist) qs.set('artist', params.artist)
|
||||
if (params.album) qs.set('album', params.album)
|
||||
if (params.albumArtist) qs.set('album_artist', params.albumArtist)
|
||||
qs.set('count', String(params.count ?? 20))
|
||||
qs.set('offset', String(params.offset ?? 0))
|
||||
return request<SubsonicSong[]>(`${BASE}/subsonic/search?${qs.toString()}`)
|
||||
}
|
||||
|
||||
export const importSubsonicSong = (song: SubsonicSong) =>
|
||||
request<ImportedFile>(`${BASE}/subsonic/import`, {
|
||||
method: 'POST',
|
||||
headers: { 'Content-Type': 'application/json' },
|
||||
body: JSON.stringify({ id: song.id, title: song.title, artist: song.artist, suffix: song.suffix }),
|
||||
body: JSON.stringify({
|
||||
id: song.id,
|
||||
title: song.title,
|
||||
artist: song.songArtist ?? song.artist,
|
||||
album_artist: song.albumArtist ?? song.artist,
|
||||
album: song.album,
|
||||
suffix: song.suffix,
|
||||
}),
|
||||
})
|
||||
|
||||
export const importYtDl = (url: string, title = '', artist = '') =>
|
||||
request<{ job_id: string }>(`${BASE}/subsonic/import-ytdl`, {
|
||||
method: 'POST',
|
||||
headers: { 'Content-Type': 'application/json' },
|
||||
body: JSON.stringify({ url, title, artist }),
|
||||
})
|
||||
|
||||
export const listImports = () =>
|
||||
|
||||
File diff suppressed because it is too large.
Load diff
@@ -1,4 +1,4 @@
|
||||
import React, { useState, useRef, useMemo } from 'react'
|
||||
import React, { useState, useRef, useMemo, useEffect } from 'react'
|
||||
import { useQuery, useQueryClient } from '@tanstack/react-query'
|
||||
import {
|
||||
ChevronLeft, ChevronRight, Loader2, CheckCircle, XCircle,
|
||||
@@ -7,8 +7,8 @@ import {
|
||||
Download, CheckCircle2, Trash2, Zap,
|
||||
} from 'lucide-react'
|
||||
import {
|
||||
listJobs, cancelJob,
|
||||
searchSubsonic, importSubsonicSong,
|
||||
listJobs, cancelJob, getJob,
|
||||
searchSubsonic, importSubsonicSong, importYtDl,
|
||||
listImports, deleteImport,
|
||||
listProjects, deleteProject,
|
||||
} from '../api/client'
|
||||
@@ -174,6 +174,10 @@ function SubsonicPanel() {
|
||||
const queryClient = useQueryClient()
|
||||
const [open, setOpen] = useState(false)
|
||||
const [query, setQuery] = useState('')
|
||||
const [titleFilter, setTitleFilter] = useState('')
|
||||
const [artistFilter, setArtistFilter] = useState('')
|
||||
const [albumFilter, setAlbumFilter] = useState('')
|
||||
const [albumArtistFilter, setAlbumArtistFilter] = useState('')
|
||||
const [results, setResults] = useState<SubsonicSong[]>([])
|
||||
const [searching, setSearching] = useState(false)
|
||||
const [searchErr, setSearchErr] = useState<string | null>(null)
|
||||
@@ -192,10 +196,18 @@ function SubsonicPanel() {
|
||||
})
|
||||
|
||||
async function doSearch() {
|
||||
if (!query.trim()) return
|
||||
const hasAny = [query, titleFilter, artistFilter, albumFilter, albumArtistFilter].some(v => v.trim())
|
||||
if (!hasAny) return
|
||||
setSearching(true); setSearchErr(null); setResults([])
|
||||
try {
|
||||
const res = await searchSubsonic(query.trim())
|
||||
const res = await searchSubsonic({
|
||||
q: query.trim(),
|
||||
title: titleFilter.trim(),
|
||||
artist: artistFilter.trim(),
|
||||
album: albumFilter.trim(),
|
||||
albumArtist: albumArtistFilter.trim(),
|
||||
count: 40,
|
||||
})
|
||||
setResults(res)
|
||||
if (res.length === 0) setSearchErr('No results found.')
|
||||
} catch (e) {
|
||||
@@ -258,13 +270,44 @@ function SubsonicPanel() {
|
||||
/>
|
||||
<button
|
||||
onClick={doSearch}
|
||||
disabled={searching || !query.trim()}
|
||||
disabled={searching || ![query, titleFilter, artistFilter, albumFilter, albumArtistFilter].some(v => v.trim())}
|
||||
className="rounded-md bg-sky-500 hover:bg-sky-400 disabled:opacity-60 px-2.5 py-1.5 text-xs font-medium text-white transition-colors shrink-0"
|
||||
>
|
||||
{searching ? <Loader2 className="w-3 h-3 animate-spin" /> : <Search className="w-3 h-3" />}
|
||||
</button>
|
||||
</div>
|
||||
|
||||
<div className="grid grid-cols-2 gap-1.5">
|
||||
<input
|
||||
value={titleFilter}
|
||||
onChange={(e) => setTitleFilter(e.target.value)}
|
||||
onKeyDown={(e) => e.key === 'Enter' && doSearch()}
|
||||
placeholder="Title"
|
||||
className="rounded-md ui-surface border ui-border px-2 py-1.5 text-[11px] ui-text placeholder-slate-400 focus:border-sky-400 focus:outline-none ui-focus-ring"
|
||||
/>
|
||||
<input
|
||||
value={artistFilter}
|
||||
onChange={(e) => setArtistFilter(e.target.value)}
|
||||
onKeyDown={(e) => e.key === 'Enter' && doSearch()}
|
||||
placeholder="Artist"
|
||||
className="rounded-md ui-surface border ui-border px-2 py-1.5 text-[11px] ui-text placeholder-slate-400 focus:border-sky-400 focus:outline-none ui-focus-ring"
|
||||
/>
|
||||
<input
|
||||
value={albumFilter}
|
||||
onChange={(e) => setAlbumFilter(e.target.value)}
|
||||
onKeyDown={(e) => e.key === 'Enter' && doSearch()}
|
||||
placeholder="Album"
|
||||
className="rounded-md ui-surface border ui-border px-2 py-1.5 text-[11px] ui-text placeholder-slate-400 focus:border-sky-400 focus:outline-none ui-focus-ring"
|
||||
/>
|
||||
<input
|
||||
value={albumArtistFilter}
|
||||
onChange={(e) => setAlbumArtistFilter(e.target.value)}
|
||||
onKeyDown={(e) => e.key === 'Enter' && doSearch()}
|
||||
placeholder="Album Artist"
|
||||
className="rounded-md ui-surface border ui-border px-2 py-1.5 text-[11px] ui-text placeholder-slate-400 focus:border-sky-400 focus:outline-none ui-focus-ring"
|
||||
/>
|
||||
</div>
|
||||
|
||||
{/* Errors */}
|
||||
{searchErr && <p className="text-xs text-red-500 dark:text-red-400">{searchErr}</p>}
|
||||
{importErr && <p className="text-xs text-red-500 dark:text-red-400 break-all">{importErr}</p>}
|
||||
@@ -284,9 +327,9 @@ function SubsonicPanel() {
|
||||
<p className="text-xs font-medium ui-text truncate leading-tight">
|
||||
{song.title}
|
||||
</p>
|
||||
{song.artist && (
|
||||
{(song.albumArtist || song.artist) && (
|
||||
<p className="text-[10px] ui-text-muted truncate leading-tight">
|
||||
{song.artist}{song.album ? ` · ${song.album}` : ''}
|
||||
{song.albumArtist || song.artist}{song.album ? ` · ${song.album}` : ''}
|
||||
</p>
|
||||
)}
|
||||
<p className="text-[10px] ui-text-muted mt-0.5">
|
||||
@@ -369,6 +412,123 @@ function SubsonicPanel() {
|
||||
)
|
||||
}
|
||||
|
||||
function YtDlPanel() {
|
||||
const queryClient = useQueryClient()
|
||||
const [open, setOpen] = useState(false)
|
||||
const [url, setUrl] = useState('')
|
||||
const [title, setTitle] = useState('')
|
||||
const [artist, setArtist] = useState('')
|
||||
const [submitting, setSubmitting] = useState(false)
|
||||
const [jobId, setJobId] = useState<string | null>(null)
|
||||
const [submitErr, setSubmitErr] = useState<string | null>(null)
|
||||
|
||||
// Poll the job while it is queued or running.
|
||||
const { data: job } = useQuery({
|
||||
queryKey: ['ytdl-job', jobId],
|
||||
queryFn: () => getJob(jobId!),
|
||||
enabled: !!jobId,
|
||||
refetchInterval: (query) => {
|
||||
const s = query.state.data?.status
|
||||
return s === 'done' || s === 'error' || s === 'cancelled' ? false : 1500
|
||||
},
|
||||
})
|
||||
|
||||
// Once done: refresh the imports list, clear the job tracking.
|
||||
useEffect(() => {
|
||||
if (!job) return
|
||||
if (job.status === 'done') {
|
||||
queryClient.invalidateQueries({ queryKey: ['imports'] })
|
||||
setJobId(null)
|
||||
setUrl('')
|
||||
setTitle('')
|
||||
setArtist('')
|
||||
}
|
||||
}, [job?.status])
|
||||
|
||||
const jobRunning = !!jobId && job?.status !== 'done' && job?.status !== 'error' && job?.status !== 'cancelled'
|
||||
const jobError = job?.status === 'error' ? (job.error || 'Download failed.') : null
|
||||
|
||||
async function doImport() {
|
||||
if (!url.trim()) return
|
||||
setSubmitting(true)
|
||||
setSubmitErr(null)
|
||||
setJobId(null)
|
||||
try {
|
||||
const res = await importYtDl(url.trim(), title.trim(), artist.trim())
|
||||
setJobId(res.job_id)
|
||||
} catch (e) {
|
||||
setSubmitErr(String(e))
|
||||
} finally {
|
||||
setSubmitting(false)
|
||||
}
|
||||
}
|
||||
|
||||
// Derive a friendly progress label.
|
||||
let progressLabel: string | null = null
|
||||
if (jobRunning && job) {
|
||||
progressLabel = job.progress || 'Working…'
|
||||
}
|
||||
|
||||
return (
|
||||
<div className="border-b ui-border">
|
||||
<button
|
||||
onClick={() => setOpen((v) => !v)}
|
||||
className="w-full flex items-center gap-2 px-3 py-2.5 text-left hover:opacity-90 transition-colors"
|
||||
>
|
||||
<Download className="w-3.5 h-3.5 text-purple-500 shrink-0" />
|
||||
<span className="text-xs font-bold uppercase tracking-widest text-purple-500 flex-1">YT-DL Import</span>
|
||||
{jobRunning && <Loader2 className="w-3 h-3 text-purple-400 animate-spin shrink-0" />}
|
||||
{open
|
||||
? <ChevronUp className="w-3 h-3 ui-text-muted shrink-0" />
|
||||
: <ChevronDown className="w-3 h-3 ui-text-muted shrink-0" />}
|
||||
</button>
|
||||
|
||||
{open && (
|
||||
<div className="px-3 pb-3 space-y-1.5">
|
||||
<input
|
||||
value={url}
|
||||
onChange={(e) => setUrl(e.target.value)}
|
||||
onKeyDown={(e) => e.key === 'Enter' && doImport()}
|
||||
placeholder="https://youtube.com/watch?v=..."
|
||||
disabled={jobRunning}
|
||||
className="w-full rounded-md ui-surface border ui-border px-2.5 py-1.5 text-xs ui-text placeholder-slate-400 focus:border-purple-400 focus:outline-none ui-focus-ring disabled:opacity-50"
|
||||
/>
|
||||
<div className="grid grid-cols-2 gap-1.5">
|
||||
<input
|
||||
value={title}
|
||||
onChange={(e) => setTitle(e.target.value)}
|
||||
placeholder="Optional title override"
|
||||
disabled={jobRunning}
|
||||
className="rounded-md ui-surface border ui-border px-2 py-1.5 text-[11px] ui-text placeholder-slate-400 focus:border-purple-400 focus:outline-none ui-focus-ring disabled:opacity-50"
|
||||
/>
|
||||
<input
|
||||
value={artist}
|
||||
onChange={(e) => setArtist(e.target.value)}
|
||||
placeholder="Optional artist override"
|
||||
disabled={jobRunning}
|
||||
className="rounded-md ui-surface border ui-border px-2 py-1.5 text-[11px] ui-text placeholder-slate-400 focus:border-purple-400 focus:outline-none ui-focus-ring disabled:opacity-50"
|
||||
/>
|
||||
</div>
|
||||
<button
|
||||
onClick={doImport}
|
||||
disabled={submitting || jobRunning || !url.trim()}
|
||||
className="w-full rounded-md bg-purple-500 hover:bg-purple-400 disabled:opacity-60 px-2.5 py-1.5 text-xs font-medium text-white transition-colors flex items-center justify-center gap-1.5"
|
||||
>
|
||||
{(submitting || jobRunning) && <Loader2 className="w-3 h-3 animate-spin" />}
|
||||
{submitting ? 'Submitting…' : jobRunning ? 'Downloading…' : 'Import with yt-dlp'}
|
||||
</button>
|
||||
{progressLabel && (
|
||||
<p className="text-[11px] text-purple-400 truncate">{progressLabel}</p>
|
||||
)}
|
||||
{(submitErr || jobError) && (
|
||||
<p className="text-xs text-red-500 dark:text-red-400 break-all">{submitErr ?? jobError}</p>
|
||||
)}
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
)
|
||||
}
|
||||
|
||||
// ---------------------------------------------------------------------------
|
||||
// Sidebar
|
||||
// ---------------------------------------------------------------------------
|
||||
@@ -479,6 +639,9 @@ export default function Sidebar({ isOpen, onToggle, onOpenProject, onDeleteProje
|
||||
{/* Subsonic import */}
|
||||
<SubsonicPanel />
|
||||
|
||||
{/* yt-dlp import */}
|
||||
<YtDlPanel />
|
||||
|
||||
{/* Projects */}
|
||||
<div className="flex-1 overflow-y-auto p-3 space-y-1.5">
|
||||
<div className="flex items-center gap-2 mb-1">
|
||||
|
||||
@@ -7,7 +7,7 @@ import {
|
||||
ListMusic, Edit2, Check, X as XIcon, Wand2, RotateCcw, Copy, Users,
|
||||
Play, Pause, Square, Eye, EyeOff,
|
||||
} from 'lucide-react'
|
||||
import { getProjectDetail, transcribeProject, abcProject, mixProject, lrcProject, lyricTranscribeProject, downloadUrl, reprocessStem, renameStem, getPerInstrumentModels, getTranscribeModes, getLyricModels } from '../api/client'
|
||||
import { getProjectDetail, transcribeProject, abcProject, mixProject, lrcProject, lyricTranscribeProject, downloadUrl, reprocessStem, renameStem, getPerInstrumentModels, getTranscribeModes, getLyricModels, projectCoverArtUrl } from '../api/client'
|
||||
import type { ProjectDetail as PD, Job, JobFile, ModeOption, LyricModelsPayload } from '../types'
|
||||
import DynamicMixPlayer from '../components/DynamicMixPlayer'
|
||||
import LyricsLivePreview from '../components/LyricsLivePreview'
|
||||
@@ -1727,10 +1727,11 @@ const WHISPER_LANGS = [
|
||||
{ id: 'hi', label: 'Hindi' },
|
||||
]
|
||||
|
||||
function LrcPreview({ file, jobId, originalAudioUrl, stems, title, storageKey, coverArtUrl, artist, songTitle }: {
|
||||
function LrcPreview({ file, jobId, originalAudioUrl, sourceVideoUrl, stems, title, storageKey, coverArtUrl, artist, songTitle }: {
|
||||
file: JobFile
|
||||
jobId: string
|
||||
originalAudioUrl?: string
|
||||
sourceVideoUrl?: string
|
||||
stems?: { name: string; label: string; url: string }[]
|
||||
title?: string
|
||||
storageKey?: string
|
||||
@@ -1793,6 +1794,7 @@ function LrcPreview({ file, jobId, originalAudioUrl, stems, title, storageKey, c
|
||||
lrcText={text}
|
||||
stems={stems && stems.length > 0 ? stems : undefined}
|
||||
audioUrl={(!stems || stems.length === 0) ? originalAudioUrl : undefined}
|
||||
videoUrl={sourceVideoUrl}
|
||||
title={title}
|
||||
storageKey={storageKey}
|
||||
coverArtUrl={coverArtUrl}
|
||||
@@ -1848,6 +1850,7 @@ function StemLyricsRow({
|
||||
lrcJob,
|
||||
whisperJob,
|
||||
originalAudioUrl,
|
||||
sourceVideoUrl,
|
||||
stems,
|
||||
coverArtUrl,
|
||||
artist,
|
||||
@@ -1861,6 +1864,7 @@ function StemLyricsRow({
|
||||
lrcJob: Job | null
|
||||
whisperJob: Job | null
|
||||
originalAudioUrl?: string
|
||||
sourceVideoUrl?: string
|
||||
stems?: { name: string; label: string; url: string }[]
|
||||
coverArtUrl?: string
|
||||
artist?: string
|
||||
@@ -2270,7 +2274,7 @@ function StemLyricsRow({
|
||||
{activeJob.files
|
||||
.filter((f) => f.name.endsWith('.elrc') || f.name.endsWith('.lrc') || f.name.endsWith('.sylrc'))
|
||||
.map((f) => (
|
||||
<LrcPreview key={f.name} file={f} jobId={activeJob.id} originalAudioUrl={originalAudioUrl} stems={stems} title={projectName} storageKey={`${activeJob.id}-${f.name}`} coverArtUrl={coverArtUrl} artist={artist} songTitle={songTitle} />
|
||||
<LrcPreview key={f.name} file={f} jobId={activeJob.id} originalAudioUrl={originalAudioUrl} sourceVideoUrl={sourceVideoUrl} stems={stems} title={projectName} storageKey={`${activeJob.id}-${f.name}`} coverArtUrl={coverArtUrl} artist={artist} songTitle={songTitle} />
|
||||
))}
|
||||
{/* Inline transcript display for lyric-transcribe jobs */}
|
||||
{activeJob.job_type === 'lyric-transcribe' && (
|
||||
@@ -2409,6 +2413,9 @@ function LyricsSection({
|
||||
const originalAudioUrl = sourceFile
|
||||
? downloadUrl(sepJob.id, sourceFile.name)
|
||||
: undefined
|
||||
const sourceVideoUrl = sourceFile && /\.(mp4|mkv|webm|mov|m4v)$/i.test(sourceFile.name)
|
||||
? downloadUrl(sepJob.id, sourceFile.name)
|
||||
: undefined
|
||||
|
||||
const [open, setOpen] = useState(true)
|
||||
|
||||
@@ -2438,8 +2445,9 @@ function LyricsSection({
|
||||
lrcJob={lrcJobs[stemName] ?? null}
|
||||
whisperJob={lrcJobs[`${stemName}_whisperx`] ?? lrcJobs[`${stemName}_parakeet`] ?? lrcJobs[`${stemName}_whisper`] ?? null}
|
||||
originalAudioUrl={originalAudioUrl}
|
||||
sourceVideoUrl={sourceVideoUrl}
|
||||
stems={stemEntries.length > 0 ? stemEntries : undefined}
|
||||
coverArtUrl={`/api/projects/${project.id}/cover-art`}
|
||||
coverArtUrl={projectCoverArtUrl(project.id)}
|
||||
artist={project.source_artist}
|
||||
songTitle={project.source_title}
|
||||
lyricModels={lyricModels}
|
||||
|
||||
@@ -10,7 +10,7 @@ export interface JobFile {
|
||||
|
||||
export interface Job {
|
||||
id: string
|
||||
job_type: 'separate' | 'transcribe' | 'abc-convert' | 'pipeline' | 'lrc_align' | 'mix' | 'lyric-transcribe'
|
||||
job_type: 'separate' | 'transcribe' | 'abc-convert' | 'pipeline' | 'lrc_align' | 'mix' | 'lyric-transcribe' | 'ytdl-import'
|
||||
status: JobStatus
|
||||
progress: string
|
||||
error: string
|
||||
@@ -122,6 +122,8 @@ export interface SubsonicSong {
|
||||
id: string
|
||||
title: string
|
||||
artist: string
|
||||
songArtist?: string
|
||||
albumArtist?: string
|
||||
album: string
|
||||
duration: number
|
||||
suffix: string
|
||||
@@ -141,6 +143,10 @@ export interface ImportedFile {
|
||||
size: number
|
||||
title?: string
|
||||
artist?: string
|
||||
album?: string
|
||||
album_artist?: string
|
||||
source?: string
|
||||
is_video?: boolean
|
||||
}
|
||||
|
||||
// Model download types
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
import { defineConfig } from 'vite'
|
||||
import react from '@vitejs/plugin-react'
|
||||
import { resolve } from 'path'
|
||||
|
||||
// https://vitejs.dev/config/
|
||||
export default defineConfig({
|
||||
@@ -11,10 +10,11 @@ export default defineConfig({
|
||||
},
|
||||
resolve: {
|
||||
alias: {
|
||||
'@': resolve(__dirname, './src'),
|
||||
'@': new URL('./src', import.meta.url).pathname,
|
||||
},
|
||||
},
|
||||
server: {
|
||||
allowedHosts: true,
|
||||
proxy: {
|
||||
'/api': {
|
||||
target: 'http://localhost:8000',
|
||||
|
||||
Reference in new issue
Block a user