Compare commits
19 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 2fb544d1f8 | |||
| d16eaa324a | |||
| cc3f7640c6 | |||
| 2653586eea | |||
| 0c92385c56 | |||
| 957fb83dbc | |||
| 90f1871488 | |||
| 2d0e5055f8 | |||
| 08d02be4f2 | |||
| 5b542dcf29 | |||
| 48f9584027 | |||
| 4241a591aa | |||
| f346fbb6ba | |||
| 2172981110 | |||
| ddf1844237 | |||
| 3a5aea4c91 | |||
| 6b4ad16882 | |||
| 4dbd88e689 | |||
| d0665fdcc5 |
@@ -2,18 +2,13 @@ name: Build Multi-Platform
|
|||||||
|
|
||||||
on:
|
on:
|
||||||
push:
|
push:
|
||||||
branches:
|
|
||||||
- main
|
|
||||||
tags:
|
tags:
|
||||||
- 'v*'
|
- 'v*'
|
||||||
pull_request:
|
|
||||||
branches:
|
|
||||||
- main
|
|
||||||
workflow_dispatch:
|
workflow_dispatch:
|
||||||
|
|
||||||
env:
|
env:
|
||||||
GO_VERSION: '1.25.4'
|
GO_VERSION: '1.25.4'
|
||||||
NODE_VERSION: '20'
|
NODE_VERSION: '24'
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
build-windows:
|
build-windows:
|
||||||
@@ -72,9 +67,17 @@ jobs:
|
|||||||
pnpm install
|
pnpm install
|
||||||
pnpm run generate-icon
|
pnpm run generate-icon
|
||||||
|
|
||||||
|
- name: Install UPX
|
||||||
|
run: |
|
||||||
|
choco install upx -y
|
||||||
|
|
||||||
- name: Build application
|
- name: Build application
|
||||||
run: wails build -platform windows/amd64
|
run: wails build -platform windows/amd64
|
||||||
|
|
||||||
|
- name: Compress with UPX
|
||||||
|
run: |
|
||||||
|
upx --best --lzma "build\bin\SpotiFLAC.exe"
|
||||||
|
|
||||||
- name: Prepare artifacts
|
- name: Prepare artifacts
|
||||||
run: |
|
run: |
|
||||||
mkdir -p dist
|
mkdir -p dist
|
||||||
@@ -219,7 +222,7 @@ jobs:
|
|||||||
- name: Install dependencies
|
- name: Install dependencies
|
||||||
run: |
|
run: |
|
||||||
sudo apt-get update
|
sudo apt-get update
|
||||||
sudo apt-get install -y libgtk-3-dev libwebkit2gtk-4.1-dev libfuse2 imagemagick
|
sudo apt-get install -y libgtk-3-dev libwebkit2gtk-4.1-dev libfuse2 imagemagick upx-ucl
|
||||||
|
|
||||||
# Create symlink for webkit2gtk-4.0 -> webkit2gtk-4.1 (Ubuntu 24.04 compatibility)
|
# Create symlink for webkit2gtk-4.0 -> webkit2gtk-4.1 (Ubuntu 24.04 compatibility)
|
||||||
sudo ln -sf /usr/lib/x86_64-linux-gnu/pkgconfig/webkit2gtk-4.1.pc /usr/lib/x86_64-linux-gnu/pkgconfig/webkit2gtk-4.0.pc
|
sudo ln -sf /usr/lib/x86_64-linux-gnu/pkgconfig/webkit2gtk-4.1.pc /usr/lib/x86_64-linux-gnu/pkgconfig/webkit2gtk-4.0.pc
|
||||||
@@ -236,6 +239,10 @@ jobs:
|
|||||||
- name: Build application
|
- name: Build application
|
||||||
run: wails build -platform linux/amd64
|
run: wails build -platform linux/amd64
|
||||||
|
|
||||||
|
- name: Compress with UPX
|
||||||
|
run: |
|
||||||
|
upx --best --lzma build/bin/SpotiFLAC
|
||||||
|
|
||||||
- name: Download appimagetool
|
- name: Download appimagetool
|
||||||
run: |
|
run: |
|
||||||
wget -O appimagetool https://github.com/AppImage/AppImageKit/releases/download/continuous/appimagetool-x86_64.AppImage
|
wget -O appimagetool https://github.com/AppImage/AppImageKit/releases/download/continuous/appimagetool-x86_64.AppImage
|
||||||
|
|||||||
@@ -6,9 +6,7 @@
|
|||||||
|
|
||||||
Get Spotify tracks in true FLAC from Tidal, Deezer, Qobuz & Amazon Music — no account required.
|
Get Spotify tracks in true FLAC from Tidal, Deezer, Qobuz & Amazon Music — no account required.
|
||||||
|
|
||||||
<br><br>
|

|
||||||
|
|
||||||

|
|
||||||

|

|
||||||

|

|
||||||
|
|
||||||
@@ -18,11 +16,11 @@ Get Spotify tracks in true FLAC from Tidal, Deezer, Qobuz & Amazon Music — no
|
|||||||
|
|
||||||
## Screenshot
|
## Screenshot
|
||||||
|
|
||||||

|

|
||||||
|
|
||||||
## Lossless Audio Check
|
## Lossless Audio Checker
|
||||||
|
|
||||||
A simple utility for verifying the authenticity of FLAC files (lossless/lossy detection).
|
A simple utility for verifying the authenticity of FLAC files.
|
||||||
|
|
||||||
#### [Download](https://github.com/afkarxyz/SpotiFLAC/releases/download/v0/FLAC-Checker.zip) - Windows only
|
#### [Download](https://github.com/afkarxyz/SpotiFLAC/releases/download/v0/FLAC-Checker.zip) - Windows only
|
||||||
|
|
||||||
@@ -32,7 +30,7 @@ A simple utility for verifying the authenticity of FLAC files (lossless/lossy de
|
|||||||
|
|
||||||

|

|
||||||
|
|
||||||
## Other projects
|
## Other project
|
||||||
|
|
||||||
### [SpotiDownloader](https://github.com/afkarxyz/SpotiDownloader)
|
### [SpotiDownloader](https://github.com/afkarxyz/SpotiDownloader)
|
||||||
|
|
||||||
|
|||||||
@@ -52,6 +52,8 @@ type DownloadRequest struct {
|
|||||||
UseAlbumTrackNumber bool `json:"use_album_track_number,omitempty"` // Use album track number instead of playlist position
|
UseAlbumTrackNumber bool `json:"use_album_track_number,omitempty"` // Use album track number instead of playlist position
|
||||||
SpotifyID string `json:"spotify_id,omitempty"` // Spotify track ID
|
SpotifyID string `json:"spotify_id,omitempty"` // Spotify track ID
|
||||||
ServiceURL string `json:"service_url,omitempty"` // Direct service URL (Tidal/Deezer/Amazon) to skip song.link API call
|
ServiceURL string `json:"service_url,omitempty"` // Direct service URL (Tidal/Deezer/Amazon) to skip song.link API call
|
||||||
|
Duration int `json:"duration,omitempty"` // Track duration in seconds for better matching
|
||||||
|
ItemID string `json:"item_id,omitempty"` // Optional queue item ID for multi-service fallback tracking
|
||||||
}
|
}
|
||||||
|
|
||||||
// DownloadResponse represents the response structure for download operations
|
// DownloadResponse represents the response structure for download operations
|
||||||
@@ -61,6 +63,7 @@ type DownloadResponse struct {
|
|||||||
File string `json:"file,omitempty"`
|
File string `json:"file,omitempty"`
|
||||||
Error string `json:"error,omitempty"`
|
Error string `json:"error,omitempty"`
|
||||||
AlreadyExists bool `json:"already_exists,omitempty"`
|
AlreadyExists bool `json:"already_exists,omitempty"`
|
||||||
|
ItemID string `json:"item_id,omitempty"` // Queue item ID for tracking
|
||||||
}
|
}
|
||||||
|
|
||||||
// GetStreamingURLs fetches all streaming URLs from song.link API
|
// GetStreamingURLs fetches all streaming URLs from song.link API
|
||||||
@@ -142,14 +145,30 @@ func (a *App) DownloadTrack(req DownloadRequest) (DownloadResponse, error) {
|
|||||||
req.FilenameFormat = "title-artist"
|
req.FilenameFormat = "title-artist"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// ItemID should always be provided by frontend (created via AddToDownloadQueue)
|
||||||
|
// If not provided, generate one for backwards compatibility
|
||||||
|
itemID := req.ItemID
|
||||||
|
if itemID == "" {
|
||||||
|
itemID = fmt.Sprintf("%s-%d", req.ISRC, time.Now().UnixNano())
|
||||||
|
// Add to queue if no ItemID was provided (legacy support)
|
||||||
|
backend.AddToQueue(itemID, req.TrackName, req.ArtistName, req.AlbumName, req.ISRC)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Mark item as downloading immediately
|
||||||
|
backend.SetDownloading(true)
|
||||||
|
backend.StartDownloadItem(itemID)
|
||||||
|
defer backend.SetDownloading(false)
|
||||||
|
|
||||||
// Early check: Check if file with same ISRC already exists
|
// Early check: Check if file with same ISRC already exists
|
||||||
if existingFile, exists := backend.CheckISRCExists(req.OutputDir, req.ISRC); exists {
|
if existingFile, exists := backend.CheckISRCExists(req.OutputDir, req.ISRC); exists {
|
||||||
fmt.Printf("File with ISRC %s already exists: %s\n", req.ISRC, existingFile)
|
fmt.Printf("File with ISRC %s already exists: %s\n", req.ISRC, existingFile)
|
||||||
|
backend.SkipDownloadItem(itemID, existingFile)
|
||||||
return DownloadResponse{
|
return DownloadResponse{
|
||||||
Success: true,
|
Success: true,
|
||||||
Message: "File with same ISRC already exists",
|
Message: "File with same ISRC already exists",
|
||||||
File: existingFile,
|
File: existingFile,
|
||||||
AlreadyExists: true,
|
AlreadyExists: true,
|
||||||
|
ItemID: itemID,
|
||||||
}, nil
|
}, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -158,20 +177,28 @@ func (a *App) DownloadTrack(req DownloadRequest) (DownloadResponse, error) {
|
|||||||
expectedFilename := backend.BuildExpectedFilename(req.TrackName, req.ArtistName, req.FilenameFormat, req.TrackNumber, req.Position, req.UseAlbumTrackNumber)
|
expectedFilename := backend.BuildExpectedFilename(req.TrackName, req.ArtistName, req.FilenameFormat, req.TrackNumber, req.Position, req.UseAlbumTrackNumber)
|
||||||
expectedPath := filepath.Join(req.OutputDir, expectedFilename)
|
expectedPath := filepath.Join(req.OutputDir, expectedFilename)
|
||||||
|
|
||||||
if fileInfo, err := os.Stat(expectedPath); err == nil && fileInfo.Size() > 0 {
|
if fileInfo, err := os.Stat(expectedPath); err == nil && fileInfo.Size() > 100*1024 {
|
||||||
return DownloadResponse{
|
// Validate the file by checking if it has valid ISRC metadata
|
||||||
Success: true,
|
if fileISRC, readErr := backend.ReadISRCFromFile(expectedPath); readErr == nil && fileISRC != "" {
|
||||||
Message: "File already exists",
|
// File exists and has valid metadata - skip download
|
||||||
File: expectedPath,
|
backend.SkipDownloadItem(itemID, expectedPath)
|
||||||
AlreadyExists: true,
|
return DownloadResponse{
|
||||||
}, nil
|
Success: true,
|
||||||
|
Message: "File already exists",
|
||||||
|
File: expectedPath,
|
||||||
|
AlreadyExists: true,
|
||||||
|
ItemID: itemID,
|
||||||
|
}, nil
|
||||||
|
} else {
|
||||||
|
// File exists but has no valid ISRC metadata - it's corrupted, delete it
|
||||||
|
fmt.Printf("Removing corrupted file (no valid ISRC metadata): %s\n", expectedPath)
|
||||||
|
if removeErr := os.Remove(expectedPath); removeErr != nil {
|
||||||
|
fmt.Printf("Warning: Failed to remove corrupted file %s: %v\n", expectedPath, removeErr)
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Set downloading state
|
|
||||||
backend.SetDownloading(true)
|
|
||||||
defer backend.SetDownloading(false)
|
|
||||||
|
|
||||||
switch req.Service {
|
switch req.Service {
|
||||||
case "amazon":
|
case "amazon":
|
||||||
downloader := backend.NewAmazonDownloader()
|
downloader := backend.NewAmazonDownloader()
|
||||||
@@ -201,7 +228,8 @@ func (a *App) DownloadTrack(req DownloadRequest) (DownloadResponse, error) {
|
|||||||
Error: "Spotify ID is required for Tidal",
|
Error: "Spotify ID is required for Tidal",
|
||||||
}, fmt.Errorf("spotify ID is required for Tidal")
|
}, fmt.Errorf("spotify ID is required for Tidal")
|
||||||
}
|
}
|
||||||
filename, err = downloader.DownloadWithFallback(req.SpotifyID, req.OutputDir, req.AudioFormat, req.FilenameFormat, req.TrackNumber, req.Position, req.TrackName, req.ArtistName, req.AlbumName, req.UseAlbumTrackNumber)
|
// Use ISRC matching for search fallback
|
||||||
|
filename, err = downloader.DownloadWithFallbackAndISRC(req.SpotifyID, req.ISRC, req.OutputDir, req.AudioFormat, req.FilenameFormat, req.TrackNumber, req.Position, req.TrackName, req.ArtistName, req.AlbumName, req.UseAlbumTrackNumber, req.Duration)
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
downloader := backend.NewTidalDownloader(req.ApiURL)
|
downloader := backend.NewTidalDownloader(req.ApiURL)
|
||||||
@@ -215,7 +243,8 @@ func (a *App) DownloadTrack(req DownloadRequest) (DownloadResponse, error) {
|
|||||||
Error: "Spotify ID is required for Tidal",
|
Error: "Spotify ID is required for Tidal",
|
||||||
}, fmt.Errorf("spotify ID is required for Tidal")
|
}, fmt.Errorf("spotify ID is required for Tidal")
|
||||||
}
|
}
|
||||||
filename, err = downloader.Download(req.SpotifyID, req.OutputDir, req.AudioFormat, req.FilenameFormat, req.TrackNumber, req.Position, req.TrackName, req.ArtistName, req.AlbumName, req.UseAlbumTrackNumber)
|
// Use ISRC matching for search fallback
|
||||||
|
filename, err = downloader.DownloadWithISRC(req.SpotifyID, req.ISRC, req.OutputDir, req.AudioFormat, req.FilenameFormat, req.TrackNumber, req.Position, req.TrackName, req.ArtistName, req.AlbumName, req.UseAlbumTrackNumber, req.Duration)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -240,9 +269,23 @@ func (a *App) DownloadTrack(req DownloadRequest) (DownloadResponse, error) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
// Clean up any partial/corrupted file that was created during failed download
|
||||||
|
if filename != "" && !strings.HasPrefix(filename, "EXISTS:") {
|
||||||
|
// Check if file exists and delete it
|
||||||
|
if _, statErr := os.Stat(filename); statErr == nil {
|
||||||
|
fmt.Printf("Removing corrupted/partial file after failed download: %s\n", filename)
|
||||||
|
if removeErr := os.Remove(filename); removeErr != nil {
|
||||||
|
fmt.Printf("Warning: Failed to remove corrupted file %s: %v\n", filename, removeErr)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Don't mark as failed in backend - let the frontend handle it
|
||||||
|
// Frontend will call MarkDownloadItemFailed after all services are tried
|
||||||
return DownloadResponse{
|
return DownloadResponse{
|
||||||
Success: false,
|
Success: false,
|
||||||
Error: fmt.Sprintf("Download failed: %v", err),
|
Error: fmt.Sprintf("Download failed: %v", err),
|
||||||
|
ItemID: itemID,
|
||||||
}, err
|
}, err
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -256,6 +299,16 @@ func (a *App) DownloadTrack(req DownloadRequest) (DownloadResponse, error) {
|
|||||||
message := "Download completed successfully"
|
message := "Download completed successfully"
|
||||||
if alreadyExists {
|
if alreadyExists {
|
||||||
message = "File already exists"
|
message = "File already exists"
|
||||||
|
backend.SkipDownloadItem(itemID, filename)
|
||||||
|
} else {
|
||||||
|
// Get file size for completed download
|
||||||
|
if fileInfo, statErr := os.Stat(filename); statErr == nil {
|
||||||
|
finalSize := float64(fileInfo.Size()) / (1024 * 1024) // Convert to MB
|
||||||
|
backend.CompleteDownloadItem(itemID, filename, finalSize)
|
||||||
|
} else {
|
||||||
|
// Fallback: mark as completed without size
|
||||||
|
backend.CompleteDownloadItem(itemID, filename, 0)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return DownloadResponse{
|
return DownloadResponse{
|
||||||
@@ -263,6 +316,7 @@ func (a *App) DownloadTrack(req DownloadRequest) (DownloadResponse, error) {
|
|||||||
Message: message,
|
Message: message,
|
||||||
File: filename,
|
File: filename,
|
||||||
AlreadyExists: alreadyExists,
|
AlreadyExists: alreadyExists,
|
||||||
|
ItemID: itemID,
|
||||||
}, nil
|
}, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -285,6 +339,11 @@ func (a *App) SelectFolder(defaultPath string) (string, error) {
|
|||||||
return backend.SelectFolderDialog(a.ctx, defaultPath)
|
return backend.SelectFolderDialog(a.ctx, defaultPath)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// SelectFile opens a file selection dialog and returns the selected file path
|
||||||
|
func (a *App) SelectFile() (string, error) {
|
||||||
|
return backend.SelectFileDialog(a.ctx)
|
||||||
|
}
|
||||||
|
|
||||||
// GetDefaults returns the default configuration
|
// GetDefaults returns the default configuration
|
||||||
func (a *App) GetDefaults() map[string]string {
|
func (a *App) GetDefaults() map[string]string {
|
||||||
return map[string]string{
|
return map[string]string{
|
||||||
@@ -297,8 +356,190 @@ func (a *App) GetDownloadProgress() backend.ProgressInfo {
|
|||||||
return backend.GetDownloadProgress()
|
return backend.GetDownloadProgress()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// GetDownloadQueue returns the complete download queue state
|
||||||
|
func (a *App) GetDownloadQueue() backend.DownloadQueueInfo {
|
||||||
|
return backend.GetDownloadQueue()
|
||||||
|
}
|
||||||
|
|
||||||
|
// ClearCompletedDownloads clears completed, failed, and skipped items from the queue
|
||||||
|
func (a *App) ClearCompletedDownloads() {
|
||||||
|
backend.ClearDownloadQueue()
|
||||||
|
}
|
||||||
|
|
||||||
|
// ClearAllDownloads clears the entire queue and resets session stats
|
||||||
|
func (a *App) ClearAllDownloads() {
|
||||||
|
backend.ClearAllDownloads()
|
||||||
|
}
|
||||||
|
|
||||||
|
// AddToDownloadQueue adds a new item to the download queue and returns its ID
|
||||||
|
func (a *App) AddToDownloadQueue(isrc, trackName, artistName, albumName string) string {
|
||||||
|
itemID := fmt.Sprintf("%s-%d", isrc, time.Now().UnixNano())
|
||||||
|
backend.AddToQueue(itemID, trackName, artistName, albumName, isrc)
|
||||||
|
return itemID
|
||||||
|
}
|
||||||
|
|
||||||
|
// MarkDownloadItemFailed marks a download item as failed
|
||||||
|
func (a *App) MarkDownloadItemFailed(itemID, errorMsg string) {
|
||||||
|
backend.FailDownloadItem(itemID, errorMsg)
|
||||||
|
}
|
||||||
|
|
||||||
|
// CancelAllQueuedItems marks all queued items as cancelled/skipped
|
||||||
|
func (a *App) CancelAllQueuedItems() {
|
||||||
|
backend.CancelAllQueuedItems()
|
||||||
|
}
|
||||||
|
|
||||||
// Quit closes the application
|
// Quit closes the application
|
||||||
func (a *App) Quit() {
|
func (a *App) Quit() {
|
||||||
// You can add cleanup logic here if needed
|
// You can add cleanup logic here if needed
|
||||||
panic("quit") // This will trigger Wails to close the app
|
panic("quit") // This will trigger Wails to close the app
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// AnalyzeTrack analyzes audio quality of a FLAC file
|
||||||
|
func (a *App) AnalyzeTrack(filePath string) (string, error) {
|
||||||
|
if filePath == "" {
|
||||||
|
return "", fmt.Errorf("file path is required")
|
||||||
|
}
|
||||||
|
|
||||||
|
result, err := backend.AnalyzeTrack(filePath)
|
||||||
|
if err != nil {
|
||||||
|
return "", fmt.Errorf("failed to analyze track: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
jsonData, err := json.Marshal(result)
|
||||||
|
if err != nil {
|
||||||
|
return "", fmt.Errorf("failed to encode response: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
return string(jsonData), nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// AnalyzeMultipleTracks analyzes multiple FLAC files
|
||||||
|
func (a *App) AnalyzeMultipleTracks(filePaths []string) (string, error) {
|
||||||
|
if len(filePaths) == 0 {
|
||||||
|
return "", fmt.Errorf("at least one file path is required")
|
||||||
|
}
|
||||||
|
|
||||||
|
results := make([]*backend.AnalysisResult, 0, len(filePaths))
|
||||||
|
|
||||||
|
for _, filePath := range filePaths {
|
||||||
|
result, err := backend.AnalyzeTrack(filePath)
|
||||||
|
if err != nil {
|
||||||
|
// Skip failed analyses
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
results = append(results, result)
|
||||||
|
}
|
||||||
|
|
||||||
|
jsonData, err := json.Marshal(results)
|
||||||
|
if err != nil {
|
||||||
|
return "", fmt.Errorf("failed to encode response: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
return string(jsonData), nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// LyricsDownloadRequest represents the request structure for downloading lyrics
|
||||||
|
type LyricsDownloadRequest struct {
|
||||||
|
SpotifyID string `json:"spotify_id"`
|
||||||
|
TrackName string `json:"track_name"`
|
||||||
|
ArtistName string `json:"artist_name"`
|
||||||
|
OutputDir string `json:"output_dir"`
|
||||||
|
FilenameFormat string `json:"filename_format"`
|
||||||
|
TrackNumber bool `json:"track_number"`
|
||||||
|
Position int `json:"position"`
|
||||||
|
UseAlbumTrackNumber bool `json:"use_album_track_number"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// DownloadLyrics downloads lyrics for a single track
|
||||||
|
func (a *App) DownloadLyrics(req LyricsDownloadRequest) (backend.LyricsDownloadResponse, error) {
|
||||||
|
if req.SpotifyID == "" {
|
||||||
|
return backend.LyricsDownloadResponse{
|
||||||
|
Success: false,
|
||||||
|
Error: "Spotify ID is required",
|
||||||
|
}, fmt.Errorf("spotify ID is required")
|
||||||
|
}
|
||||||
|
|
||||||
|
client := backend.NewLyricsClient()
|
||||||
|
backendReq := backend.LyricsDownloadRequest{
|
||||||
|
SpotifyID: req.SpotifyID,
|
||||||
|
TrackName: req.TrackName,
|
||||||
|
ArtistName: req.ArtistName,
|
||||||
|
OutputDir: req.OutputDir,
|
||||||
|
FilenameFormat: req.FilenameFormat,
|
||||||
|
TrackNumber: req.TrackNumber,
|
||||||
|
Position: req.Position,
|
||||||
|
UseAlbumTrackNumber: req.UseAlbumTrackNumber,
|
||||||
|
}
|
||||||
|
|
||||||
|
resp, err := client.DownloadLyrics(backendReq)
|
||||||
|
if err != nil {
|
||||||
|
return backend.LyricsDownloadResponse{
|
||||||
|
Success: false,
|
||||||
|
Error: err.Error(),
|
||||||
|
}, err
|
||||||
|
}
|
||||||
|
|
||||||
|
return *resp, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// CoverDownloadRequest represents the request structure for downloading cover art
|
||||||
|
type CoverDownloadRequest struct {
|
||||||
|
CoverURL string `json:"cover_url"`
|
||||||
|
TrackName string `json:"track_name"`
|
||||||
|
ArtistName string `json:"artist_name"`
|
||||||
|
OutputDir string `json:"output_dir"`
|
||||||
|
FilenameFormat string `json:"filename_format"`
|
||||||
|
TrackNumber bool `json:"track_number"`
|
||||||
|
Position int `json:"position"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// DownloadCover downloads cover art for a single track
|
||||||
|
func (a *App) DownloadCover(req CoverDownloadRequest) (backend.CoverDownloadResponse, error) {
|
||||||
|
if req.CoverURL == "" {
|
||||||
|
return backend.CoverDownloadResponse{
|
||||||
|
Success: false,
|
||||||
|
Error: "Cover URL is required",
|
||||||
|
}, fmt.Errorf("cover URL is required")
|
||||||
|
}
|
||||||
|
|
||||||
|
client := backend.NewCoverClient()
|
||||||
|
backendReq := backend.CoverDownloadRequest{
|
||||||
|
CoverURL: req.CoverURL,
|
||||||
|
TrackName: req.TrackName,
|
||||||
|
ArtistName: req.ArtistName,
|
||||||
|
OutputDir: req.OutputDir,
|
||||||
|
FilenameFormat: req.FilenameFormat,
|
||||||
|
TrackNumber: req.TrackNumber,
|
||||||
|
Position: req.Position,
|
||||||
|
}
|
||||||
|
|
||||||
|
resp, err := client.DownloadCover(backendReq)
|
||||||
|
if err != nil {
|
||||||
|
return backend.CoverDownloadResponse{
|
||||||
|
Success: false,
|
||||||
|
Error: err.Error(),
|
||||||
|
}, err
|
||||||
|
}
|
||||||
|
|
||||||
|
return *resp, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// CheckTrackAvailability checks the availability of a track on different streaming platforms
|
||||||
|
func (a *App) CheckTrackAvailability(spotifyTrackID string, isrc string) (string, error) {
|
||||||
|
if spotifyTrackID == "" {
|
||||||
|
return "", fmt.Errorf("spotify track ID is required")
|
||||||
|
}
|
||||||
|
|
||||||
|
client := backend.NewSongLinkClient()
|
||||||
|
availability, err := client.CheckTrackAvailability(spotifyTrackID, isrc)
|
||||||
|
if err != nil {
|
||||||
|
return "", err
|
||||||
|
}
|
||||||
|
|
||||||
|
jsonData, err := json.Marshal(availability)
|
||||||
|
if err != nil {
|
||||||
|
return "", fmt.Errorf("failed to encode response: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
return string(jsonData), nil
|
||||||
|
}
|
||||||
|
|||||||
@@ -0,0 +1,181 @@
|
|||||||
|
package backend
|
||||||
|
|
||||||
|
import (
|
||||||
|
"fmt"
|
||||||
|
"math"
|
||||||
|
"os"
|
||||||
|
|
||||||
|
"github.com/go-flac/go-flac"
|
||||||
|
mewflac "github.com/mewkiz/flac"
|
||||||
|
)
|
||||||
|
|
||||||
|
// AnalysisResult contains the audio analysis data
|
||||||
|
type AnalysisResult struct {
|
||||||
|
FilePath string `json:"file_path"`
|
||||||
|
SampleRate uint32 `json:"sample_rate"`
|
||||||
|
Channels uint8 `json:"channels"`
|
||||||
|
BitsPerSample uint8 `json:"bits_per_sample"`
|
||||||
|
TotalSamples uint64 `json:"total_samples"`
|
||||||
|
Duration float64 `json:"duration"`
|
||||||
|
BitDepth string `json:"bit_depth"`
|
||||||
|
DynamicRange float64 `json:"dynamic_range"`
|
||||||
|
PeakAmplitude float64 `json:"peak_amplitude"`
|
||||||
|
RMSLevel float64 `json:"rms_level"`
|
||||||
|
Spectrum *SpectrumData `json:"spectrum,omitempty"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// AnalyzeTrack performs audio analysis on a FLAC file
|
||||||
|
func AnalyzeTrack(filepath string) (*AnalysisResult, error) {
|
||||||
|
if !fileExists(filepath) {
|
||||||
|
return nil, fmt.Errorf("file does not exist: %s", filepath)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Parse FLAC file
|
||||||
|
f, err := flac.ParseFile(filepath)
|
||||||
|
if err != nil {
|
||||||
|
return nil, fmt.Errorf("failed to parse FLAC file: %w", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
result := &AnalysisResult{
|
||||||
|
FilePath: filepath,
|
||||||
|
}
|
||||||
|
|
||||||
|
// Extract basic audio properties from STREAMINFO block
|
||||||
|
if len(f.Meta) > 0 {
|
||||||
|
streamInfo := f.Meta[0]
|
||||||
|
if streamInfo.Type == flac.StreamInfo {
|
||||||
|
// Read STREAMINFO data
|
||||||
|
data := streamInfo.Data
|
||||||
|
if len(data) >= 18 {
|
||||||
|
// Sample rate (bits 10-29 of bytes 10-13)
|
||||||
|
result.SampleRate = uint32(data[10])<<12 | uint32(data[11])<<4 | uint32(data[12])>>4
|
||||||
|
|
||||||
|
// Channels (bits 30-32 of byte 12)
|
||||||
|
result.Channels = ((data[12] >> 1) & 0x07) + 1
|
||||||
|
|
||||||
|
// Bits per sample (bits 33-37 of bytes 12-13)
|
||||||
|
result.BitsPerSample = ((data[12]&0x01)<<4 | data[13]>>4) + 1
|
||||||
|
|
||||||
|
// Total samples (bits 38-73 of bytes 13-17)
|
||||||
|
result.TotalSamples = uint64(data[13]&0x0F)<<32 |
|
||||||
|
uint64(data[14])<<24 |
|
||||||
|
uint64(data[15])<<16 |
|
||||||
|
uint64(data[16])<<8 |
|
||||||
|
uint64(data[17])
|
||||||
|
|
||||||
|
// Calculate duration
|
||||||
|
if result.SampleRate > 0 {
|
||||||
|
result.Duration = float64(result.TotalSamples) / float64(result.SampleRate)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Read min/max frame size and block size for additional analysis
|
||||||
|
// Min block size (bytes 0-1)
|
||||||
|
// Max block size (bytes 2-3)
|
||||||
|
// These can give us hints about encoding quality
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Analyze spectrum and calculate real audio metrics
|
||||||
|
spectrum, err := AnalyzeSpectrum(filepath)
|
||||||
|
if err != nil {
|
||||||
|
// Log error but continue
|
||||||
|
fmt.Printf("Warning: failed to analyze spectrum: %v\n", err)
|
||||||
|
} else {
|
||||||
|
result.Spectrum = spectrum
|
||||||
|
// Calculate dynamic range, peak, and RMS from decoded samples
|
||||||
|
calculateRealAudioMetrics(result, filepath)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Set bit depth
|
||||||
|
result.BitDepth = fmt.Sprintf("%d-bit", result.BitsPerSample)
|
||||||
|
|
||||||
|
return result, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// calculateRealAudioMetrics calculates actual dynamic range, peak, and RMS from decoded audio
|
||||||
|
func calculateRealAudioMetrics(result *AnalysisResult, filepath string) {
|
||||||
|
// Decode FLAC to get actual samples
|
||||||
|
samples, err := decodeFLACForMetrics(filepath)
|
||||||
|
if err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
// Calculate peak amplitude
|
||||||
|
var peak float64
|
||||||
|
var sumSquares float64
|
||||||
|
|
||||||
|
for _, sample := range samples {
|
||||||
|
absVal := sample
|
||||||
|
if absVal < 0 {
|
||||||
|
absVal = -absVal
|
||||||
|
}
|
||||||
|
if absVal > peak {
|
||||||
|
peak = absVal
|
||||||
|
}
|
||||||
|
sumSquares += sample * sample
|
||||||
|
}
|
||||||
|
|
||||||
|
// Convert peak to dB (reference: 1.0 = 0 dBFS)
|
||||||
|
peakDB := 20.0 * math.Log10(peak)
|
||||||
|
result.PeakAmplitude = peakDB
|
||||||
|
|
||||||
|
// Calculate RMS (Root Mean Square)
|
||||||
|
rms := math.Sqrt(sumSquares / float64(len(samples)))
|
||||||
|
rmsDB := 20.0 * math.Log10(rms)
|
||||||
|
result.RMSLevel = rmsDB
|
||||||
|
|
||||||
|
// Dynamic range is the difference between peak and RMS
|
||||||
|
result.DynamicRange = peakDB - rmsDB
|
||||||
|
}
|
||||||
|
|
||||||
|
// decodeFLACForMetrics decodes FLAC file and returns normalized samples for metric calculation
|
||||||
|
func decodeFLACForMetrics(filepath string) ([]float64, error) {
|
||||||
|
stream, err := mewflac.ParseFile(filepath)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
defer stream.Close()
|
||||||
|
|
||||||
|
// Limit samples to prevent memory issues (10 million samples = ~3.8 minutes at 44.1kHz)
|
||||||
|
maxSamples := 10000000
|
||||||
|
samples := make([]float64, 0, maxSamples)
|
||||||
|
|
||||||
|
// Read all audio frames
|
||||||
|
for {
|
||||||
|
frame, err := stream.ParseNext()
|
||||||
|
if err != nil {
|
||||||
|
break
|
||||||
|
}
|
||||||
|
|
||||||
|
// Get samples from first channel (mono or left channel)
|
||||||
|
var channelSamples []int32
|
||||||
|
if len(frame.Subframes) > 0 {
|
||||||
|
channelSamples = frame.Subframes[0].Samples
|
||||||
|
}
|
||||||
|
|
||||||
|
// Normalize samples to -1.0 to 1.0 range
|
||||||
|
maxVal := float64(int64(1) << (stream.Info.BitsPerSample - 1))
|
||||||
|
for _, sample := range channelSamples {
|
||||||
|
if len(samples) >= maxSamples {
|
||||||
|
return samples, nil
|
||||||
|
}
|
||||||
|
normalized := float64(sample) / maxVal
|
||||||
|
samples = append(samples, normalized)
|
||||||
|
}
|
||||||
|
|
||||||
|
if len(samples) >= maxSamples {
|
||||||
|
break
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return samples, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func GetFileSize(filepath string) (int64, error) {
|
||||||
|
info, err := os.Stat(filepath)
|
||||||
|
if err != nil {
|
||||||
|
return 0, err
|
||||||
|
}
|
||||||
|
return info.Size(), nil
|
||||||
|
}
|
||||||
@@ -0,0 +1,176 @@
|
|||||||
|
package backend
|
||||||
|
|
||||||
|
import (
|
||||||
|
"fmt"
|
||||||
|
"io"
|
||||||
|
"net/http"
|
||||||
|
"os"
|
||||||
|
"path/filepath"
|
||||||
|
"strings"
|
||||||
|
"time"
|
||||||
|
)
|
||||||
|
|
||||||
|
const (
|
||||||
|
// Spotify image size codes
|
||||||
|
spotifySize640 = "ab67616d0000b273" // 640x640
|
||||||
|
spotifySizeMax = "ab67616d000082c1" // Max resolution
|
||||||
|
)
|
||||||
|
|
||||||
|
// CoverDownloadRequest represents a request to download cover art
|
||||||
|
type CoverDownloadRequest struct {
|
||||||
|
CoverURL string `json:"cover_url"`
|
||||||
|
TrackName string `json:"track_name"`
|
||||||
|
ArtistName string `json:"artist_name"`
|
||||||
|
OutputDir string `json:"output_dir"`
|
||||||
|
FilenameFormat string `json:"filename_format"`
|
||||||
|
TrackNumber bool `json:"track_number"`
|
||||||
|
Position int `json:"position"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// CoverDownloadResponse represents the response from cover download
|
||||||
|
type CoverDownloadResponse struct {
|
||||||
|
Success bool `json:"success"`
|
||||||
|
Message string `json:"message"`
|
||||||
|
File string `json:"file,omitempty"`
|
||||||
|
Error string `json:"error,omitempty"`
|
||||||
|
AlreadyExists bool `json:"already_exists,omitempty"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// CoverClient handles cover art downloading
|
||||||
|
type CoverClient struct {
|
||||||
|
httpClient *http.Client
|
||||||
|
}
|
||||||
|
|
||||||
|
// NewCoverClient creates a new cover client
|
||||||
|
func NewCoverClient() *CoverClient {
|
||||||
|
return &CoverClient{
|
||||||
|
httpClient: &http.Client{Timeout: 30 * time.Second},
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// buildCoverFilename builds the cover filename based on settings (same as track filename)
|
||||||
|
func buildCoverFilename(trackName, artistName, filenameFormat string, includeTrackNumber bool, position int) string {
|
||||||
|
safeTitle := sanitizeFilename(trackName)
|
||||||
|
safeArtist := sanitizeFilename(artistName)
|
||||||
|
|
||||||
|
var filename string
|
||||||
|
|
||||||
|
// Build base filename based on format
|
||||||
|
switch filenameFormat {
|
||||||
|
case "artist-title":
|
||||||
|
filename = fmt.Sprintf("%s - %s", safeArtist, safeTitle)
|
||||||
|
case "title":
|
||||||
|
filename = safeTitle
|
||||||
|
default: // "title-artist"
|
||||||
|
filename = fmt.Sprintf("%s - %s", safeTitle, safeArtist)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Add track number prefix if enabled
|
||||||
|
if includeTrackNumber && position > 0 {
|
||||||
|
filename = fmt.Sprintf("%02d. %s", position, filename)
|
||||||
|
}
|
||||||
|
|
||||||
|
return filename + ".jpg"
|
||||||
|
}
|
||||||
|
|
||||||
|
// getMaxResolutionURL converts a Spotify cover URL to max resolution
|
||||||
|
// Falls back to original URL if max resolution is not available
|
||||||
|
func (c *CoverClient) getMaxResolutionURL(coverURL string) string {
|
||||||
|
// Try to convert to max resolution
|
||||||
|
if strings.Contains(coverURL, spotifySize640) {
|
||||||
|
maxURL := strings.Replace(coverURL, spotifySize640, spotifySizeMax, 1)
|
||||||
|
// Check if max resolution URL is available
|
||||||
|
resp, err := c.httpClient.Head(maxURL)
|
||||||
|
if err == nil && resp.StatusCode == http.StatusOK {
|
||||||
|
return maxURL
|
||||||
|
}
|
||||||
|
}
|
||||||
|
// Return original URL as fallback
|
||||||
|
return coverURL
|
||||||
|
}
|
||||||
|
|
||||||
|
// DownloadCover downloads cover art for a single track
|
||||||
|
func (c *CoverClient) DownloadCover(req CoverDownloadRequest) (*CoverDownloadResponse, error) {
|
||||||
|
if req.CoverURL == "" {
|
||||||
|
return &CoverDownloadResponse{
|
||||||
|
Success: false,
|
||||||
|
Error: "Cover URL is required",
|
||||||
|
}, fmt.Errorf("cover URL is required")
|
||||||
|
}
|
||||||
|
|
||||||
|
// Create output directory if it doesn't exist
|
||||||
|
outputDir := req.OutputDir
|
||||||
|
if outputDir == "" {
|
||||||
|
outputDir = GetDefaultMusicPath()
|
||||||
|
}
|
||||||
|
|
||||||
|
if err := os.MkdirAll(outputDir, 0755); err != nil {
|
||||||
|
return &CoverDownloadResponse{
|
||||||
|
Success: false,
|
||||||
|
Error: fmt.Sprintf("failed to create output directory: %v", err),
|
||||||
|
}, err
|
||||||
|
}
|
||||||
|
|
||||||
|
// Generate filename using same format as track
|
||||||
|
filenameFormat := req.FilenameFormat
|
||||||
|
if filenameFormat == "" {
|
||||||
|
filenameFormat = "title-artist" // default
|
||||||
|
}
|
||||||
|
filename := buildCoverFilename(req.TrackName, req.ArtistName, filenameFormat, req.TrackNumber, req.Position)
|
||||||
|
filePath := filepath.Join(outputDir, filename)
|
||||||
|
|
||||||
|
// Check if file already exists
|
||||||
|
if fileInfo, err := os.Stat(filePath); err == nil && fileInfo.Size() > 0 {
|
||||||
|
return &CoverDownloadResponse{
|
||||||
|
Success: true,
|
||||||
|
Message: "Cover file already exists",
|
||||||
|
File: filePath,
|
||||||
|
AlreadyExists: true,
|
||||||
|
}, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// Try to get max resolution URL, fallback to original
|
||||||
|
downloadURL := c.getMaxResolutionURL(req.CoverURL)
|
||||||
|
|
||||||
|
// Download cover image
|
||||||
|
resp, err := c.httpClient.Get(downloadURL)
|
||||||
|
if err != nil {
|
||||||
|
return &CoverDownloadResponse{
|
||||||
|
Success: false,
|
||||||
|
Error: fmt.Sprintf("failed to download cover: %v", err),
|
||||||
|
}, err
|
||||||
|
}
|
||||||
|
defer resp.Body.Close()
|
||||||
|
|
||||||
|
if resp.StatusCode != http.StatusOK {
|
||||||
|
return &CoverDownloadResponse{
|
||||||
|
Success: false,
|
||||||
|
Error: fmt.Sprintf("failed to download cover: HTTP %d", resp.StatusCode),
|
||||||
|
}, fmt.Errorf("HTTP %d", resp.StatusCode)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Create file
|
||||||
|
file, err := os.Create(filePath)
|
||||||
|
if err != nil {
|
||||||
|
return &CoverDownloadResponse{
|
||||||
|
Success: false,
|
||||||
|
Error: fmt.Sprintf("failed to create file: %v", err),
|
||||||
|
}, err
|
||||||
|
}
|
||||||
|
defer file.Close()
|
||||||
|
|
||||||
|
// Write content to file
|
||||||
|
_, err = io.Copy(file, resp.Body)
|
||||||
|
if err != nil {
|
||||||
|
return &CoverDownloadResponse{
|
||||||
|
Success: false,
|
||||||
|
Error: fmt.Sprintf("failed to write cover file: %v", err),
|
||||||
|
}, err
|
||||||
|
}
|
||||||
|
|
||||||
|
return &CoverDownloadResponse{
|
||||||
|
Success: true,
|
||||||
|
Message: "Cover downloaded successfully",
|
||||||
|
File: filePath,
|
||||||
|
}, nil
|
||||||
|
}
|
||||||
@@ -48,3 +48,31 @@ func SelectFolderDialog(ctx context.Context, defaultPath string) (string, error)
|
|||||||
|
|
||||||
return selectedPath, nil
|
return selectedPath, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func SelectFileDialog(ctx context.Context) (string, error) {
|
||||||
|
options := wailsRuntime.OpenDialogOptions{
|
||||||
|
Title: "Select FLAC File for Analysis",
|
||||||
|
Filters: []wailsRuntime.FileFilter{
|
||||||
|
{
|
||||||
|
DisplayName: "FLAC Audio Files (*.flac)",
|
||||||
|
Pattern: "*.flac",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
DisplayName: "All Files (*.*)",
|
||||||
|
Pattern: "*.*",
|
||||||
|
},
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
|
selectedFile, err := wailsRuntime.OpenFileDialog(ctx, options)
|
||||||
|
if err != nil {
|
||||||
|
return "", err
|
||||||
|
}
|
||||||
|
|
||||||
|
// If user cancelled, selectedFile will be empty
|
||||||
|
if selectedFile == "" {
|
||||||
|
return "", nil
|
||||||
|
}
|
||||||
|
|
||||||
|
return selectedFile, nil
|
||||||
|
}
|
||||||
|
|||||||
@@ -0,0 +1,218 @@
|
|||||||
|
package backend
|
||||||
|
|
||||||
|
import (
|
||||||
|
"encoding/base64"
|
||||||
|
"encoding/json"
|
||||||
|
"fmt"
|
||||||
|
"io"
|
||||||
|
"net/http"
|
||||||
|
"os"
|
||||||
|
"path/filepath"
|
||||||
|
"strings"
|
||||||
|
"time"
|
||||||
|
)
|
||||||
|
|
||||||
|
// LyricsLine represents a single line of lyrics
|
||||||
|
type LyricsLine struct {
|
||||||
|
StartTimeMs string `json:"startTimeMs"`
|
||||||
|
Words string `json:"words"`
|
||||||
|
EndTimeMs string `json:"endTimeMs"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// LyricsResponse represents the API response
|
||||||
|
type LyricsResponse struct {
|
||||||
|
Error bool `json:"error"`
|
||||||
|
SyncType string `json:"syncType"`
|
||||||
|
Lines []LyricsLine `json:"lines"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// LyricsDownloadRequest represents a request to download lyrics
|
||||||
|
type LyricsDownloadRequest struct {
|
||||||
|
SpotifyID string `json:"spotify_id"`
|
||||||
|
TrackName string `json:"track_name"`
|
||||||
|
ArtistName string `json:"artist_name"`
|
||||||
|
OutputDir string `json:"output_dir"`
|
||||||
|
FilenameFormat string `json:"filename_format"`
|
||||||
|
TrackNumber bool `json:"track_number"`
|
||||||
|
Position int `json:"position"`
|
||||||
|
UseAlbumTrackNumber bool `json:"use_album_track_number"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// LyricsDownloadResponse represents the response from lyrics download
|
||||||
|
type LyricsDownloadResponse struct {
|
||||||
|
Success bool `json:"success"`
|
||||||
|
Message string `json:"message"`
|
||||||
|
File string `json:"file,omitempty"`
|
||||||
|
Error string `json:"error,omitempty"`
|
||||||
|
AlreadyExists bool `json:"already_exists,omitempty"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// LyricsClient handles lyrics fetching
|
||||||
|
type LyricsClient struct {
|
||||||
|
httpClient *http.Client
|
||||||
|
}
|
||||||
|
|
||||||
|
// NewLyricsClient creates a new lyrics client
|
||||||
|
func NewLyricsClient() *LyricsClient {
|
||||||
|
return &LyricsClient{
|
||||||
|
httpClient: &http.Client{Timeout: 15 * time.Second},
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// FetchLyrics fetches lyrics from the Spotify Lyrics API
|
||||||
|
func (c *LyricsClient) FetchLyrics(spotifyID string) (*LyricsResponse, error) {
|
||||||
|
// Decode base64 API URL
|
||||||
|
apiBase, _ := base64.StdEncoding.DecodeString("aHR0cHM6Ly9zcG90aWZ5LWx5cmljcy1hcGktcGkudmVyY2VsLmFwcC8/dHJhY2tpZD0=")
|
||||||
|
url := fmt.Sprintf("%s%s", string(apiBase), spotifyID)
|
||||||
|
|
||||||
|
resp, err := c.httpClient.Get(url)
|
||||||
|
if err != nil {
|
||||||
|
return nil, fmt.Errorf("failed to fetch lyrics: %v", err)
|
||||||
|
}
|
||||||
|
defer resp.Body.Close()
|
||||||
|
|
||||||
|
body, err := io.ReadAll(resp.Body)
|
||||||
|
if err != nil {
|
||||||
|
return nil, fmt.Errorf("failed to read response: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
var lyricsResp LyricsResponse
|
||||||
|
if err := json.Unmarshal(body, &lyricsResp); err != nil {
|
||||||
|
return nil, fmt.Errorf("failed to parse lyrics response: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
if lyricsResp.Error {
|
||||||
|
return nil, fmt.Errorf("lyrics not found for this track")
|
||||||
|
}
|
||||||
|
|
||||||
|
return &lyricsResp, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// ConvertToLRC converts lyrics response to LRC format
|
||||||
|
func (c *LyricsClient) ConvertToLRC(lyrics *LyricsResponse, trackName, artistName string) string {
|
||||||
|
var sb strings.Builder
|
||||||
|
|
||||||
|
// Add metadata
|
||||||
|
sb.WriteString(fmt.Sprintf("[ti:%s]\n", trackName))
|
||||||
|
sb.WriteString(fmt.Sprintf("[ar:%s]\n", artistName))
|
||||||
|
sb.WriteString("[by:SpotiFlac]\n")
|
||||||
|
sb.WriteString("\n")
|
||||||
|
|
||||||
|
// Add lyrics lines
|
||||||
|
for _, line := range lyrics.Lines {
|
||||||
|
if line.Words == "" {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
|
||||||
|
// Convert milliseconds to LRC timestamp format [mm:ss.xx]
|
||||||
|
timestamp := msToLRCTimestamp(line.StartTimeMs)
|
||||||
|
sb.WriteString(fmt.Sprintf("%s%s\n", timestamp, line.Words))
|
||||||
|
}
|
||||||
|
|
||||||
|
return sb.String()
|
||||||
|
}
|
||||||
|
|
||||||
|
// msToLRCTimestamp converts milliseconds string to LRC timestamp format [mm:ss.xx]
|
||||||
|
func msToLRCTimestamp(msStr string) string {
|
||||||
|
var ms int64
|
||||||
|
fmt.Sscanf(msStr, "%d", &ms)
|
||||||
|
|
||||||
|
totalSeconds := ms / 1000
|
||||||
|
minutes := totalSeconds / 60
|
||||||
|
seconds := totalSeconds % 60
|
||||||
|
centiseconds := (ms % 1000) / 10
|
||||||
|
|
||||||
|
return fmt.Sprintf("[%02d:%02d.%02d]", minutes, seconds, centiseconds)
|
||||||
|
}
|
||||||
|
|
||||||
|
// buildLyricsFilename builds the lyrics filename based on settings (same as track filename)
|
||||||
|
func buildLyricsFilename(trackName, artistName, filenameFormat string, includeTrackNumber bool, position int) string {
|
||||||
|
safeTitle := sanitizeFilename(trackName)
|
||||||
|
safeArtist := sanitizeFilename(artistName)
|
||||||
|
|
||||||
|
var filename string
|
||||||
|
|
||||||
|
// Build base filename based on format
|
||||||
|
switch filenameFormat {
|
||||||
|
case "artist-title":
|
||||||
|
filename = fmt.Sprintf("%s - %s", safeArtist, safeTitle)
|
||||||
|
case "title":
|
||||||
|
filename = safeTitle
|
||||||
|
default: // "title-artist"
|
||||||
|
filename = fmt.Sprintf("%s - %s", safeTitle, safeArtist)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Add track number prefix if enabled
|
||||||
|
if includeTrackNumber && position > 0 {
|
||||||
|
filename = fmt.Sprintf("%02d. %s", position, filename)
|
||||||
|
}
|
||||||
|
|
||||||
|
return filename + ".lrc"
|
||||||
|
}
|
||||||
|
|
||||||
|
// DownloadLyrics downloads lyrics for a single track
|
||||||
|
func (c *LyricsClient) DownloadLyrics(req LyricsDownloadRequest) (*LyricsDownloadResponse, error) {
|
||||||
|
if req.SpotifyID == "" {
|
||||||
|
return &LyricsDownloadResponse{
|
||||||
|
Success: false,
|
||||||
|
Error: "Spotify ID is required",
|
||||||
|
}, fmt.Errorf("spotify ID is required")
|
||||||
|
}
|
||||||
|
|
||||||
|
// Create output directory if it doesn't exist
|
||||||
|
outputDir := req.OutputDir
|
||||||
|
if outputDir == "" {
|
||||||
|
outputDir = GetDefaultMusicPath()
|
||||||
|
}
|
||||||
|
|
||||||
|
if err := os.MkdirAll(outputDir, 0755); err != nil {
|
||||||
|
return &LyricsDownloadResponse{
|
||||||
|
Success: false,
|
||||||
|
Error: fmt.Sprintf("failed to create output directory: %v", err),
|
||||||
|
}, err
|
||||||
|
}
|
||||||
|
|
||||||
|
// Generate filename using same format as track
|
||||||
|
filenameFormat := req.FilenameFormat
|
||||||
|
if filenameFormat == "" {
|
||||||
|
filenameFormat = "title-artist" // default
|
||||||
|
}
|
||||||
|
filename := buildLyricsFilename(req.TrackName, req.ArtistName, filenameFormat, req.TrackNumber, req.Position)
|
||||||
|
filePath := filepath.Join(outputDir, filename)
|
||||||
|
|
||||||
|
// Check if file already exists
|
||||||
|
if fileInfo, err := os.Stat(filePath); err == nil && fileInfo.Size() > 0 {
|
||||||
|
return &LyricsDownloadResponse{
|
||||||
|
Success: true,
|
||||||
|
Message: "Lyrics file already exists",
|
||||||
|
File: filePath,
|
||||||
|
AlreadyExists: true,
|
||||||
|
}, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// Fetch lyrics
|
||||||
|
lyrics, err := c.FetchLyrics(req.SpotifyID)
|
||||||
|
if err != nil {
|
||||||
|
return &LyricsDownloadResponse{
|
||||||
|
Success: false,
|
||||||
|
Error: err.Error(),
|
||||||
|
}, err
|
||||||
|
}
|
||||||
|
|
||||||
|
// Convert to LRC format
|
||||||
|
lrcContent := c.ConvertToLRC(lyrics, req.TrackName, req.ArtistName)
|
||||||
|
|
||||||
|
// Write LRC file
|
||||||
|
if err := os.WriteFile(filePath, []byte(lrcContent), 0644); err != nil {
|
||||||
|
return &LyricsDownloadResponse{
|
||||||
|
Success: false,
|
||||||
|
Error: fmt.Sprintf("failed to write LRC file: %v", err),
|
||||||
|
}, err
|
||||||
|
}
|
||||||
|
|
||||||
|
return &LyricsDownloadResponse{
|
||||||
|
Success: true,
|
||||||
|
Message: "Lyrics downloaded successfully",
|
||||||
|
File: filePath,
|
||||||
|
}, nil
|
||||||
|
}
|
||||||
+6
-1
@@ -168,9 +168,14 @@ func CheckISRCExists(outputDir string, targetISRC string) (string, bool) {
|
|||||||
|
|
||||||
filepath := fmt.Sprintf("%s/%s", outputDir, filename)
|
filepath := fmt.Sprintf("%s/%s", outputDir, filename)
|
||||||
|
|
||||||
// Read ISRC from file
|
// Read ISRC from file (this will fail for corrupted files)
|
||||||
isrc, err := ReadISRCFromFile(filepath)
|
isrc, err := ReadISRCFromFile(filepath)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
// File is corrupted or unreadable, delete it
|
||||||
|
fmt.Printf("Removing corrupted/unreadable file: %s (error: %v)\n", filepath, err)
|
||||||
|
if removeErr := os.Remove(filepath); removeErr != nil {
|
||||||
|
fmt.Printf("Warning: Failed to remove corrupted file %s: %v\n", filepath, removeErr)
|
||||||
|
}
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
+318
-1
@@ -7,6 +7,34 @@ import (
|
|||||||
"time"
|
"time"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
// DownloadStatus represents the status of a download item
|
||||||
|
type DownloadStatus string
|
||||||
|
|
||||||
|
const (
|
||||||
|
StatusQueued DownloadStatus = "queued"
|
||||||
|
StatusDownloading DownloadStatus = "downloading"
|
||||||
|
StatusCompleted DownloadStatus = "completed"
|
||||||
|
StatusFailed DownloadStatus = "failed"
|
||||||
|
StatusSkipped DownloadStatus = "skipped"
|
||||||
|
)
|
||||||
|
|
||||||
|
// DownloadItem represents a single item in the download queue
|
||||||
|
type DownloadItem struct {
|
||||||
|
ID string `json:"id"`
|
||||||
|
TrackName string `json:"track_name"`
|
||||||
|
ArtistName string `json:"artist_name"`
|
||||||
|
AlbumName string `json:"album_name"`
|
||||||
|
ISRC string `json:"isrc"`
|
||||||
|
Status DownloadStatus `json:"status"`
|
||||||
|
Progress float64 `json:"progress"` // MB downloaded
|
||||||
|
TotalSize float64 `json:"total_size"` // MB total (if known)
|
||||||
|
Speed float64 `json:"speed"` // MB/s
|
||||||
|
StartTime int64 `json:"start_time"` // Unix timestamp
|
||||||
|
EndTime int64 `json:"end_time"` // Unix timestamp
|
||||||
|
ErrorMessage string `json:"error_message"` // If failed
|
||||||
|
FilePath string `json:"file_path"` // Final file path
|
||||||
|
}
|
||||||
|
|
||||||
// Global progress tracker
|
// Global progress tracker
|
||||||
var (
|
var (
|
||||||
currentProgress float64
|
currentProgress float64
|
||||||
@@ -15,6 +43,16 @@ var (
|
|||||||
downloadingLock sync.RWMutex
|
downloadingLock sync.RWMutex
|
||||||
currentSpeed float64
|
currentSpeed float64
|
||||||
speedLock sync.RWMutex
|
speedLock sync.RWMutex
|
||||||
|
|
||||||
|
// Download queue tracking
|
||||||
|
downloadQueue []DownloadItem
|
||||||
|
downloadQueueLock sync.RWMutex
|
||||||
|
currentItemID string
|
||||||
|
currentItemLock sync.RWMutex
|
||||||
|
totalDownloaded float64
|
||||||
|
totalDownloadedLock sync.RWMutex
|
||||||
|
sessionStartTime int64
|
||||||
|
sessionStartLock sync.RWMutex
|
||||||
)
|
)
|
||||||
|
|
||||||
// ProgressInfo represents download progress information
|
// ProgressInfo represents download progress information
|
||||||
@@ -24,6 +62,19 @@ type ProgressInfo struct {
|
|||||||
SpeedMBps float64 `json:"speed_mbps"`
|
SpeedMBps float64 `json:"speed_mbps"`
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// DownloadQueueInfo represents the complete download queue state
|
||||||
|
type DownloadQueueInfo struct {
|
||||||
|
IsDownloading bool `json:"is_downloading"`
|
||||||
|
Queue []DownloadItem `json:"queue"`
|
||||||
|
CurrentSpeed float64 `json:"current_speed"` // MB/s
|
||||||
|
TotalDownloaded float64 `json:"total_downloaded"` // MB this session
|
||||||
|
SessionStartTime int64 `json:"session_start_time"` // Unix timestamp
|
||||||
|
QueuedCount int `json:"queued_count"`
|
||||||
|
CompletedCount int `json:"completed_count"`
|
||||||
|
FailedCount int `json:"failed_count"`
|
||||||
|
SkippedCount int `json:"skipped_count"`
|
||||||
|
}
|
||||||
|
|
||||||
// GetDownloadProgress returns current download progress
|
// GetDownloadProgress returns current download progress
|
||||||
func GetDownloadProgress() ProgressInfo {
|
func GetDownloadProgress() ProgressInfo {
|
||||||
downloadingLock.RLock()
|
downloadingLock.RLock()
|
||||||
@@ -80,6 +131,7 @@ type ProgressWriter struct {
|
|||||||
startTime int64
|
startTime int64
|
||||||
lastTime int64
|
lastTime int64
|
||||||
lastBytes int64
|
lastBytes int64
|
||||||
|
itemID string // Track which download item this belongs to
|
||||||
}
|
}
|
||||||
|
|
||||||
func NewProgressWriter(writer io.Writer) *ProgressWriter {
|
func NewProgressWriter(writer io.Writer) *ProgressWriter {
|
||||||
@@ -91,9 +143,17 @@ func NewProgressWriter(writer io.Writer) *ProgressWriter {
|
|||||||
startTime: now,
|
startTime: now,
|
||||||
lastTime: now,
|
lastTime: now,
|
||||||
lastBytes: 0,
|
lastBytes: 0,
|
||||||
|
itemID: "",
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// NewProgressWriterWithID creates a progress writer with an item ID for queue tracking
|
||||||
|
func NewProgressWriterWithID(writer io.Writer, itemID string) *ProgressWriter {
|
||||||
|
pw := NewProgressWriter(writer)
|
||||||
|
pw.itemID = itemID
|
||||||
|
return pw
|
||||||
|
}
|
||||||
|
|
||||||
func getCurrentTimeMillis() int64 {
|
func getCurrentTimeMillis() int64 {
|
||||||
return time.Now().UnixMilli()
|
return time.Now().UnixMilli()
|
||||||
}
|
}
|
||||||
@@ -111,8 +171,9 @@ func (pw *ProgressWriter) Write(p []byte) (int, error) {
|
|||||||
timeDiff := float64(now-pw.lastTime) / 1000.0 // seconds
|
timeDiff := float64(now-pw.lastTime) / 1000.0 // seconds
|
||||||
bytesDiff := float64(pw.total - pw.lastBytes)
|
bytesDiff := float64(pw.total - pw.lastBytes)
|
||||||
|
|
||||||
|
var speedMBps float64
|
||||||
if timeDiff > 0 {
|
if timeDiff > 0 {
|
||||||
speedMBps := (bytesDiff / (1024 * 1024)) / timeDiff
|
speedMBps = (bytesDiff / (1024 * 1024)) / timeDiff
|
||||||
SetDownloadSpeed(speedMBps)
|
SetDownloadSpeed(speedMBps)
|
||||||
fmt.Printf("\rDownloaded: %.2f MB (%.2f MB/s)", mbDownloaded, speedMBps)
|
fmt.Printf("\rDownloaded: %.2f MB (%.2f MB/s)", mbDownloaded, speedMBps)
|
||||||
} else {
|
} else {
|
||||||
@@ -122,6 +183,11 @@ func (pw *ProgressWriter) Write(p []byte) (int, error) {
|
|||||||
// Update global progress
|
// Update global progress
|
||||||
SetDownloadProgress(mbDownloaded)
|
SetDownloadProgress(mbDownloaded)
|
||||||
|
|
||||||
|
// Update individual item progress if we have an item ID
|
||||||
|
if pw.itemID != "" {
|
||||||
|
UpdateItemProgress(pw.itemID, mbDownloaded, speedMBps)
|
||||||
|
}
|
||||||
|
|
||||||
pw.lastPrinted = pw.total
|
pw.lastPrinted = pw.total
|
||||||
pw.lastTime = now
|
pw.lastTime = now
|
||||||
pw.lastBytes = pw.total
|
pw.lastBytes = pw.total
|
||||||
@@ -133,3 +199,254 @@ func (pw *ProgressWriter) Write(p []byte) (int, error) {
|
|||||||
func (pw *ProgressWriter) GetTotal() int64 {
|
func (pw *ProgressWriter) GetTotal() int64 {
|
||||||
return pw.total
|
return pw.total
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Queue management functions
|
||||||
|
|
||||||
|
// AddToQueue adds a new item to the download queue
|
||||||
|
func AddToQueue(id, trackName, artistName, albumName, isrc string) {
|
||||||
|
downloadQueueLock.Lock()
|
||||||
|
defer downloadQueueLock.Unlock()
|
||||||
|
|
||||||
|
item := DownloadItem{
|
||||||
|
ID: id,
|
||||||
|
TrackName: trackName,
|
||||||
|
ArtistName: artistName,
|
||||||
|
AlbumName: albumName,
|
||||||
|
ISRC: isrc,
|
||||||
|
Status: StatusQueued,
|
||||||
|
Progress: 0,
|
||||||
|
TotalSize: 0,
|
||||||
|
Speed: 0,
|
||||||
|
StartTime: 0,
|
||||||
|
EndTime: 0,
|
||||||
|
}
|
||||||
|
|
||||||
|
downloadQueue = append(downloadQueue, item)
|
||||||
|
|
||||||
|
// Initialize session start time if this is the first item
|
||||||
|
sessionStartLock.Lock()
|
||||||
|
if sessionStartTime == 0 {
|
||||||
|
sessionStartTime = time.Now().Unix()
|
||||||
|
}
|
||||||
|
sessionStartLock.Unlock()
|
||||||
|
}
|
||||||
|
|
||||||
|
// StartDownloadItem marks an item as currently downloading
|
||||||
|
func StartDownloadItem(id string) {
|
||||||
|
downloadQueueLock.Lock()
|
||||||
|
defer downloadQueueLock.Unlock()
|
||||||
|
|
||||||
|
for i := range downloadQueue {
|
||||||
|
if downloadQueue[i].ID == id {
|
||||||
|
downloadQueue[i].Status = StatusDownloading
|
||||||
|
downloadQueue[i].StartTime = time.Now().Unix()
|
||||||
|
downloadQueue[i].Progress = 0
|
||||||
|
break
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
currentItemLock.Lock()
|
||||||
|
currentItemID = id
|
||||||
|
currentItemLock.Unlock()
|
||||||
|
}
|
||||||
|
|
||||||
|
// UpdateItemProgress updates the progress of the current download item
|
||||||
|
func UpdateItemProgress(id string, progress, speed float64) {
|
||||||
|
downloadQueueLock.Lock()
|
||||||
|
defer downloadQueueLock.Unlock()
|
||||||
|
|
||||||
|
for i := range downloadQueue {
|
||||||
|
if downloadQueue[i].ID == id {
|
||||||
|
downloadQueue[i].Progress = progress
|
||||||
|
downloadQueue[i].Speed = speed
|
||||||
|
break
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// CompleteDownloadItem marks an item as completed
|
||||||
|
func CompleteDownloadItem(id, filePath string, finalSize float64) {
|
||||||
|
downloadQueueLock.Lock()
|
||||||
|
defer downloadQueueLock.Unlock()
|
||||||
|
|
||||||
|
for i := range downloadQueue {
|
||||||
|
if downloadQueue[i].ID == id {
|
||||||
|
downloadQueue[i].Status = StatusCompleted
|
||||||
|
downloadQueue[i].EndTime = time.Now().Unix()
|
||||||
|
downloadQueue[i].FilePath = filePath
|
||||||
|
downloadQueue[i].Progress = finalSize
|
||||||
|
downloadQueue[i].TotalSize = finalSize
|
||||||
|
|
||||||
|
// Add to total downloaded
|
||||||
|
totalDownloadedLock.Lock()
|
||||||
|
totalDownloaded += finalSize
|
||||||
|
totalDownloadedLock.Unlock()
|
||||||
|
break
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// FailDownloadItem marks an item as failed
|
||||||
|
func FailDownloadItem(id, errorMsg string) {
|
||||||
|
downloadQueueLock.Lock()
|
||||||
|
defer downloadQueueLock.Unlock()
|
||||||
|
|
||||||
|
for i := range downloadQueue {
|
||||||
|
if downloadQueue[i].ID == id {
|
||||||
|
downloadQueue[i].Status = StatusFailed
|
||||||
|
downloadQueue[i].EndTime = time.Now().Unix()
|
||||||
|
downloadQueue[i].ErrorMessage = errorMsg
|
||||||
|
break
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// SkipDownloadItem marks an item as skipped (already exists)
|
||||||
|
func SkipDownloadItem(id, filePath string) {
|
||||||
|
downloadQueueLock.Lock()
|
||||||
|
defer downloadQueueLock.Unlock()
|
||||||
|
|
||||||
|
for i := range downloadQueue {
|
||||||
|
if downloadQueue[i].ID == id {
|
||||||
|
downloadQueue[i].Status = StatusSkipped
|
||||||
|
downloadQueue[i].EndTime = time.Now().Unix()
|
||||||
|
downloadQueue[i].FilePath = filePath
|
||||||
|
break
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// GetDownloadQueue returns the complete download queue state
|
||||||
|
func GetDownloadQueue() DownloadQueueInfo {
|
||||||
|
// Auto-reset session if all downloads are complete
|
||||||
|
ResetSessionIfComplete()
|
||||||
|
|
||||||
|
downloadQueueLock.RLock()
|
||||||
|
defer downloadQueueLock.RUnlock()
|
||||||
|
|
||||||
|
downloadingLock.RLock()
|
||||||
|
downloading := isDownloading
|
||||||
|
downloadingLock.RUnlock()
|
||||||
|
|
||||||
|
speedLock.RLock()
|
||||||
|
speed := currentSpeed
|
||||||
|
speedLock.RUnlock()
|
||||||
|
|
||||||
|
totalDownloadedLock.RLock()
|
||||||
|
total := totalDownloaded
|
||||||
|
totalDownloadedLock.RUnlock()
|
||||||
|
|
||||||
|
sessionStartLock.RLock()
|
||||||
|
sessionStart := sessionStartTime
|
||||||
|
sessionStartLock.RUnlock()
|
||||||
|
|
||||||
|
// Count statuses
|
||||||
|
var queued, completed, failed, skipped int
|
||||||
|
for _, item := range downloadQueue {
|
||||||
|
switch item.Status {
|
||||||
|
case StatusQueued:
|
||||||
|
queued++
|
||||||
|
case StatusCompleted:
|
||||||
|
completed++
|
||||||
|
case StatusFailed:
|
||||||
|
failed++
|
||||||
|
case StatusSkipped:
|
||||||
|
skipped++
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Create a copy of the queue
|
||||||
|
queueCopy := make([]DownloadItem, len(downloadQueue))
|
||||||
|
copy(queueCopy, downloadQueue)
|
||||||
|
|
||||||
|
return DownloadQueueInfo{
|
||||||
|
IsDownloading: downloading,
|
||||||
|
Queue: queueCopy,
|
||||||
|
CurrentSpeed: speed,
|
||||||
|
TotalDownloaded: total,
|
||||||
|
SessionStartTime: sessionStart,
|
||||||
|
QueuedCount: queued,
|
||||||
|
CompletedCount: completed,
|
||||||
|
FailedCount: failed,
|
||||||
|
SkippedCount: skipped,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// ClearDownloadQueue clears all completed, failed, and skipped items from the queue
|
||||||
|
func ClearDownloadQueue() {
|
||||||
|
downloadQueueLock.Lock()
|
||||||
|
defer downloadQueueLock.Unlock()
|
||||||
|
|
||||||
|
// Keep only queued and downloading items
|
||||||
|
newQueue := make([]DownloadItem, 0)
|
||||||
|
for _, item := range downloadQueue {
|
||||||
|
if item.Status == StatusQueued || item.Status == StatusDownloading {
|
||||||
|
newQueue = append(newQueue, item)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
downloadQueue = newQueue
|
||||||
|
}
|
||||||
|
|
||||||
|
// ClearAllDownloads clears the entire queue and resets session stats
|
||||||
|
func ClearAllDownloads() {
|
||||||
|
downloadQueueLock.Lock()
|
||||||
|
downloadQueue = []DownloadItem{}
|
||||||
|
downloadQueueLock.Unlock()
|
||||||
|
|
||||||
|
totalDownloadedLock.Lock()
|
||||||
|
totalDownloaded = 0
|
||||||
|
totalDownloadedLock.Unlock()
|
||||||
|
|
||||||
|
sessionStartLock.Lock()
|
||||||
|
sessionStartTime = 0
|
||||||
|
sessionStartLock.Unlock()
|
||||||
|
|
||||||
|
currentItemLock.Lock()
|
||||||
|
currentItemID = ""
|
||||||
|
currentItemLock.Unlock()
|
||||||
|
|
||||||
|
// Reset current progress and speed
|
||||||
|
SetDownloadProgress(0)
|
||||||
|
SetDownloadSpeed(0)
|
||||||
|
}
|
||||||
|
|
||||||
|
// CancelAllQueuedItems marks all queued items as skipped (cancelled)
|
||||||
|
// This is called when user stops a download or when batch download completes
|
||||||
|
func CancelAllQueuedItems() {
|
||||||
|
downloadQueueLock.Lock()
|
||||||
|
defer downloadQueueLock.Unlock()
|
||||||
|
|
||||||
|
for i := range downloadQueue {
|
||||||
|
if downloadQueue[i].Status == StatusQueued {
|
||||||
|
downloadQueue[i].Status = StatusSkipped
|
||||||
|
downloadQueue[i].EndTime = time.Now().Unix()
|
||||||
|
downloadQueue[i].ErrorMessage = "Cancelled"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// ResetSessionIfComplete resets session stats if no active or queued downloads
|
||||||
|
// Note: Does NOT clear the queue - items remain visible for history
|
||||||
|
func ResetSessionIfComplete() {
|
||||||
|
downloadQueueLock.RLock()
|
||||||
|
hasActiveOrQueued := false
|
||||||
|
for _, item := range downloadQueue {
|
||||||
|
if item.Status == StatusQueued || item.Status == StatusDownloading {
|
||||||
|
hasActiveOrQueued = true
|
||||||
|
break
|
||||||
|
}
|
||||||
|
}
|
||||||
|
downloadQueueLock.RUnlock()
|
||||||
|
|
||||||
|
// If no active or queued items, reset session stats
|
||||||
|
// But keep the queue items for history visibility
|
||||||
|
if !hasActiveOrQueued {
|
||||||
|
sessionStartLock.Lock()
|
||||||
|
sessionStartTime = 0
|
||||||
|
sessionStartLock.Unlock()
|
||||||
|
|
||||||
|
totalDownloadedLock.Lock()
|
||||||
|
totalDownloaded = 0
|
||||||
|
totalDownloadedLock.Unlock()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|||||||
@@ -0,0 +1,222 @@
|
|||||||
|
package backend
|
||||||
|
|
||||||
|
import (
|
||||||
|
"strings"
|
||||||
|
"unicode"
|
||||||
|
)
|
||||||
|
|
||||||
|
// Hiragana to Romaji mapping
|
||||||
|
var hiraganaToRomaji = map[rune]string{
|
||||||
|
'あ': "a", 'い': "i", 'う': "u", 'え': "e", 'お': "o",
|
||||||
|
'か': "ka", 'き': "ki", 'く': "ku", 'け': "ke", 'こ': "ko",
|
||||||
|
'さ': "sa", 'し': "shi", 'す': "su", 'せ': "se", 'そ': "so",
|
||||||
|
'た': "ta", 'ち': "chi", 'つ': "tsu", 'て': "te", 'と': "to",
|
||||||
|
'な': "na", 'に': "ni", 'ぬ': "nu", 'ね': "ne", 'の': "no",
|
||||||
|
'は': "ha", 'ひ': "hi", 'ふ': "fu", 'へ': "he", 'ほ': "ho",
|
||||||
|
'ま': "ma", 'み': "mi", 'む': "mu", 'め': "me", 'も': "mo",
|
||||||
|
'や': "ya", 'ゆ': "yu", 'よ': "yo",
|
||||||
|
'ら': "ra", 'り': "ri", 'る': "ru", 'れ': "re", 'ろ': "ro",
|
||||||
|
'わ': "wa", 'を': "wo", 'ん': "n",
|
||||||
|
// Dakuten (voiced)
|
||||||
|
'が': "ga", 'ぎ': "gi", 'ぐ': "gu", 'げ': "ge", 'ご': "go",
|
||||||
|
'ざ': "za", 'じ': "ji", 'ず': "zu", 'ぜ': "ze", 'ぞ': "zo",
|
||||||
|
'だ': "da", 'ぢ': "ji", 'づ': "zu", 'で': "de", 'ど': "do",
|
||||||
|
'ば': "ba", 'び': "bi", 'ぶ': "bu", 'べ': "be", 'ぼ': "bo",
|
||||||
|
// Handakuten (semi-voiced)
|
||||||
|
'ぱ': "pa", 'ぴ': "pi", 'ぷ': "pu", 'ぺ': "pe", 'ぽ': "po",
|
||||||
|
// Small characters
|
||||||
|
'ゃ': "ya", 'ゅ': "yu", 'ょ': "yo",
|
||||||
|
'っ': "", // Double consonant marker
|
||||||
|
'ぁ': "a", 'ぃ': "i", 'ぅ': "u", 'ぇ': "e", 'ぉ': "o",
|
||||||
|
}
|
||||||
|
|
||||||
|
// Katakana to Romaji mapping
|
||||||
|
var katakanaToRomaji = map[rune]string{
|
||||||
|
'ア': "a", 'イ': "i", 'ウ': "u", 'エ': "e", 'オ': "o",
|
||||||
|
'カ': "ka", 'キ': "ki", 'ク': "ku", 'ケ': "ke", 'コ': "ko",
|
||||||
|
'サ': "sa", 'シ': "shi", 'ス': "su", 'セ': "se", 'ソ': "so",
|
||||||
|
'タ': "ta", 'チ': "chi", 'ツ': "tsu", 'テ': "te", 'ト': "to",
|
||||||
|
'ナ': "na", 'ニ': "ni", 'ヌ': "nu", 'ネ': "ne", 'ノ': "no",
|
||||||
|
'ハ': "ha", 'ヒ': "hi", 'フ': "fu", 'ヘ': "he", 'ホ': "ho",
|
||||||
|
'マ': "ma", 'ミ': "mi", 'ム': "mu", 'メ': "me", 'モ': "mo",
|
||||||
|
'ヤ': "ya", 'ユ': "yu", 'ヨ': "yo",
|
||||||
|
'ラ': "ra", 'リ': "ri", 'ル': "ru", 'レ': "re", 'ロ': "ro",
|
||||||
|
'ワ': "wa", 'ヲ': "wo", 'ン': "n",
|
||||||
|
// Dakuten (voiced)
|
||||||
|
'ガ': "ga", 'ギ': "gi", 'グ': "gu", 'ゲ': "ge", 'ゴ': "go",
|
||||||
|
'ザ': "za", 'ジ': "ji", 'ズ': "zu", 'ゼ': "ze", 'ゾ': "zo",
|
||||||
|
'ダ': "da", 'ヂ': "ji", 'ヅ': "zu", 'デ': "de", 'ド': "do",
|
||||||
|
'バ': "ba", 'ビ': "bi", 'ブ': "bu", 'ベ': "be", 'ボ': "bo",
|
||||||
|
// Handakuten (semi-voiced)
|
||||||
|
'パ': "pa", 'ピ': "pi", 'プ': "pu", 'ペ': "pe", 'ポ': "po",
|
||||||
|
// Small characters
|
||||||
|
'ャ': "ya", 'ュ': "yu", 'ョ': "yo",
|
||||||
|
'ッ': "", // Double consonant marker
|
||||||
|
'ァ': "a", 'ィ': "i", 'ゥ': "u", 'ェ': "e", 'ォ': "o",
|
||||||
|
// Extended katakana
|
||||||
|
'ー': "", // Long vowel mark
|
||||||
|
'ヴ': "vu",
|
||||||
|
}
|
||||||
|
|
||||||
|
// Combination mappings for きゃ, しゃ, etc.
|
||||||
|
var combinationHiragana = map[string]string{
|
||||||
|
"きゃ": "kya", "きゅ": "kyu", "きょ": "kyo",
|
||||||
|
"しゃ": "sha", "しゅ": "shu", "しょ": "sho",
|
||||||
|
"ちゃ": "cha", "ちゅ": "chu", "ちょ": "cho",
|
||||||
|
"にゃ": "nya", "にゅ": "nyu", "にょ": "nyo",
|
||||||
|
"ひゃ": "hya", "ひゅ": "hyu", "ひょ": "hyo",
|
||||||
|
"みゃ": "mya", "みゅ": "myu", "みょ": "myo",
|
||||||
|
"りゃ": "rya", "りゅ": "ryu", "りょ": "ryo",
|
||||||
|
"ぎゃ": "gya", "ぎゅ": "gyu", "ぎょ": "gyo",
|
||||||
|
"じゃ": "ja", "じゅ": "ju", "じょ": "jo",
|
||||||
|
"びゃ": "bya", "びゅ": "byu", "びょ": "byo",
|
||||||
|
"ぴゃ": "pya", "ぴゅ": "pyu", "ぴょ": "pyo",
|
||||||
|
}
|
||||||
|
|
||||||
|
var combinationKatakana = map[string]string{
|
||||||
|
"キャ": "kya", "キュ": "kyu", "キョ": "kyo",
|
||||||
|
"シャ": "sha", "シュ": "shu", "ショ": "sho",
|
||||||
|
"チャ": "cha", "チュ": "chu", "チョ": "cho",
|
||||||
|
"ニャ": "nya", "ニュ": "nyu", "ニョ": "nyo",
|
||||||
|
"ヒャ": "hya", "ヒュ": "hyu", "ヒョ": "hyo",
|
||||||
|
"ミャ": "mya", "ミュ": "myu", "ミョ": "myo",
|
||||||
|
"リャ": "rya", "リュ": "ryu", "リョ": "ryo",
|
||||||
|
"ギャ": "gya", "ギュ": "gyu", "ギョ": "gyo",
|
||||||
|
"ジャ": "ja", "ジュ": "ju", "ジョ": "jo",
|
||||||
|
"ビャ": "bya", "ビュ": "byu", "ビョ": "byo",
|
||||||
|
"ピャ": "pya", "ピュ": "pyu", "ピョ": "pyo",
|
||||||
|
// Extended combinations
|
||||||
|
"ティ": "ti", "ディ": "di", "トゥ": "tu", "ドゥ": "du",
|
||||||
|
"ファ": "fa", "フィ": "fi", "フェ": "fe", "フォ": "fo",
|
||||||
|
"ウィ": "wi", "ウェ": "we", "ウォ": "wo",
|
||||||
|
}
|
||||||
|
|
||||||
|
// ContainsJapanese checks if a string contains Japanese characters
|
||||||
|
func ContainsJapanese(s string) bool {
|
||||||
|
for _, r := range s {
|
||||||
|
if isHiragana(r) || isKatakana(r) || isKanji(r) {
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
|
||||||
|
func isHiragana(r rune) bool {
|
||||||
|
return r >= 0x3040 && r <= 0x309F
|
||||||
|
}
|
||||||
|
|
||||||
|
func isKatakana(r rune) bool {
|
||||||
|
return r >= 0x30A0 && r <= 0x30FF
|
||||||
|
}
|
||||||
|
|
||||||
|
func isKanji(r rune) bool {
|
||||||
|
return (r >= 0x4E00 && r <= 0x9FFF) || // CJK Unified Ideographs
|
||||||
|
(r >= 0x3400 && r <= 0x4DBF) // CJK Unified Ideographs Extension A
|
||||||
|
}
|
||||||
|
|
||||||
|
// JapaneseToRomaji converts Japanese text (hiragana/katakana) to romaji
|
||||||
|
// Note: Kanji cannot be converted without a dictionary, so they are kept as-is
|
||||||
|
func JapaneseToRomaji(text string) string {
|
||||||
|
if !ContainsJapanese(text) {
|
||||||
|
return text
|
||||||
|
}
|
||||||
|
|
||||||
|
var result strings.Builder
|
||||||
|
runes := []rune(text)
|
||||||
|
i := 0
|
||||||
|
|
||||||
|
for i < len(runes) {
|
||||||
|
// Check for っ/ッ (double consonant)
|
||||||
|
if i < len(runes)-1 && (runes[i] == 'っ' || runes[i] == 'ッ') {
|
||||||
|
nextRomaji := ""
|
||||||
|
if romaji, ok := hiraganaToRomaji[runes[i+1]]; ok {
|
||||||
|
nextRomaji = romaji
|
||||||
|
} else if romaji, ok := katakanaToRomaji[runes[i+1]]; ok {
|
||||||
|
nextRomaji = romaji
|
||||||
|
}
|
||||||
|
if len(nextRomaji) > 0 {
|
||||||
|
result.WriteByte(nextRomaji[0]) // Double the first consonant
|
||||||
|
}
|
||||||
|
i++
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
|
||||||
|
// Check for two-character combinations
|
||||||
|
if i < len(runes)-1 {
|
||||||
|
combo := string(runes[i : i+2])
|
||||||
|
if romaji, ok := combinationHiragana[combo]; ok {
|
||||||
|
result.WriteString(romaji)
|
||||||
|
i += 2
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
if romaji, ok := combinationKatakana[combo]; ok {
|
||||||
|
result.WriteString(romaji)
|
||||||
|
i += 2
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Single character conversion
|
||||||
|
r := runes[i]
|
||||||
|
if romaji, ok := hiraganaToRomaji[r]; ok {
|
||||||
|
result.WriteString(romaji)
|
||||||
|
} else if romaji, ok := katakanaToRomaji[r]; ok {
|
||||||
|
result.WriteString(romaji)
|
||||||
|
} else if isKanji(r) {
|
||||||
|
// Keep kanji as-is (would need dictionary for proper conversion)
|
||||||
|
result.WriteRune(r)
|
||||||
|
} else {
|
||||||
|
// Keep other characters (punctuation, spaces, etc.)
|
||||||
|
result.WriteRune(r)
|
||||||
|
}
|
||||||
|
i++
|
||||||
|
}
|
||||||
|
|
||||||
|
return result.String()
|
||||||
|
}
|
||||||
|
|
||||||
|
// BuildSearchQuery creates a search query from track name and artist
|
||||||
|
// Converts Japanese to romaji if present
|
||||||
|
func BuildSearchQuery(trackName, artistName string) string {
|
||||||
|
// Convert Japanese to romaji
|
||||||
|
trackRomaji := JapaneseToRomaji(trackName)
|
||||||
|
artistRomaji := JapaneseToRomaji(artistName)
|
||||||
|
|
||||||
|
// Clean up the query - remove special characters that might interfere with search
|
||||||
|
trackClean := cleanSearchQuery(trackRomaji)
|
||||||
|
artistClean := cleanSearchQuery(artistRomaji)
|
||||||
|
|
||||||
|
return strings.TrimSpace(artistClean + " " + trackClean)
|
||||||
|
}
|
||||||
|
|
||||||
|
// cleanSearchQuery removes special characters that might interfere with search
|
||||||
|
func cleanSearchQuery(s string) string {
|
||||||
|
var result strings.Builder
|
||||||
|
for _, r := range s {
|
||||||
|
if unicode.IsLetter(r) || unicode.IsNumber(r) || unicode.IsSpace(r) {
|
||||||
|
result.WriteRune(r)
|
||||||
|
} else if r == '-' || r == '\'' {
|
||||||
|
result.WriteRune(r)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return strings.TrimSpace(result.String())
|
||||||
|
}
|
||||||
|
|
||||||
|
// cleanToASCII removes all non-ASCII characters and keeps only letters, numbers, spaces
|
||||||
|
// This is useful for creating search queries that work better with Tidal's search
|
||||||
|
func cleanToASCII(s string) string {
|
||||||
|
var result strings.Builder
|
||||||
|
for _, r := range s {
|
||||||
|
// Keep only ASCII letters, numbers, spaces, and basic punctuation
|
||||||
|
if (r >= 'a' && r <= 'z') || (r >= 'A' && r <= 'Z') ||
|
||||||
|
(r >= '0' && r <= '9') || r == ' ' || r == '-' || r == '\'' {
|
||||||
|
result.WriteRune(r)
|
||||||
|
} else if r == ',' || r == '.' {
|
||||||
|
// Convert punctuation to space
|
||||||
|
result.WriteRune(' ')
|
||||||
|
}
|
||||||
|
}
|
||||||
|
// Clean up multiple spaces
|
||||||
|
cleaned := strings.Join(strings.Fields(result.String()), " ")
|
||||||
|
return strings.TrimSpace(cleaned)
|
||||||
|
}
|
||||||
@@ -22,6 +22,19 @@ type SongLinkURLs struct {
|
|||||||
AmazonURL string `json:"amazon_url"`
|
AmazonURL string `json:"amazon_url"`
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// TrackAvailability represents the availability of a track on different platforms
|
||||||
|
type TrackAvailability struct {
|
||||||
|
SpotifyID string `json:"spotify_id"`
|
||||||
|
Tidal bool `json:"tidal"`
|
||||||
|
Deezer bool `json:"deezer"`
|
||||||
|
Amazon bool `json:"amazon"`
|
||||||
|
Qobuz bool `json:"qobuz"`
|
||||||
|
TidalURL string `json:"tidal_url,omitempty"`
|
||||||
|
DeezerURL string `json:"deezer_url,omitempty"`
|
||||||
|
AmazonURL string `json:"amazon_url,omitempty"`
|
||||||
|
QobuzURL string `json:"qobuz_url,omitempty"`
|
||||||
|
}
|
||||||
|
|
||||||
func NewSongLinkClient() *SongLinkClient {
|
func NewSongLinkClient() *SongLinkClient {
|
||||||
return &SongLinkClient{
|
return &SongLinkClient{
|
||||||
client: &http.Client{
|
client: &http.Client{
|
||||||
@@ -148,3 +161,152 @@ func (s *SongLinkClient) GetAllURLsFromSpotify(spotifyTrackID string) (*SongLink
|
|||||||
|
|
||||||
return urls, nil
|
return urls, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// CheckTrackAvailability checks the availability of a track on different platforms
|
||||||
|
func (s *SongLinkClient) CheckTrackAvailability(spotifyTrackID string, isrc string) (*TrackAvailability, error) {
|
||||||
|
// Rate limiting: max 10 requests per minute (song.link API limit)
|
||||||
|
now := time.Now()
|
||||||
|
if now.Sub(s.apiCallResetTime) >= time.Minute {
|
||||||
|
s.apiCallCount = 0
|
||||||
|
s.apiCallResetTime = now
|
||||||
|
}
|
||||||
|
|
||||||
|
// If we've hit the limit, wait until the next minute
|
||||||
|
if s.apiCallCount >= 9 {
|
||||||
|
waitTime := time.Minute - now.Sub(s.apiCallResetTime)
|
||||||
|
if waitTime > 0 {
|
||||||
|
fmt.Printf("Rate limit reached, waiting %v...\n", waitTime.Round(time.Second))
|
||||||
|
time.Sleep(waitTime)
|
||||||
|
s.apiCallCount = 0
|
||||||
|
s.apiCallResetTime = time.Now()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Add delay between requests (7 seconds to be safe)
|
||||||
|
if !s.lastAPICallTime.IsZero() {
|
||||||
|
timeSinceLastCall := now.Sub(s.lastAPICallTime)
|
||||||
|
minDelay := 7 * time.Second
|
||||||
|
if timeSinceLastCall < minDelay {
|
||||||
|
waitTime := minDelay - timeSinceLastCall
|
||||||
|
fmt.Printf("Rate limiting: waiting %v...\n", waitTime.Round(time.Second))
|
||||||
|
time.Sleep(waitTime)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Decode base64 API URL
|
||||||
|
spotifyBase, _ := base64.StdEncoding.DecodeString("aHR0cHM6Ly9vcGVuLnNwb3RpZnkuY29tL3RyYWNrLw==")
|
||||||
|
spotifyURL := fmt.Sprintf("%s%s", string(spotifyBase), spotifyTrackID)
|
||||||
|
|
||||||
|
apiBase, _ := base64.StdEncoding.DecodeString("aHR0cHM6Ly9hcGkuc29uZy5saW5rL3YxLWFscGhhLjEvbGlua3M/dXJsPQ==")
|
||||||
|
apiURL := fmt.Sprintf("%s%s", string(apiBase), url.QueryEscape(spotifyURL))
|
||||||
|
|
||||||
|
req, err := http.NewRequest("GET", apiURL, nil)
|
||||||
|
if err != nil {
|
||||||
|
return nil, fmt.Errorf("failed to create request: %w", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
fmt.Printf("Checking availability for track: %s\n", spotifyTrackID)
|
||||||
|
|
||||||
|
// Retry logic for rate limit errors
|
||||||
|
maxRetries := 3
|
||||||
|
var resp *http.Response
|
||||||
|
for i := 0; i < maxRetries; i++ {
|
||||||
|
resp, err = s.client.Do(req)
|
||||||
|
if err != nil {
|
||||||
|
return nil, fmt.Errorf("failed to check availability: %w", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Update rate limit tracking
|
||||||
|
s.lastAPICallTime = time.Now()
|
||||||
|
s.apiCallCount++
|
||||||
|
|
||||||
|
if resp.StatusCode == 429 {
|
||||||
|
resp.Body.Close()
|
||||||
|
if i < maxRetries-1 {
|
||||||
|
waitTime := 15 * time.Second
|
||||||
|
fmt.Printf("Rate limited by API, waiting %v before retry...\n", waitTime)
|
||||||
|
time.Sleep(waitTime)
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
return nil, fmt.Errorf("API rate limit exceeded after %d retries", maxRetries)
|
||||||
|
}
|
||||||
|
|
||||||
|
if resp.StatusCode != 200 {
|
||||||
|
resp.Body.Close()
|
||||||
|
return nil, fmt.Errorf("API returned status %d", resp.StatusCode)
|
||||||
|
}
|
||||||
|
|
||||||
|
break
|
||||||
|
}
|
||||||
|
defer resp.Body.Close()
|
||||||
|
|
||||||
|
var songLinkResp struct {
|
||||||
|
LinksByPlatform map[string]struct {
|
||||||
|
URL string `json:"url"`
|
||||||
|
} `json:"linksByPlatform"`
|
||||||
|
}
|
||||||
|
if err := json.NewDecoder(resp.Body).Decode(&songLinkResp); err != nil {
|
||||||
|
return nil, fmt.Errorf("failed to decode response: %w", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
availability := &TrackAvailability{
|
||||||
|
SpotifyID: spotifyTrackID,
|
||||||
|
}
|
||||||
|
|
||||||
|
// Check Tidal
|
||||||
|
if tidalLink, ok := songLinkResp.LinksByPlatform["tidal"]; ok && tidalLink.URL != "" {
|
||||||
|
availability.Tidal = true
|
||||||
|
availability.TidalURL = tidalLink.URL
|
||||||
|
}
|
||||||
|
|
||||||
|
// Check Deezer
|
||||||
|
if deezerLink, ok := songLinkResp.LinksByPlatform["deezer"]; ok && deezerLink.URL != "" {
|
||||||
|
availability.Deezer = true
|
||||||
|
availability.DeezerURL = deezerLink.URL
|
||||||
|
}
|
||||||
|
|
||||||
|
// Check Amazon
|
||||||
|
if amazonLink, ok := songLinkResp.LinksByPlatform["amazonMusic"]; ok && amazonLink.URL != "" {
|
||||||
|
availability.Amazon = true
|
||||||
|
availability.AmazonURL = amazonLink.URL
|
||||||
|
}
|
||||||
|
|
||||||
|
// Check Qobuz using ISRC (song.link doesn't support Qobuz)
|
||||||
|
if isrc != "" {
|
||||||
|
qobuzAvailable := checkQobuzAvailability(isrc)
|
||||||
|
availability.Qobuz = qobuzAvailable
|
||||||
|
}
|
||||||
|
|
||||||
|
return availability, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// checkQobuzAvailability checks if a track is available on Qobuz using ISRC
|
||||||
|
func checkQobuzAvailability(isrc string) bool {
|
||||||
|
client := &http.Client{Timeout: 10 * time.Second}
|
||||||
|
appID := "798273057"
|
||||||
|
|
||||||
|
// Decode base64 API URL
|
||||||
|
apiBase, _ := base64.StdEncoding.DecodeString("aHR0cHM6Ly93d3cucW9idXouY29tL2FwaS5qc29uLzAuMi90cmFjay9zZWFyY2g/cXVlcnk9")
|
||||||
|
searchURL := fmt.Sprintf("%s%s&limit=1&app_id=%s", string(apiBase), isrc, appID)
|
||||||
|
|
||||||
|
resp, err := client.Get(searchURL)
|
||||||
|
if err != nil {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
defer resp.Body.Close()
|
||||||
|
|
||||||
|
if resp.StatusCode != 200 {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
|
||||||
|
var searchResp struct {
|
||||||
|
Tracks struct {
|
||||||
|
Total int `json:"total"`
|
||||||
|
} `json:"tracks"`
|
||||||
|
}
|
||||||
|
if err := json.NewDecoder(resp.Body).Decode(&searchResp); err != nil {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
|
||||||
|
return searchResp.Tracks.Total > 0
|
||||||
|
}
|
||||||
|
|||||||
@@ -0,0 +1,195 @@
|
|||||||
|
package backend
|
||||||
|
|
||||||
|
import (
|
||||||
|
"fmt"
|
||||||
|
"math"
|
||||||
|
"math/cmplx"
|
||||||
|
|
||||||
|
"github.com/mewkiz/flac"
|
||||||
|
)
|
||||||
|
|
||||||
|
// SpectrumData contains frequency spectrum information
|
||||||
|
type SpectrumData struct {
|
||||||
|
TimeSlices []TimeSlice `json:"time_slices"`
|
||||||
|
SampleRate int `json:"sample_rate"`
|
||||||
|
FreqBins int `json:"freq_bins"`
|
||||||
|
Duration float64 `json:"duration"`
|
||||||
|
MaxFreq float64 `json:"max_freq"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// TimeSlice represents spectrum data at a point in time
|
||||||
|
type TimeSlice struct {
|
||||||
|
Time float64 `json:"time"`
|
||||||
|
Magnitudes []float64 `json:"magnitudes"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// AnalyzeSpectrum decodes FLAC file and performs FFT analysis
|
||||||
|
func AnalyzeSpectrum(filepath string) (*SpectrumData, error) {
|
||||||
|
// Open FLAC file
|
||||||
|
stream, err := flac.ParseFile(filepath)
|
||||||
|
if err != nil {
|
||||||
|
return nil, fmt.Errorf("failed to parse FLAC: %w", err)
|
||||||
|
}
|
||||||
|
defer stream.Close()
|
||||||
|
|
||||||
|
info := stream.Info
|
||||||
|
sampleRate := int(info.SampleRate)
|
||||||
|
channels := int(info.NChannels)
|
||||||
|
|
||||||
|
// Read audio samples
|
||||||
|
samples, err := readSamples(stream, channels)
|
||||||
|
if err != nil {
|
||||||
|
return nil, fmt.Errorf("failed to read samples: %w", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
if len(samples) == 0 {
|
||||||
|
return nil, fmt.Errorf("no audio samples found")
|
||||||
|
}
|
||||||
|
|
||||||
|
// Calculate spectrum
|
||||||
|
return calculateSpectrum(samples, sampleRate), nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// readSamples reads and decodes audio samples from FLAC stream
|
||||||
|
func readSamples(stream *flac.Stream, channels int) ([]float64, error) {
|
||||||
|
var allSamples []float64
|
||||||
|
maxSamples := 10 * 1024 * 1024 // Limit to ~10 million samples to avoid memory issues
|
||||||
|
|
||||||
|
// Decode frames
|
||||||
|
for {
|
||||||
|
frame, err := stream.ParseNext()
|
||||||
|
if err != nil {
|
||||||
|
// End of stream
|
||||||
|
break
|
||||||
|
}
|
||||||
|
|
||||||
|
// Convert samples to float64 and mix channels to mono
|
||||||
|
for i := 0; i < frame.Subframes[0].NSamples; i++ {
|
||||||
|
var sample float64
|
||||||
|
|
||||||
|
// Mix all channels to mono by averaging
|
||||||
|
for ch := 0; ch < channels; ch++ {
|
||||||
|
sample += float64(frame.Subframes[ch].Samples[i])
|
||||||
|
}
|
||||||
|
sample /= float64(channels)
|
||||||
|
|
||||||
|
allSamples = append(allSamples, sample)
|
||||||
|
|
||||||
|
// Limit sample count
|
||||||
|
if len(allSamples) >= maxSamples {
|
||||||
|
return allSamples, nil
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return allSamples, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// calculateSpectrum performs FFT analysis on audio samples
|
||||||
|
func calculateSpectrum(samples []float64, sampleRate int) *SpectrumData {
|
||||||
|
fftSize := 8192
|
||||||
|
numTimeSlices := 300
|
||||||
|
|
||||||
|
duration := float64(len(samples)) / float64(sampleRate)
|
||||||
|
|
||||||
|
samplesPerSlice := len(samples) / numTimeSlices
|
||||||
|
if samplesPerSlice < fftSize {
|
||||||
|
samplesPerSlice = fftSize
|
||||||
|
numTimeSlices = len(samples) / fftSize
|
||||||
|
}
|
||||||
|
|
||||||
|
timeSlices := make([]TimeSlice, 0, numTimeSlices)
|
||||||
|
freqBins := fftSize / 2
|
||||||
|
maxFreq := float64(sampleRate) / 2.0
|
||||||
|
|
||||||
|
for i := 0; i < numTimeSlices; i++ {
|
||||||
|
startIdx := i * samplesPerSlice
|
||||||
|
if startIdx+fftSize > len(samples) {
|
||||||
|
break
|
||||||
|
}
|
||||||
|
|
||||||
|
window := samples[startIdx : startIdx+fftSize]
|
||||||
|
|
||||||
|
windowedSamples := applyHannWindow(window)
|
||||||
|
|
||||||
|
spectrum := fft(windowedSamples)
|
||||||
|
|
||||||
|
magnitudes := make([]float64, freqBins)
|
||||||
|
for j := 0; j < freqBins; j++ {
|
||||||
|
magnitude := cmplx.Abs(spectrum[j])
|
||||||
|
|
||||||
|
if magnitude < 1e-10 {
|
||||||
|
magnitude = 1e-10
|
||||||
|
}
|
||||||
|
magnitudes[j] = 20 * math.Log10(magnitude)
|
||||||
|
}
|
||||||
|
|
||||||
|
timeSlice := TimeSlice{
|
||||||
|
Time: float64(startIdx) / float64(sampleRate),
|
||||||
|
Magnitudes: magnitudes,
|
||||||
|
}
|
||||||
|
timeSlices = append(timeSlices, timeSlice)
|
||||||
|
}
|
||||||
|
|
||||||
|
return &SpectrumData{
|
||||||
|
TimeSlices: timeSlices,
|
||||||
|
SampleRate: sampleRate,
|
||||||
|
FreqBins: freqBins,
|
||||||
|
Duration: duration,
|
||||||
|
MaxFreq: maxFreq,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// applyHannWindow applies Hann window to reduce spectral leakage
|
||||||
|
func applyHannWindow(samples []float64) []float64 {
|
||||||
|
n := len(samples)
|
||||||
|
windowed := make([]float64, n)
|
||||||
|
|
||||||
|
for i := 0; i < n; i++ {
|
||||||
|
window := 0.5 * (1.0 - math.Cos(2.0*math.Pi*float64(i)/float64(n-1)))
|
||||||
|
windowed[i] = samples[i] * window
|
||||||
|
}
|
||||||
|
|
||||||
|
return windowed
|
||||||
|
}
|
||||||
|
|
||||||
|
// fft performs Fast Fourier Transform using Cooley-Tukey algorithm
|
||||||
|
func fft(samples []float64) []complex128 {
|
||||||
|
n := len(samples)
|
||||||
|
|
||||||
|
x := make([]complex128, n)
|
||||||
|
for i := 0; i < n; i++ {
|
||||||
|
x[i] = complex(samples[i], 0)
|
||||||
|
}
|
||||||
|
|
||||||
|
return fftRecursive(x)
|
||||||
|
}
|
||||||
|
|
||||||
|
// fftRecursive performs recursive FFT
|
||||||
|
func fftRecursive(x []complex128) []complex128 {
|
||||||
|
n := len(x)
|
||||||
|
|
||||||
|
if n <= 1 {
|
||||||
|
return x
|
||||||
|
}
|
||||||
|
|
||||||
|
even := make([]complex128, n/2)
|
||||||
|
odd := make([]complex128, n/2)
|
||||||
|
|
||||||
|
for i := 0; i < n/2; i++ {
|
||||||
|
even[i] = x[2*i]
|
||||||
|
odd[i] = x[2*i+1]
|
||||||
|
}
|
||||||
|
|
||||||
|
evenFFT := fftRecursive(even)
|
||||||
|
oddFFT := fftRecursive(odd)
|
||||||
|
|
||||||
|
result := make([]complex128, n)
|
||||||
|
for k := 0; k < n/2; k++ {
|
||||||
|
t := cmplx.Exp(complex(0, -2*math.Pi*float64(k)/float64(n))) * oddFFT[k]
|
||||||
|
result[k] = evenFFT[k] + t
|
||||||
|
result[k+n/2] = evenFFT[k] - t
|
||||||
|
}
|
||||||
|
|
||||||
|
return result
|
||||||
|
}
|
||||||
+68
-11
@@ -69,19 +69,31 @@ type TrackMetadata struct {
|
|||||||
SpotifyID string `json:"spotify_id,omitempty"`
|
SpotifyID string `json:"spotify_id,omitempty"`
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// ArtistSimple holds basic artist info for clickable artists
|
||||||
|
type ArtistSimple struct {
|
||||||
|
ID string `json:"id"`
|
||||||
|
Name string `json:"name"`
|
||||||
|
ExternalURL string `json:"external_urls"`
|
||||||
|
}
|
||||||
|
|
||||||
// AlbumTrackMetadata holds per-track info for album / playlist formatting.
|
// AlbumTrackMetadata holds per-track info for album / playlist formatting.
|
||||||
type AlbumTrackMetadata struct {
|
type AlbumTrackMetadata struct {
|
||||||
Artists string `json:"artists"`
|
Artists string `json:"artists"`
|
||||||
Name string `json:"name"`
|
Name string `json:"name"`
|
||||||
AlbumName string `json:"album_name"`
|
AlbumName string `json:"album_name"`
|
||||||
DurationMS int `json:"duration_ms"`
|
DurationMS int `json:"duration_ms"`
|
||||||
Images string `json:"images"`
|
Images string `json:"images"`
|
||||||
ReleaseDate string `json:"release_date"`
|
ReleaseDate string `json:"release_date"`
|
||||||
TrackNumber int `json:"track_number"`
|
TrackNumber int `json:"track_number"`
|
||||||
ExternalURL string `json:"external_urls"`
|
ExternalURL string `json:"external_urls"`
|
||||||
ISRC string `json:"isrc"`
|
ISRC string `json:"isrc"`
|
||||||
AlbumType string `json:"album_type,omitempty"`
|
AlbumType string `json:"album_type,omitempty"`
|
||||||
SpotifyID string `json:"spotify_id,omitempty"`
|
SpotifyID string `json:"spotify_id,omitempty"`
|
||||||
|
AlbumID string `json:"album_id,omitempty"`
|
||||||
|
AlbumURL string `json:"album_url,omitempty"`
|
||||||
|
ArtistID string `json:"artist_id,omitempty"`
|
||||||
|
ArtistURL string `json:"artist_url,omitempty"`
|
||||||
|
ArtistsData []ArtistSimple `json:"artists_data,omitempty"`
|
||||||
}
|
}
|
||||||
|
|
||||||
type TrackResponse struct {
|
type TrackResponse struct {
|
||||||
@@ -95,6 +107,8 @@ type AlbumInfoMetadata struct {
|
|||||||
Artists string `json:"artists"`
|
Artists string `json:"artists"`
|
||||||
Images string `json:"images"`
|
Images string `json:"images"`
|
||||||
Batch string `json:"batch,omitempty"`
|
Batch string `json:"batch,omitempty"`
|
||||||
|
ArtistID string `json:"artist_id,omitempty"`
|
||||||
|
ArtistURL string `json:"artist_url,omitempty"`
|
||||||
}
|
}
|
||||||
|
|
||||||
type AlbumResponsePayload struct {
|
type AlbumResponsePayload struct {
|
||||||
@@ -474,6 +488,19 @@ func (c *SpotifyMetadataClient) formatPlaylistData(raw *playlistRaw) PlaylistRes
|
|||||||
if item.Track == nil {
|
if item.Track == nil {
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
|
var artistID, artistURL string
|
||||||
|
if len(item.Track.Artists) > 0 {
|
||||||
|
artistID = item.Track.Artists[0].ID
|
||||||
|
artistURL = fmt.Sprintf("https://open.spotify.com/artist/%s", item.Track.Artists[0].ID)
|
||||||
|
}
|
||||||
|
artistsData := make([]ArtistSimple, 0, len(item.Track.Artists))
|
||||||
|
for _, a := range item.Track.Artists {
|
||||||
|
artistsData = append(artistsData, ArtistSimple{
|
||||||
|
ID: a.ID,
|
||||||
|
Name: a.Name,
|
||||||
|
ExternalURL: fmt.Sprintf("https://open.spotify.com/artist/%s", a.ID),
|
||||||
|
})
|
||||||
|
}
|
||||||
tracks = append(tracks, AlbumTrackMetadata{
|
tracks = append(tracks, AlbumTrackMetadata{
|
||||||
Artists: joinArtists(item.Track.Artists),
|
Artists: joinArtists(item.Track.Artists),
|
||||||
Name: item.Track.Name,
|
Name: item.Track.Name,
|
||||||
@@ -485,6 +512,11 @@ func (c *SpotifyMetadataClient) formatPlaylistData(raw *playlistRaw) PlaylistRes
|
|||||||
ExternalURL: item.Track.ExternalURL.Spotify,
|
ExternalURL: item.Track.ExternalURL.Spotify,
|
||||||
ISRC: item.Track.ExternalID.ISRC,
|
ISRC: item.Track.ExternalID.ISRC,
|
||||||
SpotifyID: item.Track.ID,
|
SpotifyID: item.Track.ID,
|
||||||
|
AlbumID: item.Track.Album.ID,
|
||||||
|
AlbumURL: item.Track.Album.ExternalURL.Spotify,
|
||||||
|
ArtistID: artistID,
|
||||||
|
ArtistURL: artistURL,
|
||||||
|
ArtistsData: artistsData,
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -496,12 +528,19 @@ func (c *SpotifyMetadataClient) formatPlaylistData(raw *playlistRaw) PlaylistRes
|
|||||||
|
|
||||||
func (c *SpotifyMetadataClient) formatAlbumData(ctx context.Context, raw *albumRaw) (*AlbumResponsePayload, error) {
|
func (c *SpotifyMetadataClient) formatAlbumData(ctx context.Context, raw *albumRaw) (*AlbumResponsePayload, error) {
|
||||||
albumImage := firstImageURL(raw.Data.Images)
|
albumImage := firstImageURL(raw.Data.Images)
|
||||||
|
var artistID, artistURL string
|
||||||
|
if len(raw.Data.Artists) > 0 {
|
||||||
|
artistID = raw.Data.Artists[0].ID
|
||||||
|
artistURL = fmt.Sprintf("https://open.spotify.com/artist/%s", raw.Data.Artists[0].ID)
|
||||||
|
}
|
||||||
info := AlbumInfoMetadata{
|
info := AlbumInfoMetadata{
|
||||||
TotalTracks: raw.Data.TotalTracks,
|
TotalTracks: raw.Data.TotalTracks,
|
||||||
Name: raw.Data.Name,
|
Name: raw.Data.Name,
|
||||||
ReleaseDate: raw.Data.ReleaseDate,
|
ReleaseDate: raw.Data.ReleaseDate,
|
||||||
Artists: joinArtists(raw.Data.Artists),
|
Artists: joinArtists(raw.Data.Artists),
|
||||||
Images: albumImage,
|
Images: albumImage,
|
||||||
|
ArtistID: artistID,
|
||||||
|
ArtistURL: artistURL,
|
||||||
}
|
}
|
||||||
if raw.BatchEnabled {
|
if raw.BatchEnabled {
|
||||||
info.Batch = strconv.Itoa(maxInt(1, raw.BatchCount))
|
info.Batch = strconv.Itoa(maxInt(1, raw.BatchCount))
|
||||||
@@ -576,6 +615,19 @@ func (c *SpotifyMetadataClient) formatArtistDiscographyData(ctx context.Context,
|
|||||||
|
|
||||||
for _, tr := range tracks {
|
for _, tr := range tracks {
|
||||||
isrc := c.fetchTrackISRC(ctx, tr.ID, raw.Token, isrcCache)
|
isrc := c.fetchTrackISRC(ctx, tr.ID, raw.Token, isrcCache)
|
||||||
|
var artistID, artistURL string
|
||||||
|
if len(tr.Artists) > 0 {
|
||||||
|
artistID = tr.Artists[0].ID
|
||||||
|
artistURL = fmt.Sprintf("https://open.spotify.com/artist/%s", tr.Artists[0].ID)
|
||||||
|
}
|
||||||
|
artistsData := make([]ArtistSimple, 0, len(tr.Artists))
|
||||||
|
for _, a := range tr.Artists {
|
||||||
|
artistsData = append(artistsData, ArtistSimple{
|
||||||
|
ID: a.ID,
|
||||||
|
Name: a.Name,
|
||||||
|
ExternalURL: fmt.Sprintf("https://open.spotify.com/artist/%s", a.ID),
|
||||||
|
})
|
||||||
|
}
|
||||||
allTracks = append(allTracks, AlbumTrackMetadata{
|
allTracks = append(allTracks, AlbumTrackMetadata{
|
||||||
Artists: joinArtists(tr.Artists),
|
Artists: joinArtists(tr.Artists),
|
||||||
Name: tr.Name,
|
Name: tr.Name,
|
||||||
@@ -588,6 +640,11 @@ func (c *SpotifyMetadataClient) formatArtistDiscographyData(ctx context.Context,
|
|||||||
ExternalURL: tr.ExternalURL.Spotify,
|
ExternalURL: tr.ExternalURL.Spotify,
|
||||||
ISRC: isrc,
|
ISRC: isrc,
|
||||||
SpotifyID: tr.ID,
|
SpotifyID: tr.ID,
|
||||||
|
AlbumID: alb.ID,
|
||||||
|
AlbumURL: alb.ExternalURL.Spotify,
|
||||||
|
ArtistID: artistID,
|
||||||
|
ArtistURL: artistURL,
|
||||||
|
ArtistsData: artistsData,
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+778
-45
@@ -22,6 +22,13 @@ type TidalDownloader struct {
|
|||||||
apiURL string
|
apiURL string
|
||||||
}
|
}
|
||||||
|
|
||||||
|
type TidalSearchResponse struct {
|
||||||
|
Limit int `json:"limit"`
|
||||||
|
Offset int `json:"offset"`
|
||||||
|
TotalNumberOfItems int `json:"totalNumberOfItems"`
|
||||||
|
Items []TidalTrack `json:"items"`
|
||||||
|
}
|
||||||
|
|
||||||
type TidalTrack struct {
|
type TidalTrack struct {
|
||||||
ID int64 `json:"id"`
|
ID int64 `json:"id"`
|
||||||
Title string `json:"title"`
|
Title string `json:"title"`
|
||||||
@@ -65,9 +72,9 @@ func NewTidalDownloader(apiURL string) *TidalDownloader {
|
|||||||
if apiURL == "" {
|
if apiURL == "" {
|
||||||
downloader := &TidalDownloader{
|
downloader := &TidalDownloader{
|
||||||
client: &http.Client{
|
client: &http.Client{
|
||||||
Timeout: 60 * time.Second,
|
Timeout: 5 * time.Second, // Fast timeout for quick API fallback
|
||||||
},
|
},
|
||||||
timeout: 30 * time.Second,
|
timeout: 5 * time.Second,
|
||||||
maxRetries: 3,
|
maxRetries: 3,
|
||||||
clientID: string(clientID),
|
clientID: string(clientID),
|
||||||
clientSecret: string(clientSecret),
|
clientSecret: string(clientSecret),
|
||||||
@@ -83,9 +90,9 @@ func NewTidalDownloader(apiURL string) *TidalDownloader {
|
|||||||
|
|
||||||
return &TidalDownloader{
|
return &TidalDownloader{
|
||||||
client: &http.Client{
|
client: &http.Client{
|
||||||
Timeout: 60 * time.Second,
|
Timeout: 5 * time.Second, // Fast timeout for quick API fallback
|
||||||
},
|
},
|
||||||
timeout: 30 * time.Second,
|
timeout: 5 * time.Second,
|
||||||
maxRetries: 3,
|
maxRetries: 3,
|
||||||
clientID: string(clientID),
|
clientID: string(clientID),
|
||||||
clientSecret: string(clientSecret),
|
clientSecret: string(clientSecret),
|
||||||
@@ -168,6 +175,237 @@ func (t *TidalDownloader) GetAccessToken() (string, error) {
|
|||||||
return result.AccessToken, nil
|
return result.AccessToken, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// SearchTracks searches for tracks on Tidal with configurable limit
|
||||||
|
func (t *TidalDownloader) SearchTracks(query string) (*TidalSearchResponse, error) {
|
||||||
|
return t.SearchTracksWithLimit(query, 50) // Default to 50 results for better matching
|
||||||
|
}
|
||||||
|
|
||||||
|
// SearchTracksWithLimit searches for tracks on Tidal with a specific limit
|
||||||
|
func (t *TidalDownloader) SearchTracksWithLimit(query string, limit int) (*TidalSearchResponse, error) {
|
||||||
|
token, err := t.GetAccessToken()
|
||||||
|
if err != nil {
|
||||||
|
return nil, fmt.Errorf("failed to get access token: %w", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Decode base64 API URL and encode the query parameter
|
||||||
|
searchBase, _ := base64.StdEncoding.DecodeString("aHR0cHM6Ly9hcGkudGlkYWwuY29tL3YxL3NlYXJjaC90cmFja3M/cXVlcnk9")
|
||||||
|
searchURL := fmt.Sprintf("%s%s&limit=%d&offset=0&countryCode=US", string(searchBase), url.QueryEscape(query), limit)
|
||||||
|
|
||||||
|
req, err := http.NewRequest("GET", searchURL, nil)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
req.Header.Set("Authorization", "Bearer "+token)
|
||||||
|
|
||||||
|
resp, err := t.client.Do(req)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
defer resp.Body.Close()
|
||||||
|
|
||||||
|
if resp.StatusCode != 200 {
|
||||||
|
body, _ := io.ReadAll(resp.Body)
|
||||||
|
return nil, fmt.Errorf("search failed: HTTP %d - %s", resp.StatusCode, string(body))
|
||||||
|
}
|
||||||
|
|
||||||
|
var result TidalSearchResponse
|
||||||
|
if err := json.NewDecoder(resp.Body).Decode(&result); err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
return &result, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// SearchTrackByMetadata searches for a track using artist name and track name
|
||||||
|
// It tries multiple search strategies including romaji conversion for Japanese text
|
||||||
|
// Now accepts ISRC for exact matching
|
||||||
|
func (t *TidalDownloader) SearchTrackByMetadata(trackName, artistName string, expectedDuration int) (*TidalTrack, error) {
|
||||||
|
return t.SearchTrackByMetadataWithISRC(trackName, artistName, "", expectedDuration)
|
||||||
|
}
|
||||||
|
|
||||||
|
// SearchTrackByMetadataWithISRC searches for a track with ISRC matching priority
|
||||||
|
func (t *TidalDownloader) SearchTrackByMetadataWithISRC(trackName, artistName, spotifyISRC string, expectedDuration int) (*TidalTrack, error) {
|
||||||
|
// Build search queries - multiple strategies
|
||||||
|
queries := []string{}
|
||||||
|
|
||||||
|
// Strategy 1: Artist + Track name (original)
|
||||||
|
if artistName != "" && trackName != "" {
|
||||||
|
queries = append(queries, artistName+" "+trackName)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Strategy 2: Track name only (sometimes works better)
|
||||||
|
if trackName != "" {
|
||||||
|
queries = append(queries, trackName)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Strategy 3: Romaji versions if Japanese detected
|
||||||
|
if ContainsJapanese(trackName) || ContainsJapanese(artistName) {
|
||||||
|
// Convert to romaji (hiragana/katakana only, kanji stays)
|
||||||
|
romajiTrack := JapaneseToRomaji(trackName)
|
||||||
|
romajiArtist := JapaneseToRomaji(artistName)
|
||||||
|
|
||||||
|
// Clean and remove ALL non-ASCII characters (including kanji)
|
||||||
|
cleanRomajiTrack := cleanToASCII(romajiTrack)
|
||||||
|
cleanRomajiArtist := cleanToASCII(romajiArtist)
|
||||||
|
|
||||||
|
// Artist + Track romaji (cleaned to ASCII only)
|
||||||
|
if cleanRomajiArtist != "" && cleanRomajiTrack != "" {
|
||||||
|
romajiQuery := cleanRomajiArtist + " " + cleanRomajiTrack
|
||||||
|
if !containsQuery(queries, romajiQuery) {
|
||||||
|
queries = append(queries, romajiQuery)
|
||||||
|
fmt.Printf("Japanese detected, adding romaji query: %s\n", romajiQuery)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Track romaji only (cleaned)
|
||||||
|
if cleanRomajiTrack != "" && cleanRomajiTrack != trackName {
|
||||||
|
if !containsQuery(queries, cleanRomajiTrack) {
|
||||||
|
queries = append(queries, cleanRomajiTrack)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Also try with partial romaji (artist + cleaned track)
|
||||||
|
if artistName != "" && cleanRomajiTrack != "" {
|
||||||
|
partialQuery := artistName + " " + cleanRomajiTrack
|
||||||
|
if !containsQuery(queries, partialQuery) {
|
||||||
|
queries = append(queries, partialQuery)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Strategy 4: Artist only as last resort
|
||||||
|
if artistName != "" {
|
||||||
|
artistOnly := cleanToASCII(JapaneseToRomaji(artistName))
|
||||||
|
if artistOnly != "" && !containsQuery(queries, artistOnly) {
|
||||||
|
queries = append(queries, artistOnly)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Collect all search results from all queries
|
||||||
|
var allTracks []TidalTrack
|
||||||
|
searchedQueries := make(map[string]bool)
|
||||||
|
|
||||||
|
for _, query := range queries {
|
||||||
|
cleanQuery := strings.TrimSpace(query)
|
||||||
|
if cleanQuery == "" || searchedQueries[cleanQuery] {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
searchedQueries[cleanQuery] = true
|
||||||
|
|
||||||
|
fmt.Printf("Searching Tidal for: %s\n", cleanQuery)
|
||||||
|
|
||||||
|
result, err := t.SearchTracksWithLimit(cleanQuery, 100) // Get more results
|
||||||
|
if err != nil {
|
||||||
|
fmt.Printf("Search error for '%s': %v\n", cleanQuery, err)
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
|
||||||
|
if len(result.Items) > 0 {
|
||||||
|
fmt.Printf("Found %d results for '%s'\n", len(result.Items), cleanQuery)
|
||||||
|
allTracks = append(allTracks, result.Items...)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if len(allTracks) == 0 {
|
||||||
|
return nil, fmt.Errorf("no tracks found for any search query")
|
||||||
|
}
|
||||||
|
|
||||||
|
// Priority 1: Match by ISRC (exact match)
|
||||||
|
if spotifyISRC != "" {
|
||||||
|
fmt.Printf("Looking for ISRC match: %s\n", spotifyISRC)
|
||||||
|
for i := range allTracks {
|
||||||
|
track := &allTracks[i]
|
||||||
|
if track.ISRC == spotifyISRC {
|
||||||
|
fmt.Printf("✓ ISRC match found: %s - %s (ISRC: %s, Quality: %s)\n",
|
||||||
|
track.Artist.Name, track.Title, track.ISRC, track.AudioQuality)
|
||||||
|
return track, nil
|
||||||
|
}
|
||||||
|
}
|
||||||
|
fmt.Printf("No exact ISRC match found, trying other matching methods...\n")
|
||||||
|
}
|
||||||
|
|
||||||
|
// If ISRC was provided but no match found, return error - don't download wrong track
|
||||||
|
if spotifyISRC != "" {
|
||||||
|
fmt.Printf("✗ No ISRC match found for: %s\n", spotifyISRC)
|
||||||
|
fmt.Printf(" Available ISRCs from search results:\n")
|
||||||
|
// Show first 5 results for debugging
|
||||||
|
for i, track := range allTracks {
|
||||||
|
if i >= 5 {
|
||||||
|
fmt.Printf(" ... and %d more results\n", len(allTracks)-5)
|
||||||
|
break
|
||||||
|
}
|
||||||
|
fmt.Printf(" - %s - %s (ISRC: %s)\n", track.Artist.Name, track.Title, track.ISRC)
|
||||||
|
}
|
||||||
|
return nil, fmt.Errorf("ISRC mismatch: no track found with ISRC %s on Tidal", spotifyISRC)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Only proceed without ISRC matching if no ISRC was provided
|
||||||
|
// Priority 2: Match by duration (within tolerance) + prefer best quality
|
||||||
|
var bestMatch *TidalTrack
|
||||||
|
if expectedDuration > 0 {
|
||||||
|
tolerance := 3 // 3 seconds tolerance
|
||||||
|
var durationMatches []*TidalTrack
|
||||||
|
|
||||||
|
for i := range allTracks {
|
||||||
|
track := &allTracks[i]
|
||||||
|
durationDiff := track.Duration - expectedDuration
|
||||||
|
if durationDiff < 0 {
|
||||||
|
durationDiff = -durationDiff
|
||||||
|
}
|
||||||
|
if durationDiff <= tolerance {
|
||||||
|
durationMatches = append(durationMatches, track)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if len(durationMatches) > 0 {
|
||||||
|
// Find best quality among duration matches
|
||||||
|
bestMatch = durationMatches[0]
|
||||||
|
for _, track := range durationMatches {
|
||||||
|
for _, tag := range track.MediaMetadata.Tags {
|
||||||
|
if tag == "HIRES_LOSSLESS" {
|
||||||
|
bestMatch = track
|
||||||
|
break
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
fmt.Printf("Found via duration match: %s - %s (%s)\n",
|
||||||
|
bestMatch.Artist.Name, bestMatch.Title, bestMatch.AudioQuality)
|
||||||
|
return bestMatch, nil
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Priority 3: Just take the best quality from first results (only when no ISRC provided)
|
||||||
|
bestMatch = &allTracks[0]
|
||||||
|
for i := range allTracks {
|
||||||
|
track := &allTracks[i]
|
||||||
|
for _, tag := range track.MediaMetadata.Tags {
|
||||||
|
if tag == "HIRES_LOSSLESS" {
|
||||||
|
bestMatch = track
|
||||||
|
break
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if bestMatch != &allTracks[0] {
|
||||||
|
break // Found HIRES_LOSSLESS
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fmt.Printf("Found via search (no ISRC provided): %s - %s (ISRC: %s, Quality: %s)\n",
|
||||||
|
bestMatch.Artist.Name, bestMatch.Title, bestMatch.ISRC, bestMatch.AudioQuality)
|
||||||
|
|
||||||
|
return bestMatch, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// containsQuery checks if a query already exists in the list
|
||||||
|
func containsQuery(queries []string, query string) bool {
|
||||||
|
for _, q := range queries {
|
||||||
|
if q == query {
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
|
||||||
func (t *TidalDownloader) GetTidalURLFromSpotify(spotifyTrackID string) (string, error) {
|
func (t *TidalDownloader) GetTidalURLFromSpotify(spotifyTrackID string) (string, error) {
|
||||||
// Decode base64 API URL
|
// Decode base64 API URL
|
||||||
spotifyBase, _ := base64.StdEncoding.DecodeString("aHR0cHM6Ly9vcGVuLnNwb3RpZnkuY29tL3RyYWNrLw==")
|
spotifyBase, _ := base64.StdEncoding.DecodeString("aHR0cHM6Ly9vcGVuLnNwb3RpZnkuY29tL3RyYWNrLw==")
|
||||||
@@ -507,72 +745,567 @@ func (t *TidalDownloader) DownloadByURLWithFallback(tidalURL, outputDir, quality
|
|||||||
return "", fmt.Errorf("no APIs available for fallback: %w", err)
|
return "", fmt.Errorf("no APIs available for fallback: %w", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
var lastError error
|
if outputDir != "." {
|
||||||
for i, apiURL := range apis {
|
if err := os.MkdirAll(outputDir, 0755); err != nil {
|
||||||
fmt.Printf("[Tidal API %d/%d] Trying: %s\n", i+1, len(apis), apiURL)
|
return "", fmt.Errorf("directory error: %w", err)
|
||||||
|
|
||||||
fallbackDownloader := NewTidalDownloader(apiURL)
|
|
||||||
|
|
||||||
result, err := fallbackDownloader.DownloadByURL(tidalURL, outputDir, quality, filenameFormat, includeTrackNumber, position, spotifyTrackName, spotifyArtistName, spotifyAlbumName, useAlbumTrackNumber)
|
|
||||||
if err == nil {
|
|
||||||
fmt.Printf("✓ Success with: %s\n", apiURL)
|
|
||||||
return result, nil
|
|
||||||
}
|
}
|
||||||
|
|
||||||
lastError = err
|
|
||||||
errMsg := err.Error()
|
|
||||||
if len(errMsg) > 80 {
|
|
||||||
errMsg = errMsg[:80]
|
|
||||||
}
|
|
||||||
fmt.Printf("✗ Failed with %s: %s\n", apiURL, errMsg)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return "", fmt.Errorf("all %d Tidal APIs failed. Last error: %v", len(apis), lastError)
|
fmt.Printf("Using Tidal URL: %s\n", tidalURL)
|
||||||
|
|
||||||
|
// Extract track ID from URL
|
||||||
|
trackID, err := t.GetTrackIDFromURL(tidalURL)
|
||||||
|
if err != nil {
|
||||||
|
return "", err
|
||||||
|
}
|
||||||
|
|
||||||
|
// Get track info by ID
|
||||||
|
trackInfo, err := t.GetTrackInfoByID(trackID)
|
||||||
|
if err != nil {
|
||||||
|
return "", err
|
||||||
|
}
|
||||||
|
|
||||||
|
if trackInfo.ID == 0 {
|
||||||
|
return "", fmt.Errorf("no track ID found")
|
||||||
|
}
|
||||||
|
|
||||||
|
// Use Spotify metadata if provided, otherwise fallback to Tidal metadata
|
||||||
|
artistName := spotifyArtistName
|
||||||
|
trackTitle := spotifyTrackName
|
||||||
|
albumTitle := spotifyAlbumName
|
||||||
|
|
||||||
|
if artistName == "" {
|
||||||
|
var artists []string
|
||||||
|
if len(trackInfo.Artists) > 0 {
|
||||||
|
for _, artist := range trackInfo.Artists {
|
||||||
|
if artist.Name != "" {
|
||||||
|
artists = append(artists, artist.Name)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} else if trackInfo.Artist.Name != "" {
|
||||||
|
artists = append(artists, trackInfo.Artist.Name)
|
||||||
|
}
|
||||||
|
artistName = "Unknown Artist"
|
||||||
|
if len(artists) > 0 {
|
||||||
|
artistName = strings.Join(artists, ", ")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
artistName = sanitizeFilename(artistName)
|
||||||
|
|
||||||
|
if trackTitle == "" {
|
||||||
|
trackTitle = trackInfo.Title
|
||||||
|
if trackTitle == "" {
|
||||||
|
trackTitle = fmt.Sprintf("track_%d", trackInfo.ID)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
trackTitle = sanitizeFilename(trackTitle)
|
||||||
|
|
||||||
|
if albumTitle == "" {
|
||||||
|
albumTitle = trackInfo.Album.Title
|
||||||
|
}
|
||||||
|
|
||||||
|
// Check if file with same ISRC already exists
|
||||||
|
if existingFile, exists := CheckISRCExists(outputDir, trackInfo.ISRC); exists {
|
||||||
|
fmt.Printf("File with ISRC %s already exists: %s\n", trackInfo.ISRC, existingFile)
|
||||||
|
return "EXISTS:" + existingFile, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
filename := buildTidalFilename(trackTitle, artistName, trackInfo.TrackNumber, filenameFormat, includeTrackNumber, position, useAlbumTrackNumber)
|
||||||
|
outputFilename := filepath.Join(outputDir, filename)
|
||||||
|
|
||||||
|
if fileInfo, err := os.Stat(outputFilename); err == nil && fileInfo.Size() > 0 {
|
||||||
|
fmt.Printf("File already exists: %s (%.2f MB)\n", outputFilename, float64(fileInfo.Size())/(1024*1024))
|
||||||
|
return "EXISTS:" + outputFilename, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// Request download URL from ALL APIs in parallel - use first success
|
||||||
|
successAPI, downloadURL, err := getDownloadURLParallel(apis, trackInfo.ID, quality)
|
||||||
|
if err != nil {
|
||||||
|
return "", err
|
||||||
|
}
|
||||||
|
|
||||||
|
// Download the file
|
||||||
|
fmt.Printf("Downloading to: %s\n", outputFilename)
|
||||||
|
downloader := NewTidalDownloader(successAPI)
|
||||||
|
if err := downloader.DownloadFile(downloadURL, outputFilename); err != nil {
|
||||||
|
return "", err
|
||||||
|
}
|
||||||
|
|
||||||
|
fmt.Println("Adding metadata...")
|
||||||
|
|
||||||
|
coverPath := ""
|
||||||
|
if trackInfo.Album.Cover != "" {
|
||||||
|
coverPath = outputFilename + ".cover.jpg"
|
||||||
|
albumArt, err := downloader.DownloadAlbumArt(trackInfo.Album.Cover)
|
||||||
|
if err != nil {
|
||||||
|
fmt.Printf("Warning: Failed to download album art: %v\n", err)
|
||||||
|
} else {
|
||||||
|
if err := os.WriteFile(coverPath, albumArt, 0644); err != nil {
|
||||||
|
fmt.Printf("Warning: Failed to save album art: %v\n", err)
|
||||||
|
} else {
|
||||||
|
defer os.Remove(coverPath)
|
||||||
|
fmt.Println("Album art downloaded")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
releaseYear := ""
|
||||||
|
if len(trackInfo.Album.ReleaseDate) >= 4 {
|
||||||
|
releaseYear = trackInfo.Album.ReleaseDate[:4]
|
||||||
|
}
|
||||||
|
|
||||||
|
trackNumberToEmbed := 0
|
||||||
|
if position > 0 {
|
||||||
|
if useAlbumTrackNumber && trackInfo.TrackNumber > 0 {
|
||||||
|
trackNumberToEmbed = trackInfo.TrackNumber
|
||||||
|
} else {
|
||||||
|
trackNumberToEmbed = position
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
metadata := Metadata{
|
||||||
|
Title: trackTitle,
|
||||||
|
Artist: artistName,
|
||||||
|
Album: albumTitle,
|
||||||
|
Date: releaseYear,
|
||||||
|
TrackNumber: trackNumberToEmbed,
|
||||||
|
DiscNumber: trackInfo.VolumeNumber,
|
||||||
|
ISRC: trackInfo.ISRC,
|
||||||
|
}
|
||||||
|
|
||||||
|
if err := EmbedMetadata(outputFilename, metadata, coverPath); err != nil {
|
||||||
|
fmt.Printf("Tagging failed: %v\n", err)
|
||||||
|
} else {
|
||||||
|
fmt.Println("Metadata saved")
|
||||||
|
}
|
||||||
|
|
||||||
|
fmt.Println("Done")
|
||||||
|
fmt.Println("✓ Downloaded successfully from Tidal")
|
||||||
|
return outputFilename, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func (t *TidalDownloader) Download(spotifyTrackID, outputDir, quality, filenameFormat string, includeTrackNumber bool, position int, spotifyTrackName, spotifyArtistName, spotifyAlbumName string, useAlbumTrackNumber bool) (string, error) {
|
func (t *TidalDownloader) Download(spotifyTrackID, outputDir, quality, filenameFormat string, includeTrackNumber bool, position int, spotifyTrackName, spotifyArtistName, spotifyAlbumName string, useAlbumTrackNumber bool) (string, error) {
|
||||||
// Get Tidal URL from Spotify track ID
|
// Get Tidal URL from Spotify track ID
|
||||||
tidalURL, err := t.GetTidalURLFromSpotify(spotifyTrackID)
|
tidalURL, err := t.GetTidalURLFromSpotify(spotifyTrackID)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return "", err
|
// Songlink failed to find Tidal URL, try search fallback
|
||||||
|
fmt.Printf("Songlink couldn't find Tidal URL: %v\n", err)
|
||||||
|
fmt.Println("Trying Tidal search fallback...")
|
||||||
|
return t.DownloadBySearch(spotifyTrackName, spotifyArtistName, spotifyAlbumName, "", 0, outputDir, quality, filenameFormat, includeTrackNumber, position, useAlbumTrackNumber)
|
||||||
}
|
}
|
||||||
|
|
||||||
return t.DownloadByURLWithFallback(tidalURL, outputDir, quality, filenameFormat, includeTrackNumber, position, spotifyTrackName, spotifyArtistName, spotifyAlbumName, useAlbumTrackNumber)
|
return t.DownloadByURLWithFallback(tidalURL, outputDir, quality, filenameFormat, includeTrackNumber, position, spotifyTrackName, spotifyArtistName, spotifyAlbumName, useAlbumTrackNumber)
|
||||||
}
|
}
|
||||||
|
|
||||||
func (t *TidalDownloader) DownloadWithFallback(spotifyTrackID, outputDir, quality, filenameFormat string, includeTrackNumber bool, position int, spotifyTrackName, spotifyArtistName, spotifyAlbumName string, useAlbumTrackNumber bool) (string, error) {
|
// DownloadWithISRC downloads a track with ISRC matching for search fallback
|
||||||
|
func (t *TidalDownloader) DownloadWithISRC(spotifyTrackID, spotifyISRC, outputDir, quality, filenameFormat string, includeTrackNumber bool, position int, spotifyTrackName, spotifyArtistName, spotifyAlbumName string, useAlbumTrackNumber bool, expectedDuration int) (string, error) {
|
||||||
|
// Get Tidal URL from Spotify track ID
|
||||||
|
tidalURL, err := t.GetTidalURLFromSpotify(spotifyTrackID)
|
||||||
|
if err != nil {
|
||||||
|
// Songlink failed to find Tidal URL, try search fallback with ISRC
|
||||||
|
fmt.Printf("Songlink couldn't find Tidal URL: %v\n", err)
|
||||||
|
fmt.Println("Trying Tidal search fallback with ISRC matching...")
|
||||||
|
return t.DownloadBySearchWithISRC(spotifyTrackName, spotifyArtistName, spotifyAlbumName, spotifyISRC, expectedDuration, outputDir, quality, filenameFormat, includeTrackNumber, position, useAlbumTrackNumber)
|
||||||
|
}
|
||||||
|
|
||||||
|
return t.DownloadByURLWithFallback(tidalURL, outputDir, quality, filenameFormat, includeTrackNumber, position, spotifyTrackName, spotifyArtistName, spotifyAlbumName, useAlbumTrackNumber)
|
||||||
|
}
|
||||||
|
|
||||||
|
// DownloadBySearch downloads a track by searching Tidal directly using metadata
|
||||||
|
// This is used as a fallback when Songlink API doesn't find a Tidal URL
|
||||||
|
func (t *TidalDownloader) DownloadBySearch(trackName, artistName, albumName, spotifyISRC string, expectedDuration int, outputDir, quality, filenameFormat string, includeTrackNumber bool, position int, useAlbumTrackNumber bool) (string, error) {
|
||||||
|
return t.DownloadBySearchWithISRC(trackName, artistName, albumName, spotifyISRC, expectedDuration, outputDir, quality, filenameFormat, includeTrackNumber, position, useAlbumTrackNumber)
|
||||||
|
}
|
||||||
|
|
||||||
|
// DownloadBySearchWithISRC downloads a track by searching Tidal with ISRC matching
|
||||||
|
func (t *TidalDownloader) DownloadBySearchWithISRC(trackName, artistName, albumName, spotifyISRC string, expectedDuration int, outputDir, quality, filenameFormat string, includeTrackNumber bool, position int, useAlbumTrackNumber bool) (string, error) {
|
||||||
|
if outputDir != "." {
|
||||||
|
if err := os.MkdirAll(outputDir, 0755); err != nil {
|
||||||
|
return "", fmt.Errorf("directory error: %w", err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Search for the track with ISRC matching
|
||||||
|
trackInfo, err := t.SearchTrackByMetadataWithISRC(trackName, artistName, spotifyISRC, expectedDuration)
|
||||||
|
if err != nil {
|
||||||
|
return "", fmt.Errorf("search fallback failed: %w", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
if trackInfo.ID == 0 {
|
||||||
|
return "", fmt.Errorf("no track ID found from search")
|
||||||
|
}
|
||||||
|
|
||||||
|
// Use provided metadata, fallback to Tidal metadata
|
||||||
|
finalArtistName := artistName
|
||||||
|
finalTrackTitle := trackName
|
||||||
|
finalAlbumTitle := albumName
|
||||||
|
|
||||||
|
if finalArtistName == "" {
|
||||||
|
var artists []string
|
||||||
|
if len(trackInfo.Artists) > 0 {
|
||||||
|
for _, artist := range trackInfo.Artists {
|
||||||
|
if artist.Name != "" {
|
||||||
|
artists = append(artists, artist.Name)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} else if trackInfo.Artist.Name != "" {
|
||||||
|
artists = append(artists, trackInfo.Artist.Name)
|
||||||
|
}
|
||||||
|
if len(artists) > 0 {
|
||||||
|
finalArtistName = strings.Join(artists, ", ")
|
||||||
|
} else {
|
||||||
|
finalArtistName = "Unknown Artist"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
finalArtistName = sanitizeFilename(finalArtistName)
|
||||||
|
|
||||||
|
if finalTrackTitle == "" {
|
||||||
|
finalTrackTitle = trackInfo.Title
|
||||||
|
if finalTrackTitle == "" {
|
||||||
|
finalTrackTitle = fmt.Sprintf("track_%d", trackInfo.ID)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
finalTrackTitle = sanitizeFilename(finalTrackTitle)
|
||||||
|
|
||||||
|
if finalAlbumTitle == "" {
|
||||||
|
finalAlbumTitle = trackInfo.Album.Title
|
||||||
|
}
|
||||||
|
|
||||||
|
// Check if file with same ISRC already exists
|
||||||
|
if existingFile, exists := CheckISRCExists(outputDir, trackInfo.ISRC); exists {
|
||||||
|
fmt.Printf("File with ISRC %s already exists: %s\n", trackInfo.ISRC, existingFile)
|
||||||
|
return "EXISTS:" + existingFile, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// Build filename
|
||||||
|
filename := buildTidalFilename(finalTrackTitle, finalArtistName, trackInfo.TrackNumber, filenameFormat, includeTrackNumber, position, useAlbumTrackNumber)
|
||||||
|
outputFilename := filepath.Join(outputDir, filename)
|
||||||
|
|
||||||
|
if fileInfo, err := os.Stat(outputFilename); err == nil && fileInfo.Size() > 0 {
|
||||||
|
fmt.Printf("File already exists: %s (%.2f MB)\n", outputFilename, float64(fileInfo.Size())/(1024*1024))
|
||||||
|
return "EXISTS:" + outputFilename, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// Get download URL
|
||||||
|
downloadURL, err := t.GetDownloadURL(trackInfo.ID, quality)
|
||||||
|
if err != nil {
|
||||||
|
return "", err
|
||||||
|
}
|
||||||
|
|
||||||
|
fmt.Printf("Downloading to: %s\n", outputFilename)
|
||||||
|
if err := t.DownloadFile(downloadURL, outputFilename); err != nil {
|
||||||
|
return "", err
|
||||||
|
}
|
||||||
|
|
||||||
|
fmt.Println("Adding metadata...")
|
||||||
|
|
||||||
|
coverPath := ""
|
||||||
|
if trackInfo.Album.Cover != "" {
|
||||||
|
coverPath = outputFilename + ".cover.jpg"
|
||||||
|
albumArt, err := t.DownloadAlbumArt(trackInfo.Album.Cover)
|
||||||
|
if err != nil {
|
||||||
|
fmt.Printf("Warning: Failed to download album art: %v\n", err)
|
||||||
|
} else {
|
||||||
|
if err := os.WriteFile(coverPath, albumArt, 0644); err != nil {
|
||||||
|
fmt.Printf("Warning: Failed to save album art: %v\n", err)
|
||||||
|
} else {
|
||||||
|
defer os.Remove(coverPath)
|
||||||
|
fmt.Println("Album art downloaded")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
releaseYear := ""
|
||||||
|
if len(trackInfo.Album.ReleaseDate) >= 4 {
|
||||||
|
releaseYear = trackInfo.Album.ReleaseDate[:4]
|
||||||
|
}
|
||||||
|
|
||||||
|
trackNumberToEmbed := 0
|
||||||
|
if position > 0 {
|
||||||
|
if useAlbumTrackNumber && trackInfo.TrackNumber > 0 {
|
||||||
|
trackNumberToEmbed = trackInfo.TrackNumber
|
||||||
|
} else {
|
||||||
|
trackNumberToEmbed = position
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
metadata := Metadata{
|
||||||
|
Title: finalTrackTitle,
|
||||||
|
Artist: finalArtistName,
|
||||||
|
Album: finalAlbumTitle,
|
||||||
|
Date: releaseYear,
|
||||||
|
TrackNumber: trackNumberToEmbed,
|
||||||
|
DiscNumber: trackInfo.VolumeNumber,
|
||||||
|
ISRC: trackInfo.ISRC,
|
||||||
|
}
|
||||||
|
|
||||||
|
if err := EmbedMetadata(outputFilename, metadata, coverPath); err != nil {
|
||||||
|
fmt.Printf("Tagging failed: %v\n", err)
|
||||||
|
} else {
|
||||||
|
fmt.Println("Metadata saved")
|
||||||
|
}
|
||||||
|
|
||||||
|
fmt.Println("Done")
|
||||||
|
fmt.Println("✓ Downloaded successfully from Tidal (via search)")
|
||||||
|
return outputFilename, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// apiResult holds the result from a parallel API request
|
||||||
|
type apiResult struct {
|
||||||
|
apiURL string
|
||||||
|
downloadURL string
|
||||||
|
err error
|
||||||
|
}
|
||||||
|
|
||||||
|
// getDownloadURLParallel requests download URL from all APIs in parallel
|
||||||
|
// Returns the first successful result
|
||||||
|
func getDownloadURLParallel(apis []string, trackID int64, quality string) (string, string, error) {
|
||||||
|
if len(apis) == 0 {
|
||||||
|
return "", "", fmt.Errorf("no APIs available")
|
||||||
|
}
|
||||||
|
|
||||||
|
resultChan := make(chan apiResult, len(apis))
|
||||||
|
|
||||||
|
// Start all requests in parallel with longer timeout client
|
||||||
|
fmt.Printf("Requesting download URL from %d APIs in parallel...\n", len(apis))
|
||||||
|
for _, apiURL := range apis {
|
||||||
|
go func(api string) {
|
||||||
|
// Create client with longer timeout for parallel requests
|
||||||
|
client := &http.Client{
|
||||||
|
Timeout: 15 * time.Second, // Longer timeout for parallel
|
||||||
|
}
|
||||||
|
|
||||||
|
url := fmt.Sprintf("%s/track/?id=%d&quality=%s", api, trackID, quality)
|
||||||
|
resp, err := client.Get(url)
|
||||||
|
if err != nil {
|
||||||
|
resultChan <- apiResult{apiURL: api, err: err}
|
||||||
|
return
|
||||||
|
}
|
||||||
|
defer resp.Body.Close()
|
||||||
|
|
||||||
|
if resp.StatusCode != 200 {
|
||||||
|
resultChan <- apiResult{apiURL: api, err: fmt.Errorf("HTTP %d", resp.StatusCode)}
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
var apiResponses []TidalAPIResponse
|
||||||
|
if err := json.NewDecoder(resp.Body).Decode(&apiResponses); err != nil {
|
||||||
|
resultChan <- apiResult{apiURL: api, err: err}
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
for _, item := range apiResponses {
|
||||||
|
if item.OriginalTrackURL != "" {
|
||||||
|
resultChan <- apiResult{apiURL: api, downloadURL: item.OriginalTrackURL, err: nil}
|
||||||
|
return
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
resultChan <- apiResult{apiURL: api, err: fmt.Errorf("no download URL in response")}
|
||||||
|
}(apiURL)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Collect results - return first success
|
||||||
|
var lastError error
|
||||||
|
var errors []string
|
||||||
|
|
||||||
|
for i := 0; i < len(apis); i++ {
|
||||||
|
result := <-resultChan
|
||||||
|
if result.err == nil && result.downloadURL != "" {
|
||||||
|
// First success - use this one
|
||||||
|
fmt.Printf("✓ Got download URL from: %s\n", result.apiURL)
|
||||||
|
return result.apiURL, result.downloadURL, nil
|
||||||
|
} else {
|
||||||
|
errMsg := result.err.Error()
|
||||||
|
if len(errMsg) > 50 {
|
||||||
|
errMsg = errMsg[:50] + "..."
|
||||||
|
}
|
||||||
|
errors = append(errors, fmt.Sprintf("%s: %s", result.apiURL, errMsg))
|
||||||
|
lastError = result.err
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Print all errors for debugging
|
||||||
|
fmt.Println("All APIs failed:")
|
||||||
|
for _, e := range errors {
|
||||||
|
fmt.Printf(" ✗ %s\n", e)
|
||||||
|
}
|
||||||
|
|
||||||
|
return "", "", fmt.Errorf("all %d APIs failed. Last error: %v", len(apis), lastError)
|
||||||
|
}
|
||||||
|
|
||||||
|
// DownloadBySearchWithFallback tries multiple APIs when downloading via search
|
||||||
|
// Search is done ONCE, then requests all APIs in PARALLEL for download URL
|
||||||
|
func (t *TidalDownloader) DownloadBySearchWithFallback(trackName, artistName, albumName, spotifyISRC string, expectedDuration int, outputDir, quality, filenameFormat string, includeTrackNumber bool, position int, useAlbumTrackNumber bool) (string, error) {
|
||||||
apis, err := t.GetAvailableAPIs()
|
apis, err := t.GetAvailableAPIs()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return "", fmt.Errorf("no APIs available for fallback: %w", err)
|
return "", fmt.Errorf("no APIs available for fallback: %w", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
// Get Tidal URL once
|
if outputDir != "." {
|
||||||
tidalURL, err := t.GetTidalURLFromSpotify(spotifyTrackID)
|
if err := os.MkdirAll(outputDir, 0755); err != nil {
|
||||||
|
return "", fmt.Errorf("directory error: %w", err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Search ONCE to find the track
|
||||||
|
fmt.Println("Searching for track...")
|
||||||
|
trackInfo, err := t.SearchTrackByMetadataWithISRC(trackName, artistName, spotifyISRC, expectedDuration)
|
||||||
|
if err != nil {
|
||||||
|
return "", fmt.Errorf("search failed: %w", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
if trackInfo.ID == 0 {
|
||||||
|
return "", fmt.Errorf("no track ID found from search")
|
||||||
|
}
|
||||||
|
|
||||||
|
fmt.Printf("Track found: %s - %s (ID: %d)\n", trackInfo.Artist.Name, trackInfo.Title, trackInfo.ID)
|
||||||
|
|
||||||
|
// Prepare metadata
|
||||||
|
finalArtistName := artistName
|
||||||
|
finalTrackTitle := trackName
|
||||||
|
finalAlbumTitle := albumName
|
||||||
|
|
||||||
|
if finalArtistName == "" {
|
||||||
|
var artists []string
|
||||||
|
if len(trackInfo.Artists) > 0 {
|
||||||
|
for _, artist := range trackInfo.Artists {
|
||||||
|
if artist.Name != "" {
|
||||||
|
artists = append(artists, artist.Name)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} else if trackInfo.Artist.Name != "" {
|
||||||
|
artists = append(artists, trackInfo.Artist.Name)
|
||||||
|
}
|
||||||
|
if len(artists) > 0 {
|
||||||
|
finalArtistName = strings.Join(artists, ", ")
|
||||||
|
} else {
|
||||||
|
finalArtistName = "Unknown Artist"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
finalArtistName = sanitizeFilename(finalArtistName)
|
||||||
|
|
||||||
|
if finalTrackTitle == "" {
|
||||||
|
finalTrackTitle = trackInfo.Title
|
||||||
|
if finalTrackTitle == "" {
|
||||||
|
finalTrackTitle = fmt.Sprintf("track_%d", trackInfo.ID)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
finalTrackTitle = sanitizeFilename(finalTrackTitle)
|
||||||
|
|
||||||
|
if finalAlbumTitle == "" {
|
||||||
|
finalAlbumTitle = trackInfo.Album.Title
|
||||||
|
}
|
||||||
|
|
||||||
|
// Check if file already exists
|
||||||
|
if existingFile, exists := CheckISRCExists(outputDir, trackInfo.ISRC); exists {
|
||||||
|
fmt.Printf("File with ISRC %s already exists: %s\n", trackInfo.ISRC, existingFile)
|
||||||
|
return "EXISTS:" + existingFile, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
filename := buildTidalFilename(finalTrackTitle, finalArtistName, trackInfo.TrackNumber, filenameFormat, includeTrackNumber, position, useAlbumTrackNumber)
|
||||||
|
outputFilename := filepath.Join(outputDir, filename)
|
||||||
|
|
||||||
|
if fileInfo, err := os.Stat(outputFilename); err == nil && fileInfo.Size() > 0 {
|
||||||
|
fmt.Printf("File already exists: %s (%.2f MB)\n", outputFilename, float64(fileInfo.Size())/(1024*1024))
|
||||||
|
return "EXISTS:" + outputFilename, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// Request download URL from ALL APIs in parallel - use first success
|
||||||
|
successAPI, downloadURL, err := getDownloadURLParallel(apis, trackInfo.ID, quality)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return "", err
|
return "", err
|
||||||
}
|
}
|
||||||
|
|
||||||
var lastError error
|
// Download the file using the successful API
|
||||||
for i, apiURL := range apis {
|
fmt.Printf("Downloading to: %s\n", outputFilename)
|
||||||
fmt.Printf("[Auto Fallback %d/%d] Trying: %s\n", i+1, len(apis), apiURL)
|
downloader := NewTidalDownloader(successAPI)
|
||||||
|
if err := downloader.DownloadFile(downloadURL, outputFilename); err != nil {
|
||||||
fallbackDownloader := NewTidalDownloader(apiURL)
|
return "", fmt.Errorf("download failed: %w", err)
|
||||||
|
|
||||||
result, err := fallbackDownloader.DownloadByURL(tidalURL, outputDir, quality, filenameFormat, includeTrackNumber, position, spotifyTrackName, spotifyArtistName, spotifyAlbumName, useAlbumTrackNumber)
|
|
||||||
if err == nil {
|
|
||||||
fmt.Printf("✓ Success with: %s\n", apiURL)
|
|
||||||
return result, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
lastError = err
|
|
||||||
errMsg := err.Error()
|
|
||||||
if len(errMsg) > 80 {
|
|
||||||
errMsg = errMsg[:80]
|
|
||||||
}
|
|
||||||
fmt.Printf("✗ Failed with %s: %s\n", apiURL, errMsg)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return "", fmt.Errorf("all %d APIs failed. Last error: %v", len(apis), lastError)
|
// Success! Add metadata
|
||||||
|
fmt.Println("Adding metadata...")
|
||||||
|
|
||||||
|
coverPath := ""
|
||||||
|
if trackInfo.Album.Cover != "" {
|
||||||
|
coverPath = outputFilename + ".cover.jpg"
|
||||||
|
albumArt, err := downloader.DownloadAlbumArt(trackInfo.Album.Cover)
|
||||||
|
if err != nil {
|
||||||
|
fmt.Printf("Warning: Failed to download album art: %v\n", err)
|
||||||
|
} else {
|
||||||
|
if err := os.WriteFile(coverPath, albumArt, 0644); err != nil {
|
||||||
|
fmt.Printf("Warning: Failed to save album art: %v\n", err)
|
||||||
|
} else {
|
||||||
|
defer os.Remove(coverPath)
|
||||||
|
fmt.Println("Album art downloaded")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
releaseYear := ""
|
||||||
|
if len(trackInfo.Album.ReleaseDate) >= 4 {
|
||||||
|
releaseYear = trackInfo.Album.ReleaseDate[:4]
|
||||||
|
}
|
||||||
|
|
||||||
|
trackNumberToEmbed := 0
|
||||||
|
if position > 0 {
|
||||||
|
if useAlbumTrackNumber && trackInfo.TrackNumber > 0 {
|
||||||
|
trackNumberToEmbed = trackInfo.TrackNumber
|
||||||
|
} else {
|
||||||
|
trackNumberToEmbed = position
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
metadata := Metadata{
|
||||||
|
Title: finalTrackTitle,
|
||||||
|
Artist: finalArtistName,
|
||||||
|
Album: finalAlbumTitle,
|
||||||
|
Date: releaseYear,
|
||||||
|
TrackNumber: trackNumberToEmbed,
|
||||||
|
DiscNumber: trackInfo.VolumeNumber,
|
||||||
|
ISRC: trackInfo.ISRC,
|
||||||
|
}
|
||||||
|
|
||||||
|
if err := EmbedMetadata(outputFilename, metadata, coverPath); err != nil {
|
||||||
|
fmt.Printf("Tagging failed: %v\n", err)
|
||||||
|
} else {
|
||||||
|
fmt.Println("Metadata saved")
|
||||||
|
}
|
||||||
|
|
||||||
|
fmt.Println("Done")
|
||||||
|
fmt.Println("✓ Downloaded successfully from Tidal (via search)")
|
||||||
|
return outputFilename, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (t *TidalDownloader) DownloadWithFallback(spotifyTrackID, outputDir, quality, filenameFormat string, includeTrackNumber bool, position int, spotifyTrackName, spotifyArtistName, spotifyAlbumName string, useAlbumTrackNumber bool) (string, error) {
|
||||||
|
// Get Tidal URL once
|
||||||
|
tidalURL, err := t.GetTidalURLFromSpotify(spotifyTrackID)
|
||||||
|
if err != nil {
|
||||||
|
// Songlink failed to find Tidal URL, try search fallback with all APIs
|
||||||
|
fmt.Printf("Songlink couldn't find Tidal URL: %v\n", err)
|
||||||
|
fmt.Println("Trying Tidal search fallback with all APIs...")
|
||||||
|
return t.DownloadBySearchWithFallback(spotifyTrackName, spotifyArtistName, spotifyAlbumName, "", 0, outputDir, quality, filenameFormat, includeTrackNumber, position, useAlbumTrackNumber)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Use parallel API requests via DownloadByURLWithFallback
|
||||||
|
return t.DownloadByURLWithFallback(tidalURL, outputDir, quality, filenameFormat, includeTrackNumber, position, spotifyTrackName, spotifyArtistName, spotifyAlbumName, useAlbumTrackNumber)
|
||||||
|
}
|
||||||
|
|
||||||
|
// DownloadWithFallbackAndISRC downloads with ISRC matching for search fallback
|
||||||
|
// Uses parallel API requests for faster download
|
||||||
|
func (t *TidalDownloader) DownloadWithFallbackAndISRC(spotifyTrackID, spotifyISRC, outputDir, quality, filenameFormat string, includeTrackNumber bool, position int, spotifyTrackName, spotifyArtistName, spotifyAlbumName string, useAlbumTrackNumber bool, expectedDuration int) (string, error) {
|
||||||
|
// Get Tidal URL once
|
||||||
|
tidalURL, err := t.GetTidalURLFromSpotify(spotifyTrackID)
|
||||||
|
if err != nil {
|
||||||
|
// Songlink failed to find Tidal URL, try search fallback with ISRC matching
|
||||||
|
fmt.Printf("Songlink couldn't find Tidal URL: %v\n", err)
|
||||||
|
fmt.Println("Trying Tidal search fallback with ISRC matching...")
|
||||||
|
return t.DownloadBySearchWithFallback(spotifyTrackName, spotifyArtistName, spotifyAlbumName, spotifyISRC, expectedDuration, outputDir, quality, filenameFormat, includeTrackNumber, position, useAlbumTrackNumber)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Use parallel API requests via DownloadByURLWithFallback
|
||||||
|
return t.DownloadByURLWithFallback(tidalURL, outputDir, quality, filenameFormat, includeTrackNumber, position, spotifyTrackName, spotifyArtistName, spotifyAlbumName, useAlbumTrackNumber)
|
||||||
}
|
}
|
||||||
|
|
||||||
func buildTidalFilename(title, artist string, trackNumber int, format string, includeTrackNumber bool, position int, useAlbumTrackNumber bool) string {
|
func buildTidalFilename(title, artist string, trackNumber int, format string, includeTrackNumber bool, position int, useAlbumTrackNumber bool) string {
|
||||||
|
|||||||
+1
-1
@@ -6,7 +6,7 @@
|
|||||||
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
|
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
|
||||||
<link rel="preconnect" href="https://fonts.googleapis.com">
|
<link rel="preconnect" href="https://fonts.googleapis.com">
|
||||||
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
|
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
|
||||||
<link href="https://fonts.googleapis.com/css2?family=Google+Sans+Code:ital,wght@0,300..800;1,300..800&family=Google+Sans+Flex:opsz,wght@6..144,1..1000&display=swap" rel="stylesheet">
|
<link href="https://fonts.googleapis.com/css2?family=DM+Sans:wght@300..800&family=Google+Sans+Code:ital,wght@0,300..800;1,300..800&family=Google+Sans+Flex:opsz,wght@6..144,1..1000&family=Inter:wght@300..800&family=Manrope:wght@300..800&family=Plus+Jakarta+Sans:wght@300..800&family=Poppins:wght@300;400;500;600;700;800&family=Roboto:wght@300;400;500;700;900&family=Space+Grotesk:wght@300..700&display=swap" rel="stylesheet">
|
||||||
<title>SpotiFLAC</title>
|
<title>SpotiFLAC</title>
|
||||||
</head>
|
</head>
|
||||||
<body>
|
<body>
|
||||||
|
|||||||
@@ -6,6 +6,7 @@
|
|||||||
"scripts": {
|
"scripts": {
|
||||||
"dev": "vite",
|
"dev": "vite",
|
||||||
"build": "tsc -b && vite build",
|
"build": "tsc -b && vite build",
|
||||||
|
"postinstall": "node scripts/generate-icon.js",
|
||||||
"lint": "eslint .",
|
"lint": "eslint .",
|
||||||
"preview": "vite preview",
|
"preview": "vite preview",
|
||||||
"generate-icon": "node scripts/generate-icon.js"
|
"generate-icon": "node scripts/generate-icon.js"
|
||||||
@@ -17,14 +18,16 @@
|
|||||||
"@radix-ui/react-label": "^2.1.8",
|
"@radix-ui/react-label": "^2.1.8",
|
||||||
"@radix-ui/react-progress": "^1.1.8",
|
"@radix-ui/react-progress": "^1.1.8",
|
||||||
"@radix-ui/react-radio-group": "^1.3.8",
|
"@radix-ui/react-radio-group": "^1.3.8",
|
||||||
|
"@radix-ui/react-scroll-area": "^1.2.10",
|
||||||
"@radix-ui/react-select": "^2.2.6",
|
"@radix-ui/react-select": "^2.2.6",
|
||||||
"@radix-ui/react-slot": "^1.2.4",
|
"@radix-ui/react-slot": "^1.2.4",
|
||||||
|
"@radix-ui/react-switch": "^1.1.3",
|
||||||
"@radix-ui/react-tabs": "^1.1.13",
|
"@radix-ui/react-tabs": "^1.1.13",
|
||||||
"@radix-ui/react-tooltip": "^1.2.8",
|
"@radix-ui/react-tooltip": "^1.2.8",
|
||||||
"@tailwindcss/vite": "^4.1.17",
|
"@tailwindcss/vite": "^4.1.17",
|
||||||
"class-variance-authority": "^0.7.1",
|
"class-variance-authority": "^0.7.1",
|
||||||
"clsx": "^2.1.1",
|
"clsx": "^2.1.1",
|
||||||
"lucide-react": "^0.554.0",
|
"lucide-react": "^0.555.0",
|
||||||
"next-themes": "^0.4.6",
|
"next-themes": "^0.4.6",
|
||||||
"react": "^19.2.0",
|
"react": "^19.2.0",
|
||||||
"react-dom": "^19.2.0",
|
"react-dom": "^19.2.0",
|
||||||
@@ -35,7 +38,7 @@
|
|||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@eslint/js": "^9.39.1",
|
"@eslint/js": "^9.39.1",
|
||||||
"@types/node": "^24.10.1",
|
"@types/node": "^24.10.1",
|
||||||
"@types/react": "^19.2.6",
|
"@types/react": "^19.2.7",
|
||||||
"@types/react-dom": "^19.2.3",
|
"@types/react-dom": "^19.2.3",
|
||||||
"@vitejs/plugin-react": "^5.1.1",
|
"@vitejs/plugin-react": "^5.1.1",
|
||||||
"eslint": "^9.39.1",
|
"eslint": "^9.39.1",
|
||||||
@@ -45,7 +48,7 @@
|
|||||||
"sharp": "^0.34.5",
|
"sharp": "^0.34.5",
|
||||||
"tw-animate-css": "^1.4.0",
|
"tw-animate-css": "^1.4.0",
|
||||||
"typescript": "~5.9.3",
|
"typescript": "~5.9.3",
|
||||||
"typescript-eslint": "^8.47.0",
|
"typescript-eslint": "^8.48.0",
|
||||||
"vite": "^7.2.4"
|
"vite": "^7.2.6"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1 +1 @@
|
|||||||
72728e016fdcbb66d395ba3a681b8945
|
b7a549e463d5f6a2fad25f5ce939cdd7
|
||||||
Generated
+429
-486
File diff suppressed because it is too large
Load Diff
@@ -1,42 +0,0 @@
|
|||||||
#root {
|
|
||||||
max-width: 1280px;
|
|
||||||
margin: 0 auto;
|
|
||||||
padding: 2rem;
|
|
||||||
text-align: center;
|
|
||||||
}
|
|
||||||
|
|
||||||
.logo {
|
|
||||||
height: 6em;
|
|
||||||
padding: 1.5em;
|
|
||||||
will-change: filter;
|
|
||||||
transition: filter 300ms;
|
|
||||||
}
|
|
||||||
.logo:hover {
|
|
||||||
filter: drop-shadow(0 0 2em #646cffaa);
|
|
||||||
}
|
|
||||||
.logo.react:hover {
|
|
||||||
filter: drop-shadow(0 0 2em #61dafbaa);
|
|
||||||
}
|
|
||||||
|
|
||||||
@keyframes logo-spin {
|
|
||||||
from {
|
|
||||||
transform: rotate(0deg);
|
|
||||||
}
|
|
||||||
to {
|
|
||||||
transform: rotate(360deg);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@media (prefers-reduced-motion: no-preference) {
|
|
||||||
a:nth-of-type(2) .logo {
|
|
||||||
animation: logo-spin infinite 20s linear;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
.card {
|
|
||||||
padding: 2em;
|
|
||||||
}
|
|
||||||
|
|
||||||
.read-the-docs {
|
|
||||||
color: #888;
|
|
||||||
}
|
|
||||||
+389
-93
@@ -5,50 +5,71 @@ import {
|
|||||||
DialogContent,
|
DialogContent,
|
||||||
DialogDescription,
|
DialogDescription,
|
||||||
DialogFooter,
|
DialogFooter,
|
||||||
DialogHeader,
|
|
||||||
DialogTitle,
|
DialogTitle,
|
||||||
} from "@/components/ui/dialog";
|
} from "@/components/ui/dialog";
|
||||||
import { Label } from "@/components/ui/label";
|
import { Label } from "@/components/ui/label";
|
||||||
import { Input } from "@/components/ui/input";
|
import { Input } from "@/components/ui/input";
|
||||||
import { Search } from "lucide-react";
|
import { Search, X } from "lucide-react";
|
||||||
import { TooltipProvider } from "@/components/ui/tooltip";
|
import { TooltipProvider } from "@/components/ui/tooltip";
|
||||||
import { getSettings, applyThemeMode } from "@/lib/settings";
|
import { getSettings, applyThemeMode, applyFont } from "@/lib/settings";
|
||||||
import { applyTheme } from "@/lib/themes";
|
import { applyTheme } from "@/lib/themes";
|
||||||
import { OpenFolder } from "../wailsjs/go/main/App";
|
import { OpenFolder } from "../wailsjs/go/main/App";
|
||||||
import { toastWithSound as toast } from "@/lib/toast-with-sound";
|
import { toastWithSound as toast } from "@/lib/toast-with-sound";
|
||||||
|
|
||||||
// Components
|
// Components
|
||||||
import { TitleBar } from "@/components/TitleBar";
|
import { TitleBar } from "@/components/TitleBar";
|
||||||
|
import { Sidebar, type PageType } from "@/components/Sidebar";
|
||||||
import { Header } from "@/components/Header";
|
import { Header } from "@/components/Header";
|
||||||
import { SearchBar } from "@/components/SearchBar";
|
import { SearchBar } from "@/components/SearchBar";
|
||||||
import { TrackInfo } from "@/components/TrackInfo";
|
import { TrackInfo } from "@/components/TrackInfo";
|
||||||
import { AlbumInfo } from "@/components/AlbumInfo";
|
import { AlbumInfo } from "@/components/AlbumInfo";
|
||||||
import { PlaylistInfo } from "@/components/PlaylistInfo";
|
import { PlaylistInfo } from "@/components/PlaylistInfo";
|
||||||
import { ArtistInfo } from "@/components/ArtistInfo";
|
import { ArtistInfo } from "@/components/ArtistInfo";
|
||||||
|
import { DownloadQueue } from "@/components/DownloadQueue";
|
||||||
import { DownloadProgressToast } from "@/components/DownloadProgressToast";
|
import { DownloadProgressToast } from "@/components/DownloadProgressToast";
|
||||||
|
import { AudioAnalysisPage } from "@/components/AudioAnalysisPage";
|
||||||
|
import { SettingsPage } from "@/components/SettingsPage";
|
||||||
|
import { DebugLoggerPage } from "@/components/DebugLoggerPage";
|
||||||
|
import type { HistoryItem } from "@/components/FetchHistory";
|
||||||
|
|
||||||
// Hooks
|
// Hooks
|
||||||
import { useDownload } from "@/hooks/useDownload";
|
import { useDownload } from "@/hooks/useDownload";
|
||||||
import { useMetadata } from "@/hooks/useMetadata";
|
import { useMetadata } from "@/hooks/useMetadata";
|
||||||
|
import { useLyrics } from "@/hooks/useLyrics";
|
||||||
|
import { useCover } from "@/hooks/useCover";
|
||||||
|
import { useAvailability } from "@/hooks/useAvailability";
|
||||||
|
import { useDownloadQueueDialog } from "@/hooks/useDownloadQueueDialog";
|
||||||
|
|
||||||
|
const HISTORY_KEY = "spotiflac_fetch_history";
|
||||||
|
const MAX_HISTORY = 5;
|
||||||
|
|
||||||
function App() {
|
function App() {
|
||||||
|
const [currentPage, setCurrentPage] = useState<PageType>("main");
|
||||||
const [spotifyUrl, setSpotifyUrl] = useState("");
|
const [spotifyUrl, setSpotifyUrl] = useState("");
|
||||||
const [selectedTracks, setSelectedTracks] = useState<string[]>([]);
|
const [selectedTracks, setSelectedTracks] = useState<string[]>([]);
|
||||||
const [searchQuery, setSearchQuery] = useState("");
|
const [searchQuery, setSearchQuery] = useState("");
|
||||||
const [sortBy, setSortBy] = useState<string>("default");
|
const [sortBy, setSortBy] = useState<string>("default");
|
||||||
const [currentPage, setCurrentPage] = useState(1);
|
const [currentListPage, setCurrentListPage] = useState(1);
|
||||||
const [hasUpdate, setHasUpdate] = useState(false);
|
const [hasUpdate, setHasUpdate] = useState(false);
|
||||||
|
const [releaseDate, setReleaseDate] = useState<string | null>(null);
|
||||||
|
const [fetchHistory, setFetchHistory] = useState<HistoryItem[]>([]);
|
||||||
|
|
||||||
const ITEMS_PER_PAGE = 50;
|
const ITEMS_PER_PAGE = 50;
|
||||||
const CURRENT_VERSION = "6.1";
|
const CURRENT_VERSION = "6.6";
|
||||||
|
|
||||||
const download = useDownload();
|
const download = useDownload();
|
||||||
const metadata = useMetadata();
|
const metadata = useMetadata();
|
||||||
|
const lyrics = useLyrics();
|
||||||
|
const cover = useCover();
|
||||||
|
const availability = useAvailability();
|
||||||
|
const downloadQueue = useDownloadQueueDialog();
|
||||||
|
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
const settings = getSettings();
|
const settings = getSettings();
|
||||||
applyThemeMode(settings.themeMode);
|
applyThemeMode(settings.themeMode);
|
||||||
applyTheme(settings.theme);
|
applyTheme(settings.theme);
|
||||||
|
applyFont(settings.fontFamily);
|
||||||
|
|
||||||
const mediaQuery = window.matchMedia("(prefers-color-scheme: dark)");
|
const mediaQuery = window.matchMedia("(prefers-color-scheme: dark)");
|
||||||
const handleChange = () => {
|
const handleChange = () => {
|
||||||
@@ -61,6 +82,7 @@ function App() {
|
|||||||
|
|
||||||
mediaQuery.addEventListener("change", handleChange);
|
mediaQuery.addEventListener("change", handleChange);
|
||||||
checkForUpdates();
|
checkForUpdates();
|
||||||
|
loadHistory();
|
||||||
|
|
||||||
return () => {
|
return () => {
|
||||||
mediaQuery.removeEventListener("change", handleChange);
|
mediaQuery.removeEventListener("change", handleChange);
|
||||||
@@ -71,19 +93,26 @@ function App() {
|
|||||||
setSelectedTracks([]);
|
setSelectedTracks([]);
|
||||||
setSearchQuery("");
|
setSearchQuery("");
|
||||||
download.resetDownloadedTracks();
|
download.resetDownloadedTracks();
|
||||||
|
lyrics.resetLyricsState();
|
||||||
|
cover.resetCoverState();
|
||||||
|
availability.clearAvailability();
|
||||||
setSortBy("default");
|
setSortBy("default");
|
||||||
setCurrentPage(1);
|
setCurrentListPage(1);
|
||||||
}, [metadata.metadata]);
|
}, [metadata.metadata]);
|
||||||
|
|
||||||
const checkForUpdates = async () => {
|
const checkForUpdates = async () => {
|
||||||
try {
|
try {
|
||||||
const response = await fetch(
|
const response = await fetch(
|
||||||
"https://cdn.jsdelivr.net/gh/afkarxyz/SpotiFLAC@refs/heads/main/version.json"
|
"https://api.github.com/repos/afkarxyz/SpotiFLAC/releases/latest"
|
||||||
);
|
);
|
||||||
const data = await response.json();
|
const data = await response.json();
|
||||||
const latestVersion = data.version;
|
const latestVersion = data.tag_name?.replace(/^v/, "") || "";
|
||||||
|
|
||||||
if (latestVersion > CURRENT_VERSION) {
|
if (data.published_at) {
|
||||||
|
setReleaseDate(data.published_at);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (latestVersion && latestVersion > CURRENT_VERSION) {
|
||||||
setHasUpdate(true);
|
setHasUpdate(true);
|
||||||
}
|
}
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
@@ -91,6 +120,55 @@ function App() {
|
|||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
const loadHistory = () => {
|
||||||
|
try {
|
||||||
|
const saved = localStorage.getItem(HISTORY_KEY);
|
||||||
|
if (saved) {
|
||||||
|
setFetchHistory(JSON.parse(saved));
|
||||||
|
}
|
||||||
|
} catch (err) {
|
||||||
|
console.error("Failed to load history:", err);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
const saveHistory = (history: HistoryItem[]) => {
|
||||||
|
try {
|
||||||
|
localStorage.setItem(HISTORY_KEY, JSON.stringify(history));
|
||||||
|
} catch (err) {
|
||||||
|
console.error("Failed to save history:", err);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
const addToHistory = (item: Omit<HistoryItem, "id" | "timestamp">) => {
|
||||||
|
setFetchHistory((prev) => {
|
||||||
|
const filtered = prev.filter((h) => h.url !== item.url);
|
||||||
|
const newItem: HistoryItem = {
|
||||||
|
...item,
|
||||||
|
id: crypto.randomUUID(),
|
||||||
|
timestamp: Date.now(),
|
||||||
|
};
|
||||||
|
const updated = [newItem, ...filtered].slice(0, MAX_HISTORY);
|
||||||
|
saveHistory(updated);
|
||||||
|
return updated;
|
||||||
|
});
|
||||||
|
};
|
||||||
|
|
||||||
|
const removeFromHistory = (id: string) => {
|
||||||
|
setFetchHistory((prev) => {
|
||||||
|
const updated = prev.filter((h) => h.id !== id);
|
||||||
|
saveHistory(updated);
|
||||||
|
return updated;
|
||||||
|
});
|
||||||
|
};
|
||||||
|
|
||||||
|
const handleHistorySelect = async (item: HistoryItem) => {
|
||||||
|
setSpotifyUrl(item.url);
|
||||||
|
const updatedUrl = await metadata.handleFetchMetadata(item.url);
|
||||||
|
if (updatedUrl) {
|
||||||
|
setSpotifyUrl(updatedUrl);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
const handleFetchMetadata = async () => {
|
const handleFetchMetadata = async () => {
|
||||||
const updatedUrl = await metadata.handleFetchMetadata(spotifyUrl);
|
const updatedUrl = await metadata.handleFetchMetadata(spotifyUrl);
|
||||||
if (updatedUrl) {
|
if (updatedUrl) {
|
||||||
@@ -98,9 +176,57 @@ function App() {
|
|||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
if (!metadata.metadata || !spotifyUrl) return;
|
||||||
|
|
||||||
|
let historyItem: Omit<HistoryItem, "id" | "timestamp"> | null = null;
|
||||||
|
|
||||||
|
if ("track" in metadata.metadata) {
|
||||||
|
const { track } = metadata.metadata;
|
||||||
|
historyItem = {
|
||||||
|
url: spotifyUrl,
|
||||||
|
type: "track",
|
||||||
|
name: track.name,
|
||||||
|
artist: track.artists,
|
||||||
|
image: track.images,
|
||||||
|
};
|
||||||
|
} else if ("album_info" in metadata.metadata) {
|
||||||
|
const { album_info } = metadata.metadata;
|
||||||
|
historyItem = {
|
||||||
|
url: spotifyUrl,
|
||||||
|
type: "album",
|
||||||
|
name: album_info.name,
|
||||||
|
artist: album_info.artists,
|
||||||
|
image: album_info.images,
|
||||||
|
};
|
||||||
|
} else if ("playlist_info" in metadata.metadata) {
|
||||||
|
const { playlist_info } = metadata.metadata;
|
||||||
|
historyItem = {
|
||||||
|
url: spotifyUrl,
|
||||||
|
type: "playlist",
|
||||||
|
name: playlist_info.owner.name,
|
||||||
|
artist: `${playlist_info.tracks.total} tracks • ${playlist_info.owner.display_name}`,
|
||||||
|
image: playlist_info.owner.images || "",
|
||||||
|
};
|
||||||
|
} else if ("artist_info" in metadata.metadata) {
|
||||||
|
const { artist_info } = metadata.metadata;
|
||||||
|
historyItem = {
|
||||||
|
url: spotifyUrl,
|
||||||
|
type: "artist",
|
||||||
|
name: artist_info.name,
|
||||||
|
artist: `${artist_info.total_albums} albums`,
|
||||||
|
image: artist_info.images,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
if (historyItem) {
|
||||||
|
addToHistory(historyItem);
|
||||||
|
}
|
||||||
|
}, [metadata.metadata]);
|
||||||
|
|
||||||
const handleSearchChange = (value: string) => {
|
const handleSearchChange = (value: string) => {
|
||||||
setSearchQuery(value);
|
setSearchQuery(value);
|
||||||
setCurrentPage(1);
|
setCurrentListPage(1);
|
||||||
};
|
};
|
||||||
|
|
||||||
const toggleTrackSelection = (isrc: string) => {
|
const toggleTrackSelection = (isrc: string) => {
|
||||||
@@ -133,6 +259,7 @@ function App() {
|
|||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
const renderMetadata = () => {
|
const renderMetadata = () => {
|
||||||
if (!metadata.metadata) return null;
|
if (!metadata.metadata) return null;
|
||||||
|
|
||||||
@@ -145,7 +272,18 @@ function App() {
|
|||||||
downloadingTrack={download.downloadingTrack}
|
downloadingTrack={download.downloadingTrack}
|
||||||
isDownloaded={download.downloadedTracks.has(track.isrc)}
|
isDownloaded={download.downloadedTracks.has(track.isrc)}
|
||||||
isFailed={download.failedTracks.has(track.isrc)}
|
isFailed={download.failedTracks.has(track.isrc)}
|
||||||
|
isSkipped={download.skippedTracks.has(track.isrc)}
|
||||||
|
downloadingLyricsTrack={lyrics.downloadingLyricsTrack}
|
||||||
|
downloadedLyrics={lyrics.downloadedLyrics.has(track.spotify_id || "")}
|
||||||
|
failedLyrics={lyrics.failedLyrics.has(track.spotify_id || "")}
|
||||||
|
skippedLyrics={lyrics.skippedLyrics.has(track.spotify_id || "")}
|
||||||
|
checkingAvailability={availability.checkingTrackId === track.spotify_id}
|
||||||
|
availability={availability.getAvailability(track.spotify_id || "")}
|
||||||
|
downloadingCover={cover.downloadingCover}
|
||||||
onDownload={download.handleDownloadTrack}
|
onDownload={download.handleDownloadTrack}
|
||||||
|
onDownloadLyrics={lyrics.handleDownloadLyrics}
|
||||||
|
onCheckAvailability={availability.checkAvailability}
|
||||||
|
onDownloadCover={cover.handleDownloadCover}
|
||||||
onOpenFolder={handleOpenFolder}
|
onOpenFolder={handleOpenFolder}
|
||||||
/>
|
/>
|
||||||
);
|
);
|
||||||
@@ -162,25 +300,57 @@ function App() {
|
|||||||
selectedTracks={selectedTracks}
|
selectedTracks={selectedTracks}
|
||||||
downloadedTracks={download.downloadedTracks}
|
downloadedTracks={download.downloadedTracks}
|
||||||
failedTracks={download.failedTracks}
|
failedTracks={download.failedTracks}
|
||||||
|
skippedTracks={download.skippedTracks}
|
||||||
downloadingTrack={download.downloadingTrack}
|
downloadingTrack={download.downloadingTrack}
|
||||||
isDownloading={download.isDownloading}
|
isDownloading={download.isDownloading}
|
||||||
bulkDownloadType={download.bulkDownloadType}
|
bulkDownloadType={download.bulkDownloadType}
|
||||||
downloadProgress={download.downloadProgress}
|
downloadProgress={download.downloadProgress}
|
||||||
currentDownloadInfo={download.currentDownloadInfo}
|
currentDownloadInfo={download.currentDownloadInfo}
|
||||||
currentPage={currentPage}
|
currentPage={currentListPage}
|
||||||
itemsPerPage={ITEMS_PER_PAGE}
|
itemsPerPage={ITEMS_PER_PAGE}
|
||||||
|
downloadedLyrics={lyrics.downloadedLyrics}
|
||||||
|
failedLyrics={lyrics.failedLyrics}
|
||||||
|
skippedLyrics={lyrics.skippedLyrics}
|
||||||
|
downloadingLyricsTrack={lyrics.downloadingLyricsTrack}
|
||||||
|
checkingAvailabilityTrack={availability.checkingTrackId}
|
||||||
|
availabilityMap={availability.availabilityMap}
|
||||||
|
downloadedCovers={cover.downloadedCovers}
|
||||||
|
failedCovers={cover.failedCovers}
|
||||||
|
skippedCovers={cover.skippedCovers}
|
||||||
|
downloadingCoverTrack={cover.downloadingCoverTrack}
|
||||||
|
isBulkDownloadingCovers={cover.isBulkDownloadingCovers}
|
||||||
onSearchChange={handleSearchChange}
|
onSearchChange={handleSearchChange}
|
||||||
onSortChange={setSortBy}
|
onSortChange={setSortBy}
|
||||||
onToggleTrack={toggleTrackSelection}
|
onToggleTrack={toggleTrackSelection}
|
||||||
onToggleSelectAll={toggleSelectAll}
|
onToggleSelectAll={toggleSelectAll}
|
||||||
onDownloadTrack={download.handleDownloadTrack}
|
onDownloadTrack={download.handleDownloadTrack}
|
||||||
|
onDownloadLyrics={(spotifyId, name, artists, albumName, _folderName, _isArtistDiscography, position) =>
|
||||||
|
lyrics.handleDownloadLyrics(spotifyId, name, artists, albumName, album_info.name, false, position)
|
||||||
|
}
|
||||||
|
onDownloadCover={(coverUrl, trackName, artistName, albumName, _folderName, _isArtistDiscography, position, trackId) =>
|
||||||
|
cover.handleDownloadCover(coverUrl, trackName, artistName, albumName, album_info.name, false, position, trackId)
|
||||||
|
}
|
||||||
|
onCheckAvailability={availability.checkAvailability}
|
||||||
|
onDownloadAllCovers={() => cover.handleDownloadAllCovers(track_list, album_info.name)}
|
||||||
onDownloadAll={() => download.handleDownloadAll(track_list, album_info.name)}
|
onDownloadAll={() => download.handleDownloadAll(track_list, album_info.name)}
|
||||||
onDownloadSelected={() =>
|
onDownloadSelected={() =>
|
||||||
download.handleDownloadSelected(selectedTracks, track_list, album_info.name)
|
download.handleDownloadSelected(selectedTracks, track_list, album_info.name)
|
||||||
}
|
}
|
||||||
onStopDownload={download.handleStopDownload}
|
onStopDownload={download.handleStopDownload}
|
||||||
onOpenFolder={handleOpenFolder}
|
onOpenFolder={handleOpenFolder}
|
||||||
onPageChange={setCurrentPage}
|
onPageChange={setCurrentListPage}
|
||||||
|
onArtistClick={async (artist) => {
|
||||||
|
const artistUrl = await metadata.handleArtistClick(artist);
|
||||||
|
if (artistUrl) {
|
||||||
|
setSpotifyUrl(artistUrl);
|
||||||
|
}
|
||||||
|
}}
|
||||||
|
onTrackClick={async (track) => {
|
||||||
|
if (track.external_urls) {
|
||||||
|
setSpotifyUrl(track.external_urls);
|
||||||
|
await metadata.handleFetchMetadata(track.external_urls);
|
||||||
|
}
|
||||||
|
}}
|
||||||
/>
|
/>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
@@ -196,18 +366,38 @@ function App() {
|
|||||||
selectedTracks={selectedTracks}
|
selectedTracks={selectedTracks}
|
||||||
downloadedTracks={download.downloadedTracks}
|
downloadedTracks={download.downloadedTracks}
|
||||||
failedTracks={download.failedTracks}
|
failedTracks={download.failedTracks}
|
||||||
|
skippedTracks={download.skippedTracks}
|
||||||
downloadingTrack={download.downloadingTrack}
|
downloadingTrack={download.downloadingTrack}
|
||||||
isDownloading={download.isDownloading}
|
isDownloading={download.isDownloading}
|
||||||
bulkDownloadType={download.bulkDownloadType}
|
bulkDownloadType={download.bulkDownloadType}
|
||||||
downloadProgress={download.downloadProgress}
|
downloadProgress={download.downloadProgress}
|
||||||
currentDownloadInfo={download.currentDownloadInfo}
|
currentDownloadInfo={download.currentDownloadInfo}
|
||||||
currentPage={currentPage}
|
currentPage={currentListPage}
|
||||||
itemsPerPage={ITEMS_PER_PAGE}
|
itemsPerPage={ITEMS_PER_PAGE}
|
||||||
|
downloadedLyrics={lyrics.downloadedLyrics}
|
||||||
|
failedLyrics={lyrics.failedLyrics}
|
||||||
|
skippedLyrics={lyrics.skippedLyrics}
|
||||||
|
downloadingLyricsTrack={lyrics.downloadingLyricsTrack}
|
||||||
|
checkingAvailabilityTrack={availability.checkingTrackId}
|
||||||
|
availabilityMap={availability.availabilityMap}
|
||||||
|
downloadedCovers={cover.downloadedCovers}
|
||||||
|
failedCovers={cover.failedCovers}
|
||||||
|
skippedCovers={cover.skippedCovers}
|
||||||
|
downloadingCoverTrack={cover.downloadingCoverTrack}
|
||||||
|
isBulkDownloadingCovers={cover.isBulkDownloadingCovers}
|
||||||
onSearchChange={handleSearchChange}
|
onSearchChange={handleSearchChange}
|
||||||
onSortChange={setSortBy}
|
onSortChange={setSortBy}
|
||||||
onToggleTrack={toggleTrackSelection}
|
onToggleTrack={toggleTrackSelection}
|
||||||
onToggleSelectAll={toggleSelectAll}
|
onToggleSelectAll={toggleSelectAll}
|
||||||
onDownloadTrack={download.handleDownloadTrack}
|
onDownloadTrack={download.handleDownloadTrack}
|
||||||
|
onDownloadLyrics={(spotifyId, name, artists, albumName, _folderName, _isArtistDiscography, position) =>
|
||||||
|
lyrics.handleDownloadLyrics(spotifyId, name, artists, albumName, playlist_info.owner.name, false, position)
|
||||||
|
}
|
||||||
|
onDownloadCover={(coverUrl, trackName, artistName, albumName, _folderName, _isArtistDiscography, position, trackId) =>
|
||||||
|
cover.handleDownloadCover(coverUrl, trackName, artistName, albumName, playlist_info.owner.name, false, position, trackId)
|
||||||
|
}
|
||||||
|
onCheckAvailability={availability.checkAvailability}
|
||||||
|
onDownloadAllCovers={() => cover.handleDownloadAllCovers(track_list, playlist_info.owner.name)}
|
||||||
onDownloadAll={() => download.handleDownloadAll(track_list, playlist_info.owner.name)}
|
onDownloadAll={() => download.handleDownloadAll(track_list, playlist_info.owner.name)}
|
||||||
onDownloadSelected={() =>
|
onDownloadSelected={() =>
|
||||||
download.handleDownloadSelected(
|
download.handleDownloadSelected(
|
||||||
@@ -218,7 +408,20 @@ function App() {
|
|||||||
}
|
}
|
||||||
onStopDownload={download.handleStopDownload}
|
onStopDownload={download.handleStopDownload}
|
||||||
onOpenFolder={handleOpenFolder}
|
onOpenFolder={handleOpenFolder}
|
||||||
onPageChange={setCurrentPage}
|
onPageChange={setCurrentListPage}
|
||||||
|
onAlbumClick={metadata.handleAlbumClick}
|
||||||
|
onArtistClick={async (artist) => {
|
||||||
|
const artistUrl = await metadata.handleArtistClick(artist);
|
||||||
|
if (artistUrl) {
|
||||||
|
setSpotifyUrl(artistUrl);
|
||||||
|
}
|
||||||
|
}}
|
||||||
|
onTrackClick={async (track) => {
|
||||||
|
if (track.external_urls) {
|
||||||
|
setSpotifyUrl(track.external_urls);
|
||||||
|
await metadata.handleFetchMetadata(track.external_urls);
|
||||||
|
}
|
||||||
|
}}
|
||||||
/>
|
/>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
@@ -235,18 +438,38 @@ function App() {
|
|||||||
selectedTracks={selectedTracks}
|
selectedTracks={selectedTracks}
|
||||||
downloadedTracks={download.downloadedTracks}
|
downloadedTracks={download.downloadedTracks}
|
||||||
failedTracks={download.failedTracks}
|
failedTracks={download.failedTracks}
|
||||||
|
skippedTracks={download.skippedTracks}
|
||||||
downloadingTrack={download.downloadingTrack}
|
downloadingTrack={download.downloadingTrack}
|
||||||
isDownloading={download.isDownloading}
|
isDownloading={download.isDownloading}
|
||||||
bulkDownloadType={download.bulkDownloadType}
|
bulkDownloadType={download.bulkDownloadType}
|
||||||
downloadProgress={download.downloadProgress}
|
downloadProgress={download.downloadProgress}
|
||||||
currentDownloadInfo={download.currentDownloadInfo}
|
currentDownloadInfo={download.currentDownloadInfo}
|
||||||
currentPage={currentPage}
|
currentPage={currentListPage}
|
||||||
itemsPerPage={ITEMS_PER_PAGE}
|
itemsPerPage={ITEMS_PER_PAGE}
|
||||||
|
downloadedLyrics={lyrics.downloadedLyrics}
|
||||||
|
failedLyrics={lyrics.failedLyrics}
|
||||||
|
skippedLyrics={lyrics.skippedLyrics}
|
||||||
|
downloadingLyricsTrack={lyrics.downloadingLyricsTrack}
|
||||||
|
checkingAvailabilityTrack={availability.checkingTrackId}
|
||||||
|
availabilityMap={availability.availabilityMap}
|
||||||
|
downloadedCovers={cover.downloadedCovers}
|
||||||
|
failedCovers={cover.failedCovers}
|
||||||
|
skippedCovers={cover.skippedCovers}
|
||||||
|
downloadingCoverTrack={cover.downloadingCoverTrack}
|
||||||
|
isBulkDownloadingCovers={cover.isBulkDownloadingCovers}
|
||||||
onSearchChange={handleSearchChange}
|
onSearchChange={handleSearchChange}
|
||||||
onSortChange={setSortBy}
|
onSortChange={setSortBy}
|
||||||
onToggleTrack={toggleTrackSelection}
|
onToggleTrack={toggleTrackSelection}
|
||||||
onToggleSelectAll={toggleSelectAll}
|
onToggleSelectAll={toggleSelectAll}
|
||||||
onDownloadTrack={download.handleDownloadTrack}
|
onDownloadTrack={download.handleDownloadTrack}
|
||||||
|
onDownloadLyrics={(spotifyId, name, artists, albumName, _folderName, isArtistDiscography, position) =>
|
||||||
|
lyrics.handleDownloadLyrics(spotifyId, name, artists, albumName, artist_info.name, isArtistDiscography, position)
|
||||||
|
}
|
||||||
|
onDownloadCover={(coverUrl, trackName, artistName, albumName, _folderName, isArtistDiscography, position, trackId) =>
|
||||||
|
cover.handleDownloadCover(coverUrl, trackName, artistName, albumName, artist_info.name, isArtistDiscography, position, trackId)
|
||||||
|
}
|
||||||
|
onCheckAvailability={availability.checkAvailability}
|
||||||
|
onDownloadAllCovers={() => cover.handleDownloadAllCovers(track_list, artist_info.name, true)}
|
||||||
onDownloadAll={() => download.handleDownloadAll(track_list, artist_info.name, true)}
|
onDownloadAll={() => download.handleDownloadAll(track_list, artist_info.name, true)}
|
||||||
onDownloadSelected={() =>
|
onDownloadSelected={() =>
|
||||||
download.handleDownloadSelected(selectedTracks, track_list, artist_info.name, true)
|
download.handleDownloadSelected(selectedTracks, track_list, artist_info.name, true)
|
||||||
@@ -254,7 +477,19 @@ function App() {
|
|||||||
onStopDownload={download.handleStopDownload}
|
onStopDownload={download.handleStopDownload}
|
||||||
onOpenFolder={handleOpenFolder}
|
onOpenFolder={handleOpenFolder}
|
||||||
onAlbumClick={metadata.handleAlbumClick}
|
onAlbumClick={metadata.handleAlbumClick}
|
||||||
onPageChange={setCurrentPage}
|
onArtistClick={async (artist) => {
|
||||||
|
const artistUrl = await metadata.handleArtistClick(artist);
|
||||||
|
if (artistUrl) {
|
||||||
|
setSpotifyUrl(artistUrl);
|
||||||
|
}
|
||||||
|
}}
|
||||||
|
onPageChange={setCurrentListPage}
|
||||||
|
onTrackClick={async (track) => {
|
||||||
|
if (track.external_urls) {
|
||||||
|
setSpotifyUrl(track.external_urls);
|
||||||
|
await metadata.handleFetchMetadata(track.external_urls);
|
||||||
|
}
|
||||||
|
}}
|
||||||
/>
|
/>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
@@ -262,98 +497,159 @@ function App() {
|
|||||||
return null;
|
return null;
|
||||||
};
|
};
|
||||||
|
|
||||||
return (
|
|
||||||
<TooltipProvider>
|
|
||||||
<div className="min-h-screen bg-background flex flex-col">
|
|
||||||
<TitleBar />
|
|
||||||
<div className="flex-1 p-4 md:p-8">
|
|
||||||
<div className="max-w-4xl mx-auto space-y-6">
|
|
||||||
<Header version={CURRENT_VERSION} hasUpdate={hasUpdate} />
|
|
||||||
|
|
||||||
{/* Download Progress Toast */}
|
|
||||||
<DownloadProgressToast />
|
|
||||||
|
|
||||||
{/* Timeout Dialog */}
|
const renderPage = () => {
|
||||||
<Dialog
|
switch (currentPage) {
|
||||||
open={metadata.showTimeoutDialog}
|
case "settings":
|
||||||
onOpenChange={metadata.setShowTimeoutDialog}
|
return <SettingsPage />;
|
||||||
>
|
case "debug":
|
||||||
<DialogContent className="sm:max-w-[425px]">
|
return <DebugLoggerPage />;
|
||||||
<DialogHeader>
|
case "audio-analysis":
|
||||||
<DialogTitle>Fetch Settings</DialogTitle>
|
return <AudioAnalysisPage />;
|
||||||
|
default:
|
||||||
|
return (
|
||||||
|
<>
|
||||||
|
<Header
|
||||||
|
version={CURRENT_VERSION}
|
||||||
|
hasUpdate={hasUpdate}
|
||||||
|
releaseDate={releaseDate}
|
||||||
|
/>
|
||||||
|
|
||||||
|
{/* Timeout Dialog */}
|
||||||
|
<Dialog
|
||||||
|
open={metadata.showTimeoutDialog}
|
||||||
|
onOpenChange={metadata.setShowTimeoutDialog}
|
||||||
|
>
|
||||||
|
<DialogContent className="sm:max-w-[425px] p-6 [&>button]:hidden">
|
||||||
|
<div className="absolute right-4 top-4">
|
||||||
|
<Button
|
||||||
|
variant="ghost"
|
||||||
|
size="icon"
|
||||||
|
className="h-6 w-6 opacity-70 hover:opacity-100"
|
||||||
|
onClick={() => metadata.setShowTimeoutDialog(false)}
|
||||||
|
>
|
||||||
|
<X className="h-4 w-4" />
|
||||||
|
</Button>
|
||||||
|
</div>
|
||||||
|
<DialogTitle className="text-sm font-medium">Fetch Artist</DialogTitle>
|
||||||
<DialogDescription>
|
<DialogDescription>
|
||||||
Set timeout for fetching metadata. Longer timeout is recommended for artists
|
Set timeout for fetching metadata. Longer timeout is recommended for artists
|
||||||
with large discography.
|
with large discography.
|
||||||
</DialogDescription>
|
</DialogDescription>
|
||||||
</DialogHeader>
|
{metadata.pendingArtistName && (
|
||||||
<div className="space-y-4 py-4">
|
<div className="py-2">
|
||||||
<div className="space-y-2">
|
<p className="font-medium bg-muted/50 rounded-md px-3 py-2">{metadata.pendingArtistName}</p>
|
||||||
<Label htmlFor="timeout">Timeout (seconds)</Label>
|
</div>
|
||||||
<Input
|
)}
|
||||||
id="timeout"
|
<div className="space-y-4 py-4">
|
||||||
type="number"
|
<div className="space-y-2">
|
||||||
min="10"
|
<Label htmlFor="timeout">Timeout (seconds)</Label>
|
||||||
max="600"
|
<Input
|
||||||
value={metadata.timeoutValue}
|
id="timeout"
|
||||||
onChange={(e) => metadata.setTimeoutValue(Number(e.target.value))}
|
type="number"
|
||||||
/>
|
min="10"
|
||||||
<p className="text-xs text-muted-foreground">
|
max="600"
|
||||||
Default: 60 seconds. For large discographies, try 300-600 seconds (5-10
|
value={metadata.timeoutValue}
|
||||||
minutes).
|
onChange={(e) => metadata.setTimeoutValue(Number(e.target.value))}
|
||||||
</p>
|
/>
|
||||||
|
<p className="text-xs text-muted-foreground">
|
||||||
|
Default: 60 seconds. For large discographies, try 300-600 seconds (5-10
|
||||||
|
minutes).
|
||||||
|
</p>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
<DialogFooter>
|
||||||
<DialogFooter>
|
<Button
|
||||||
<Button
|
variant="outline"
|
||||||
variant="outline"
|
onClick={() => metadata.setShowTimeoutDialog(false)}
|
||||||
onClick={() => metadata.setShowTimeoutDialog(false)}
|
>
|
||||||
>
|
Cancel
|
||||||
Cancel
|
</Button>
|
||||||
</Button>
|
<Button onClick={metadata.handleConfirmFetch}>
|
||||||
<Button onClick={metadata.handleConfirmFetch}>
|
<Search className="h-4 w-4" />
|
||||||
<Search className="h-4 w-4" />
|
Fetch
|
||||||
Fetch
|
</Button>
|
||||||
</Button>
|
</DialogFooter>
|
||||||
</DialogFooter>
|
</DialogContent>
|
||||||
</DialogContent>
|
</Dialog>
|
||||||
</Dialog>
|
|
||||||
|
|
||||||
{/* Album Fetch Dialog */}
|
{/* Album Fetch Dialog */}
|
||||||
<Dialog open={metadata.showAlbumDialog} onOpenChange={metadata.setShowAlbumDialog}>
|
<Dialog open={metadata.showAlbumDialog} onOpenChange={metadata.setShowAlbumDialog}>
|
||||||
<DialogContent className="sm:max-w-[425px]">
|
<DialogContent className="sm:max-w-[425px] p-6 [&>button]:hidden">
|
||||||
<DialogHeader>
|
<div className="absolute right-4 top-4">
|
||||||
<DialogTitle>Fetch Album</DialogTitle>
|
<Button
|
||||||
|
variant="ghost"
|
||||||
|
size="icon"
|
||||||
|
className="h-6 w-6 opacity-70 hover:opacity-100"
|
||||||
|
onClick={() => metadata.setShowAlbumDialog(false)}
|
||||||
|
>
|
||||||
|
<X className="h-4 w-4" />
|
||||||
|
</Button>
|
||||||
|
</div>
|
||||||
|
<DialogTitle className="text-sm font-medium">Fetch Album</DialogTitle>
|
||||||
<DialogDescription>
|
<DialogDescription>
|
||||||
Do you want to fetch metadata for this album?
|
Do you want to fetch metadata for this album?
|
||||||
</DialogDescription>
|
</DialogDescription>
|
||||||
</DialogHeader>
|
{metadata.selectedAlbum && (
|
||||||
{metadata.selectedAlbum && (
|
<div className="py-2">
|
||||||
<div className="py-4">
|
<p className="font-medium bg-muted/50 rounded-md px-3 py-2">{metadata.selectedAlbum.name}</p>
|
||||||
<p className="font-medium">{metadata.selectedAlbum.name}</p>
|
</div>
|
||||||
</div>
|
)}
|
||||||
)}
|
<DialogFooter>
|
||||||
<DialogFooter>
|
<Button variant="outline" onClick={() => metadata.setShowAlbumDialog(false)}>
|
||||||
<Button variant="outline" onClick={() => metadata.setShowAlbumDialog(false)}>
|
Cancel
|
||||||
Cancel
|
</Button>
|
||||||
</Button>
|
<Button onClick={async () => {
|
||||||
<Button onClick={metadata.handleConfirmAlbumFetch}>
|
const albumUrl = await metadata.handleConfirmAlbumFetch();
|
||||||
<Search className="h-4 w-4" />
|
if (albumUrl) {
|
||||||
Fetch Album
|
setSpotifyUrl(albumUrl);
|
||||||
</Button>
|
}
|
||||||
</DialogFooter>
|
}}>
|
||||||
</DialogContent>
|
<Search className="h-4 w-4" />
|
||||||
</Dialog>
|
Fetch Album
|
||||||
|
</Button>
|
||||||
|
</DialogFooter>
|
||||||
|
</DialogContent>
|
||||||
|
</Dialog>
|
||||||
|
|
||||||
<SearchBar
|
<SearchBar
|
||||||
url={spotifyUrl}
|
url={spotifyUrl}
|
||||||
loading={metadata.loading}
|
loading={metadata.loading}
|
||||||
onUrlChange={setSpotifyUrl}
|
onUrlChange={setSpotifyUrl}
|
||||||
onFetch={handleFetchMetadata}
|
onFetch={handleFetchMetadata}
|
||||||
/>
|
history={fetchHistory}
|
||||||
|
onHistorySelect={handleHistorySelect}
|
||||||
|
onHistoryRemove={removeFromHistory}
|
||||||
|
hasResult={!!metadata.metadata}
|
||||||
|
/>
|
||||||
|
|
||||||
{metadata.metadata && renderMetadata()}
|
{metadata.metadata && renderMetadata()}
|
||||||
|
</>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
return (
|
||||||
|
<TooltipProvider>
|
||||||
|
<div className="min-h-screen bg-background flex flex-col">
|
||||||
|
<TitleBar />
|
||||||
|
<Sidebar currentPage={currentPage} onPageChange={setCurrentPage} />
|
||||||
|
|
||||||
|
{/* Main content area with sidebar offset */}
|
||||||
|
<div className="flex-1 ml-14 mt-10 p-4 md:p-8">
|
||||||
|
<div className="max-w-4xl mx-auto space-y-6">
|
||||||
|
{renderPage()}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
{/* Download Progress Toast - Bottom Left */}
|
||||||
|
<DownloadProgressToast onClick={downloadQueue.openQueue} />
|
||||||
|
|
||||||
|
{/* Download Queue Dialog */}
|
||||||
|
<DownloadQueue
|
||||||
|
isOpen={downloadQueue.isOpen}
|
||||||
|
onClose={downloadQueue.closeQueue}
|
||||||
|
/>
|
||||||
</div>
|
</div>
|
||||||
</TooltipProvider>
|
</TooltipProvider>
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -1,11 +1,12 @@
|
|||||||
import { Button } from "@/components/ui/button";
|
import { Button } from "@/components/ui/button";
|
||||||
import { Card, CardContent } from "@/components/ui/card";
|
import { Card, CardContent } from "@/components/ui/card";
|
||||||
import { Download, FolderOpen } from "lucide-react";
|
import { Download, FolderOpen, ImageDown } from "lucide-react";
|
||||||
import { Spinner } from "@/components/ui/spinner";
|
import { Spinner } from "@/components/ui/spinner";
|
||||||
|
import { Tooltip, TooltipContent, TooltipTrigger } from "@/components/ui/tooltip";
|
||||||
import { SearchAndSort } from "./SearchAndSort";
|
import { SearchAndSort } from "./SearchAndSort";
|
||||||
import { TrackList } from "./TrackList";
|
import { TrackList } from "./TrackList";
|
||||||
import { DownloadProgress } from "./DownloadProgress";
|
import { DownloadProgress } from "./DownloadProgress";
|
||||||
import type { TrackMetadata } from "@/types/api";
|
import type { TrackMetadata, TrackAvailability } from "@/types/api";
|
||||||
|
|
||||||
interface AlbumInfoProps {
|
interface AlbumInfoProps {
|
||||||
albumInfo: {
|
albumInfo: {
|
||||||
@@ -14,6 +15,8 @@ interface AlbumInfoProps {
|
|||||||
images: string;
|
images: string;
|
||||||
release_date: string;
|
release_date: string;
|
||||||
total_tracks: number;
|
total_tracks: number;
|
||||||
|
artist_id?: string;
|
||||||
|
artist_url?: string;
|
||||||
};
|
};
|
||||||
trackList: TrackMetadata[];
|
trackList: TrackMetadata[];
|
||||||
searchQuery: string;
|
searchQuery: string;
|
||||||
@@ -21,6 +24,7 @@ interface AlbumInfoProps {
|
|||||||
selectedTracks: string[];
|
selectedTracks: string[];
|
||||||
downloadedTracks: Set<string>;
|
downloadedTracks: Set<string>;
|
||||||
failedTracks: Set<string>;
|
failedTracks: Set<string>;
|
||||||
|
skippedTracks: Set<string>;
|
||||||
downloadingTrack: string | null;
|
downloadingTrack: string | null;
|
||||||
isDownloading: boolean;
|
isDownloading: boolean;
|
||||||
bulkDownloadType: "all" | "selected" | null;
|
bulkDownloadType: "all" | "selected" | null;
|
||||||
@@ -28,16 +32,36 @@ interface AlbumInfoProps {
|
|||||||
currentDownloadInfo: { name: string; artists: string } | null;
|
currentDownloadInfo: { name: string; artists: string } | null;
|
||||||
currentPage: number;
|
currentPage: number;
|
||||||
itemsPerPage: number;
|
itemsPerPage: number;
|
||||||
|
// Lyrics props
|
||||||
|
downloadedLyrics?: Set<string>;
|
||||||
|
failedLyrics?: Set<string>;
|
||||||
|
skippedLyrics?: Set<string>;
|
||||||
|
downloadingLyricsTrack?: string | null;
|
||||||
|
// Availability props
|
||||||
|
checkingAvailabilityTrack?: string | null;
|
||||||
|
availabilityMap?: Map<string, TrackAvailability>;
|
||||||
|
// Cover props
|
||||||
|
downloadedCovers?: Set<string>;
|
||||||
|
failedCovers?: Set<string>;
|
||||||
|
skippedCovers?: Set<string>;
|
||||||
|
downloadingCoverTrack?: string | null;
|
||||||
|
isBulkDownloadingCovers?: boolean;
|
||||||
onSearchChange: (value: string) => void;
|
onSearchChange: (value: string) => void;
|
||||||
onSortChange: (value: string) => void;
|
onSortChange: (value: string) => void;
|
||||||
onToggleTrack: (isrc: string) => void;
|
onToggleTrack: (isrc: string) => void;
|
||||||
onToggleSelectAll: (tracks: TrackMetadata[]) => void;
|
onToggleSelectAll: (tracks: TrackMetadata[]) => void;
|
||||||
onDownloadTrack: (isrc: string, name: string, artists: string, albumName: string) => void;
|
onDownloadTrack: (isrc: string, name: string, artists: string, albumName: string, spotifyId?: string) => void;
|
||||||
|
onDownloadLyrics?: (spotifyId: string, name: string, artists: string, albumName: string, folderName?: string, isArtistDiscography?: boolean, position?: number) => void;
|
||||||
|
onDownloadCover?: (coverUrl: string, trackName: string, artistName: string, albumName: string, folderName?: string, isArtistDiscography?: boolean, position?: number, trackId?: string) => void;
|
||||||
|
onCheckAvailability?: (spotifyId: string) => void;
|
||||||
|
onDownloadAllCovers?: () => void;
|
||||||
onDownloadAll: () => void;
|
onDownloadAll: () => void;
|
||||||
onDownloadSelected: () => void;
|
onDownloadSelected: () => void;
|
||||||
onStopDownload: () => void;
|
onStopDownload: () => void;
|
||||||
onOpenFolder: () => void;
|
onOpenFolder: () => void;
|
||||||
onPageChange: (page: number) => void;
|
onPageChange: (page: number) => void;
|
||||||
|
onArtistClick?: (artist: { id: string; name: string; external_urls: string }) => void;
|
||||||
|
onTrackClick?: (track: TrackMetadata) => void;
|
||||||
}
|
}
|
||||||
|
|
||||||
export function AlbumInfo({
|
export function AlbumInfo({
|
||||||
@@ -48,6 +72,7 @@ export function AlbumInfo({
|
|||||||
selectedTracks,
|
selectedTracks,
|
||||||
downloadedTracks,
|
downloadedTracks,
|
||||||
failedTracks,
|
failedTracks,
|
||||||
|
skippedTracks,
|
||||||
downloadingTrack,
|
downloadingTrack,
|
||||||
isDownloading,
|
isDownloading,
|
||||||
bulkDownloadType,
|
bulkDownloadType,
|
||||||
@@ -55,16 +80,33 @@ export function AlbumInfo({
|
|||||||
currentDownloadInfo,
|
currentDownloadInfo,
|
||||||
currentPage,
|
currentPage,
|
||||||
itemsPerPage,
|
itemsPerPage,
|
||||||
|
downloadedLyrics,
|
||||||
|
failedLyrics,
|
||||||
|
skippedLyrics,
|
||||||
|
downloadingLyricsTrack,
|
||||||
|
checkingAvailabilityTrack,
|
||||||
|
availabilityMap,
|
||||||
|
downloadedCovers,
|
||||||
|
failedCovers,
|
||||||
|
skippedCovers,
|
||||||
|
downloadingCoverTrack,
|
||||||
|
isBulkDownloadingCovers,
|
||||||
onSearchChange,
|
onSearchChange,
|
||||||
onSortChange,
|
onSortChange,
|
||||||
onToggleTrack,
|
onToggleTrack,
|
||||||
onToggleSelectAll,
|
onToggleSelectAll,
|
||||||
onDownloadTrack,
|
onDownloadTrack,
|
||||||
|
onDownloadLyrics,
|
||||||
|
onDownloadCover,
|
||||||
|
onCheckAvailability,
|
||||||
|
onDownloadAllCovers,
|
||||||
onDownloadAll,
|
onDownloadAll,
|
||||||
onDownloadSelected,
|
onDownloadSelected,
|
||||||
onStopDownload,
|
onStopDownload,
|
||||||
onOpenFolder,
|
onOpenFolder,
|
||||||
onPageChange,
|
onPageChange,
|
||||||
|
onArtistClick,
|
||||||
|
onTrackClick,
|
||||||
}: AlbumInfoProps) {
|
}: AlbumInfoProps) {
|
||||||
return (
|
return (
|
||||||
<div className="space-y-6">
|
<div className="space-y-6">
|
||||||
@@ -83,18 +125,30 @@ export function AlbumInfo({
|
|||||||
<p className="text-sm font-medium">Album</p>
|
<p className="text-sm font-medium">Album</p>
|
||||||
<h2 className="text-4xl font-bold">{albumInfo.name}</h2>
|
<h2 className="text-4xl font-bold">{albumInfo.name}</h2>
|
||||||
<div className="flex items-center gap-2 text-sm">
|
<div className="flex items-center gap-2 text-sm">
|
||||||
<span className="font-medium">{albumInfo.artists}</span>
|
{onArtistClick && albumInfo.artist_id && albumInfo.artist_url ? (
|
||||||
|
<span
|
||||||
|
className="font-medium cursor-pointer hover:underline"
|
||||||
|
onClick={() =>
|
||||||
|
onArtistClick({
|
||||||
|
id: albumInfo.artist_id!,
|
||||||
|
name: albumInfo.artists,
|
||||||
|
external_urls: albumInfo.artist_url!,
|
||||||
|
})
|
||||||
|
}
|
||||||
|
>
|
||||||
|
{albumInfo.artists}
|
||||||
|
</span>
|
||||||
|
) : (
|
||||||
|
<span className="font-medium">{albumInfo.artists}</span>
|
||||||
|
)}
|
||||||
<span>•</span>
|
<span>•</span>
|
||||||
<span>{albumInfo.release_date}</span>
|
<span>{albumInfo.release_date}</span>
|
||||||
<span>•</span>
|
<span>•</span>
|
||||||
<span>{albumInfo.total_tracks} songs</span>
|
<span>{albumInfo.total_tracks} songs</span>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div className="flex gap-2">
|
<div className="flex gap-2 flex-wrap">
|
||||||
<Button
|
<Button onClick={onDownloadAll} disabled={isDownloading}>
|
||||||
onClick={onDownloadAll}
|
|
||||||
disabled={isDownloading}
|
|
||||||
>
|
|
||||||
{isDownloading && bulkDownloadType === "all" ? (
|
{isDownloading && bulkDownloadType === "all" ? (
|
||||||
<Spinner />
|
<Spinner />
|
||||||
) : (
|
) : (
|
||||||
@@ -116,6 +170,22 @@ export function AlbumInfo({
|
|||||||
Download Selected ({selectedTracks.length})
|
Download Selected ({selectedTracks.length})
|
||||||
</Button>
|
</Button>
|
||||||
)}
|
)}
|
||||||
|
{onDownloadAllCovers && (
|
||||||
|
<Tooltip>
|
||||||
|
<TooltipTrigger asChild>
|
||||||
|
<Button
|
||||||
|
onClick={onDownloadAllCovers}
|
||||||
|
variant="outline"
|
||||||
|
disabled={isBulkDownloadingCovers}
|
||||||
|
>
|
||||||
|
{isBulkDownloadingCovers ? <Spinner /> : <ImageDown className="h-4 w-4" />}
|
||||||
|
</Button>
|
||||||
|
</TooltipTrigger>
|
||||||
|
<TooltipContent>
|
||||||
|
<p>Download All Covers</p>
|
||||||
|
</TooltipContent>
|
||||||
|
</Tooltip>
|
||||||
|
)}
|
||||||
{downloadedTracks.size > 0 && (
|
{downloadedTracks.size > 0 && (
|
||||||
<Button onClick={onOpenFolder} variant="outline">
|
<Button onClick={onOpenFolder} variant="outline">
|
||||||
<FolderOpen className="h-4 w-4" />
|
<FolderOpen className="h-4 w-4" />
|
||||||
@@ -148,16 +218,32 @@ export function AlbumInfo({
|
|||||||
selectedTracks={selectedTracks}
|
selectedTracks={selectedTracks}
|
||||||
downloadedTracks={downloadedTracks}
|
downloadedTracks={downloadedTracks}
|
||||||
failedTracks={failedTracks}
|
failedTracks={failedTracks}
|
||||||
|
skippedTracks={skippedTracks}
|
||||||
downloadingTrack={downloadingTrack}
|
downloadingTrack={downloadingTrack}
|
||||||
isDownloading={isDownloading}
|
isDownloading={isDownloading}
|
||||||
currentPage={currentPage}
|
currentPage={currentPage}
|
||||||
itemsPerPage={itemsPerPage}
|
itemsPerPage={itemsPerPage}
|
||||||
showCheckboxes={true}
|
showCheckboxes={true}
|
||||||
hideAlbumColumn={true}
|
hideAlbumColumn={true}
|
||||||
|
folderName={albumInfo.name}
|
||||||
|
downloadedLyrics={downloadedLyrics}
|
||||||
|
failedLyrics={failedLyrics}
|
||||||
|
skippedLyrics={skippedLyrics}
|
||||||
|
downloadingLyricsTrack={downloadingLyricsTrack}
|
||||||
|
checkingAvailabilityTrack={checkingAvailabilityTrack}
|
||||||
|
availabilityMap={availabilityMap}
|
||||||
onToggleTrack={onToggleTrack}
|
onToggleTrack={onToggleTrack}
|
||||||
onToggleSelectAll={onToggleSelectAll}
|
onToggleSelectAll={onToggleSelectAll}
|
||||||
onDownloadTrack={onDownloadTrack}
|
onDownloadTrack={onDownloadTrack}
|
||||||
|
onDownloadLyrics={onDownloadLyrics}
|
||||||
|
onDownloadCover={onDownloadCover}
|
||||||
|
downloadedCovers={downloadedCovers}
|
||||||
|
failedCovers={failedCovers}
|
||||||
|
skippedCovers={skippedCovers}
|
||||||
|
downloadingCoverTrack={downloadingCoverTrack}
|
||||||
|
onCheckAvailability={onCheckAvailability}
|
||||||
onPageChange={onPageChange}
|
onPageChange={onPageChange}
|
||||||
|
onTrackClick={onTrackClick}
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -1,11 +1,12 @@
|
|||||||
import { Button } from "@/components/ui/button";
|
import { Button } from "@/components/ui/button";
|
||||||
import { Card, CardContent } from "@/components/ui/card";
|
import { Card, CardContent } from "@/components/ui/card";
|
||||||
import { Download, FolderOpen } from "lucide-react";
|
import { Download, FolderOpen, ImageDown } from "lucide-react";
|
||||||
import { Spinner } from "@/components/ui/spinner";
|
import { Spinner } from "@/components/ui/spinner";
|
||||||
|
import { Tooltip, TooltipContent, TooltipTrigger } from "@/components/ui/tooltip";
|
||||||
import { SearchAndSort } from "./SearchAndSort";
|
import { SearchAndSort } from "./SearchAndSort";
|
||||||
import { TrackList } from "./TrackList";
|
import { TrackList } from "./TrackList";
|
||||||
import { DownloadProgress } from "./DownloadProgress";
|
import { DownloadProgress } from "./DownloadProgress";
|
||||||
import type { TrackMetadata } from "@/types/api";
|
import type { TrackMetadata, TrackAvailability } from "@/types/api";
|
||||||
|
|
||||||
interface ArtistInfoProps {
|
interface ArtistInfoProps {
|
||||||
artistInfo: {
|
artistInfo: {
|
||||||
@@ -28,6 +29,7 @@ interface ArtistInfoProps {
|
|||||||
selectedTracks: string[];
|
selectedTracks: string[];
|
||||||
downloadedTracks: Set<string>;
|
downloadedTracks: Set<string>;
|
||||||
failedTracks: Set<string>;
|
failedTracks: Set<string>;
|
||||||
|
skippedTracks: Set<string>;
|
||||||
downloadingTrack: string | null;
|
downloadingTrack: string | null;
|
||||||
isDownloading: boolean;
|
isDownloading: boolean;
|
||||||
bulkDownloadType: "all" | "selected" | null;
|
bulkDownloadType: "all" | "selected" | null;
|
||||||
@@ -35,17 +37,37 @@ interface ArtistInfoProps {
|
|||||||
currentDownloadInfo: { name: string; artists: string } | null;
|
currentDownloadInfo: { name: string; artists: string } | null;
|
||||||
currentPage: number;
|
currentPage: number;
|
||||||
itemsPerPage: number;
|
itemsPerPage: number;
|
||||||
|
// Lyrics props
|
||||||
|
downloadedLyrics?: Set<string>;
|
||||||
|
failedLyrics?: Set<string>;
|
||||||
|
skippedLyrics?: Set<string>;
|
||||||
|
downloadingLyricsTrack?: string | null;
|
||||||
|
// Availability props
|
||||||
|
checkingAvailabilityTrack?: string | null;
|
||||||
|
availabilityMap?: Map<string, TrackAvailability>;
|
||||||
|
// Cover props
|
||||||
|
downloadedCovers?: Set<string>;
|
||||||
|
failedCovers?: Set<string>;
|
||||||
|
skippedCovers?: Set<string>;
|
||||||
|
downloadingCoverTrack?: string | null;
|
||||||
|
isBulkDownloadingCovers?: boolean;
|
||||||
onSearchChange: (value: string) => void;
|
onSearchChange: (value: string) => void;
|
||||||
onSortChange: (value: string) => void;
|
onSortChange: (value: string) => void;
|
||||||
onToggleTrack: (isrc: string) => void;
|
onToggleTrack: (isrc: string) => void;
|
||||||
onToggleSelectAll: (tracks: TrackMetadata[]) => void;
|
onToggleSelectAll: (tracks: TrackMetadata[]) => void;
|
||||||
onDownloadTrack: (isrc: string, name: string, artists: string, albumName: string) => void;
|
onDownloadTrack: (isrc: string, name: string, artists: string, albumName: string, spotifyId?: string) => void;
|
||||||
|
onDownloadLyrics?: (spotifyId: string, name: string, artists: string, albumName: string, folderName?: string, isArtistDiscography?: boolean, position?: number) => void;
|
||||||
|
onDownloadCover?: (coverUrl: string, trackName: string, artistName: string, albumName: string, folderName?: string, isArtistDiscography?: boolean, position?: number, trackId?: string) => void;
|
||||||
|
onCheckAvailability?: (spotifyId: string) => void;
|
||||||
|
onDownloadAllCovers?: () => void;
|
||||||
onDownloadAll: () => void;
|
onDownloadAll: () => void;
|
||||||
onDownloadSelected: () => void;
|
onDownloadSelected: () => void;
|
||||||
onStopDownload: () => void;
|
onStopDownload: () => void;
|
||||||
onOpenFolder: () => void;
|
onOpenFolder: () => void;
|
||||||
onAlbumClick: (album: { id: string; name: string; external_urls: string }) => void;
|
onAlbumClick: (album: { id: string; name: string; external_urls: string }) => void;
|
||||||
|
onArtistClick: (artist: { id: string; name: string; external_urls: string }) => void;
|
||||||
onPageChange: (page: number) => void;
|
onPageChange: (page: number) => void;
|
||||||
|
onTrackClick?: (track: TrackMetadata) => void;
|
||||||
}
|
}
|
||||||
|
|
||||||
export function ArtistInfo({
|
export function ArtistInfo({
|
||||||
@@ -57,6 +79,7 @@ export function ArtistInfo({
|
|||||||
selectedTracks,
|
selectedTracks,
|
||||||
downloadedTracks,
|
downloadedTracks,
|
||||||
failedTracks,
|
failedTracks,
|
||||||
|
skippedTracks,
|
||||||
downloadingTrack,
|
downloadingTrack,
|
||||||
isDownloading,
|
isDownloading,
|
||||||
bulkDownloadType,
|
bulkDownloadType,
|
||||||
@@ -64,17 +87,34 @@ export function ArtistInfo({
|
|||||||
currentDownloadInfo,
|
currentDownloadInfo,
|
||||||
currentPage,
|
currentPage,
|
||||||
itemsPerPage,
|
itemsPerPage,
|
||||||
|
downloadedLyrics,
|
||||||
|
failedLyrics,
|
||||||
|
skippedLyrics,
|
||||||
|
downloadingLyricsTrack,
|
||||||
|
checkingAvailabilityTrack,
|
||||||
|
availabilityMap,
|
||||||
|
downloadedCovers,
|
||||||
|
failedCovers,
|
||||||
|
skippedCovers,
|
||||||
|
downloadingCoverTrack,
|
||||||
|
isBulkDownloadingCovers,
|
||||||
onSearchChange,
|
onSearchChange,
|
||||||
onSortChange,
|
onSortChange,
|
||||||
onToggleTrack,
|
onToggleTrack,
|
||||||
onToggleSelectAll,
|
onToggleSelectAll,
|
||||||
onDownloadTrack,
|
onDownloadTrack,
|
||||||
|
onDownloadLyrics,
|
||||||
|
onDownloadCover,
|
||||||
|
onCheckAvailability,
|
||||||
|
onDownloadAllCovers,
|
||||||
onDownloadAll,
|
onDownloadAll,
|
||||||
onDownloadSelected,
|
onDownloadSelected,
|
||||||
onStopDownload,
|
onStopDownload,
|
||||||
onOpenFolder,
|
onOpenFolder,
|
||||||
onAlbumClick,
|
onAlbumClick,
|
||||||
|
onArtistClick,
|
||||||
onPageChange,
|
onPageChange,
|
||||||
|
onTrackClick,
|
||||||
}: ArtistInfoProps) {
|
}: ArtistInfoProps) {
|
||||||
return (
|
return (
|
||||||
<div className="space-y-6">
|
<div className="space-y-6">
|
||||||
@@ -91,8 +131,12 @@ export function ArtistInfo({
|
|||||||
<div className="flex-1 space-y-2">
|
<div className="flex-1 space-y-2">
|
||||||
<p className="text-sm font-medium">Artist</p>
|
<p className="text-sm font-medium">Artist</p>
|
||||||
<h2 className="text-4xl font-bold">{artistInfo.name}</h2>
|
<h2 className="text-4xl font-bold">{artistInfo.name}</h2>
|
||||||
<div className="flex items-center gap-2 text-sm">
|
<div className="flex items-center gap-2 text-sm flex-wrap">
|
||||||
<span>{artistInfo.followers.toLocaleString()} followers</span>
|
<span>{artistInfo.followers.toLocaleString()} followers</span>
|
||||||
|
<span>•</span>
|
||||||
|
<span>{albumList.length} albums</span>
|
||||||
|
<span>•</span>
|
||||||
|
<span>{trackList.length} tracks</span>
|
||||||
{artistInfo.genres.length > 0 && (
|
{artistInfo.genres.length > 0 && (
|
||||||
<>
|
<>
|
||||||
<span>•</span>
|
<span>•</span>
|
||||||
@@ -142,14 +186,10 @@ export function ArtistInfo({
|
|||||||
|
|
||||||
{trackList.length > 0 && (
|
{trackList.length > 0 && (
|
||||||
<div className="space-y-4">
|
<div className="space-y-4">
|
||||||
<div className="flex items-center justify-between">
|
<div className="flex items-center justify-between flex-wrap gap-2">
|
||||||
<h3 className="text-2xl font-bold">Popular Tracks</h3>
|
<h3 className="text-2xl font-bold">Popular Tracks</h3>
|
||||||
<div className="flex gap-2">
|
<div className="flex gap-2 flex-wrap">
|
||||||
<Button
|
<Button onClick={onDownloadAll} size="sm" disabled={isDownloading}>
|
||||||
onClick={onDownloadAll}
|
|
||||||
size="sm"
|
|
||||||
disabled={isDownloading}
|
|
||||||
>
|
|
||||||
{isDownloading && bulkDownloadType === "all" ? (
|
{isDownloading && bulkDownloadType === "all" ? (
|
||||||
<Spinner />
|
<Spinner />
|
||||||
) : (
|
) : (
|
||||||
@@ -172,6 +212,23 @@ export function ArtistInfo({
|
|||||||
Download Selected ({selectedTracks.length})
|
Download Selected ({selectedTracks.length})
|
||||||
</Button>
|
</Button>
|
||||||
)}
|
)}
|
||||||
|
{onDownloadAllCovers && (
|
||||||
|
<Tooltip>
|
||||||
|
<TooltipTrigger asChild>
|
||||||
|
<Button
|
||||||
|
onClick={onDownloadAllCovers}
|
||||||
|
size="sm"
|
||||||
|
variant="outline"
|
||||||
|
disabled={isBulkDownloadingCovers}
|
||||||
|
>
|
||||||
|
{isBulkDownloadingCovers ? <Spinner /> : <ImageDown className="h-4 w-4" />}
|
||||||
|
</Button>
|
||||||
|
</TooltipTrigger>
|
||||||
|
<TooltipContent>
|
||||||
|
<p>Download All Covers</p>
|
||||||
|
</TooltipContent>
|
||||||
|
</Tooltip>
|
||||||
|
)}
|
||||||
{downloadedTracks.size > 0 && (
|
{downloadedTracks.size > 0 && (
|
||||||
<Button onClick={onOpenFolder} size="sm" variant="outline">
|
<Button onClick={onOpenFolder} size="sm" variant="outline">
|
||||||
<FolderOpen className="h-4 w-4" />
|
<FolderOpen className="h-4 w-4" />
|
||||||
@@ -200,16 +257,35 @@ export function ArtistInfo({
|
|||||||
selectedTracks={selectedTracks}
|
selectedTracks={selectedTracks}
|
||||||
downloadedTracks={downloadedTracks}
|
downloadedTracks={downloadedTracks}
|
||||||
failedTracks={failedTracks}
|
failedTracks={failedTracks}
|
||||||
|
skippedTracks={skippedTracks}
|
||||||
downloadingTrack={downloadingTrack}
|
downloadingTrack={downloadingTrack}
|
||||||
isDownloading={isDownloading}
|
isDownloading={isDownloading}
|
||||||
currentPage={currentPage}
|
currentPage={currentPage}
|
||||||
itemsPerPage={itemsPerPage}
|
itemsPerPage={itemsPerPage}
|
||||||
showCheckboxes={true}
|
showCheckboxes={true}
|
||||||
hideAlbumColumn={false}
|
hideAlbumColumn={false}
|
||||||
|
folderName={artistInfo.name}
|
||||||
|
isArtistDiscography={true}
|
||||||
|
downloadedLyrics={downloadedLyrics}
|
||||||
|
failedLyrics={failedLyrics}
|
||||||
|
skippedLyrics={skippedLyrics}
|
||||||
|
downloadingLyricsTrack={downloadingLyricsTrack}
|
||||||
|
checkingAvailabilityTrack={checkingAvailabilityTrack}
|
||||||
|
availabilityMap={availabilityMap}
|
||||||
onToggleTrack={onToggleTrack}
|
onToggleTrack={onToggleTrack}
|
||||||
onToggleSelectAll={onToggleSelectAll}
|
onToggleSelectAll={onToggleSelectAll}
|
||||||
onDownloadTrack={onDownloadTrack}
|
onDownloadTrack={onDownloadTrack}
|
||||||
|
onDownloadLyrics={onDownloadLyrics}
|
||||||
|
onDownloadCover={onDownloadCover}
|
||||||
|
downloadedCovers={downloadedCovers}
|
||||||
|
failedCovers={failedCovers}
|
||||||
|
skippedCovers={skippedCovers}
|
||||||
|
downloadingCoverTrack={downloadingCoverTrack}
|
||||||
|
onCheckAvailability={onCheckAvailability}
|
||||||
onPageChange={onPageChange}
|
onPageChange={onPageChange}
|
||||||
|
onAlbumClick={onAlbumClick}
|
||||||
|
onArtistClick={onArtistClick}
|
||||||
|
onTrackClick={onTrackClick}
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
)}
|
)}
|
||||||
|
|||||||
@@ -0,0 +1,194 @@
|
|||||||
|
import { Card, CardContent, CardHeader, CardTitle, CardDescription } from "@/components/ui/card";
|
||||||
|
import { Spinner } from "@/components/ui/spinner";
|
||||||
|
import { Button } from "@/components/ui/button";
|
||||||
|
import {
|
||||||
|
Activity,
|
||||||
|
Waves,
|
||||||
|
Radio,
|
||||||
|
TrendingUp,
|
||||||
|
FileAudio,
|
||||||
|
Clock,
|
||||||
|
Gauge,
|
||||||
|
HardDrive
|
||||||
|
} from "lucide-react";
|
||||||
|
import type { AnalysisResult } from "@/types/api";
|
||||||
|
|
||||||
|
interface AudioAnalysisProps {
|
||||||
|
result: AnalysisResult | null;
|
||||||
|
analyzing: boolean;
|
||||||
|
onAnalyze?: () => void;
|
||||||
|
showAnalyzeButton?: boolean;
|
||||||
|
}
|
||||||
|
|
||||||
|
export function AudioAnalysis({
|
||||||
|
result,
|
||||||
|
analyzing,
|
||||||
|
onAnalyze,
|
||||||
|
showAnalyzeButton = true
|
||||||
|
}: AudioAnalysisProps) {
|
||||||
|
if (analyzing) {
|
||||||
|
return (
|
||||||
|
<Card>
|
||||||
|
<CardContent className="px-6">
|
||||||
|
<div className="flex items-center justify-center py-8 gap-3">
|
||||||
|
<Spinner />
|
||||||
|
<span className="text-muted-foreground">Analyzing audio quality...</span>
|
||||||
|
</div>
|
||||||
|
</CardContent>
|
||||||
|
</Card>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!result && showAnalyzeButton) {
|
||||||
|
return (
|
||||||
|
<Card>
|
||||||
|
<CardContent className="px-6">
|
||||||
|
<div className="flex flex-col items-center justify-center py-8 gap-4">
|
||||||
|
<Activity className="h-12 w-12 text-muted-foreground/50" />
|
||||||
|
<div className="text-center space-y-2">
|
||||||
|
<p className="font-medium">Audio Quality Analysis</p>
|
||||||
|
<p className="text-sm text-muted-foreground">
|
||||||
|
Verify the true lossless quality of downloaded files
|
||||||
|
</p>
|
||||||
|
</div>
|
||||||
|
{onAnalyze && (
|
||||||
|
<Button onClick={onAnalyze}>
|
||||||
|
<Activity className="h-4 w-4" />
|
||||||
|
Analyze Audio
|
||||||
|
</Button>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
</CardContent>
|
||||||
|
</Card>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!result) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
const formatDuration = (seconds: number) => {
|
||||||
|
const mins = Math.floor(seconds / 60);
|
||||||
|
const secs = Math.floor(seconds % 60);
|
||||||
|
return `${mins}:${secs.toString().padStart(2, '0')}`;
|
||||||
|
};
|
||||||
|
|
||||||
|
const formatNumber = (num: number) => {
|
||||||
|
return num.toFixed(2);
|
||||||
|
};
|
||||||
|
|
||||||
|
// Calculate Nyquist frequency (half of sample rate)
|
||||||
|
const nyquistFreq = result.sample_rate / 2;
|
||||||
|
|
||||||
|
// Calculate approximate data size (uncompressed PCM)
|
||||||
|
// Formula: sample_rate * channels * (bits_per_sample / 8) * duration
|
||||||
|
const dataSizeBytes = result.sample_rate * result.channels * (result.bits_per_sample / 8) * result.duration;
|
||||||
|
const dataSizeMB = dataSizeBytes / (1024 * 1024);
|
||||||
|
|
||||||
|
const formatDataSize = (mb: number) => {
|
||||||
|
if (mb >= 1024) {
|
||||||
|
return `${(mb / 1024).toFixed(2)} GB`;
|
||||||
|
}
|
||||||
|
return `${mb.toFixed(2)} MB`;
|
||||||
|
};
|
||||||
|
|
||||||
|
return (
|
||||||
|
<Card>
|
||||||
|
<CardHeader>
|
||||||
|
<div className="space-y-1">
|
||||||
|
<CardTitle className="flex items-center gap-2">
|
||||||
|
<Activity className="h-5 w-5" />
|
||||||
|
Audio Quality Analysis
|
||||||
|
</CardTitle>
|
||||||
|
<CardDescription>
|
||||||
|
Technical analysis of audio file properties
|
||||||
|
</CardDescription>
|
||||||
|
</div>
|
||||||
|
</CardHeader>
|
||||||
|
|
||||||
|
<CardContent className="px-6 space-y-6">
|
||||||
|
|
||||||
|
{/* Technical Specifications */}
|
||||||
|
<div className="grid grid-cols-2 gap-4">
|
||||||
|
<div className="space-y-1">
|
||||||
|
<div className="flex items-center gap-2 text-xs text-muted-foreground">
|
||||||
|
<Radio className="h-3 w-3" />
|
||||||
|
Sample Rate
|
||||||
|
</div>
|
||||||
|
<p className="font-semibold">{(result.sample_rate / 1000).toFixed(1)} kHz</p>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div className="space-y-1">
|
||||||
|
<div className="flex items-center gap-2 text-xs text-muted-foreground">
|
||||||
|
<FileAudio className="h-3 w-3" />
|
||||||
|
Bit Depth
|
||||||
|
</div>
|
||||||
|
<p className="font-semibold">{result.bit_depth}</p>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div className="space-y-1">
|
||||||
|
<div className="flex items-center gap-2 text-xs text-muted-foreground">
|
||||||
|
<Waves className="h-3 w-3" />
|
||||||
|
Channels
|
||||||
|
</div>
|
||||||
|
<p className="font-semibold">{result.channels === 2 ? "Stereo" : result.channels === 1 ? "Mono" : `${result.channels} channels`}</p>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div className="space-y-1">
|
||||||
|
<div className="flex items-center gap-2 text-xs text-muted-foreground">
|
||||||
|
<Clock className="h-3 w-3" />
|
||||||
|
Duration
|
||||||
|
</div>
|
||||||
|
<p className="font-semibold">{formatDuration(result.duration)}</p>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div className="space-y-1">
|
||||||
|
<div className="flex items-center gap-2 text-xs text-muted-foreground">
|
||||||
|
<Gauge className="h-3 w-3" />
|
||||||
|
Nyquist Frequency
|
||||||
|
</div>
|
||||||
|
<p className="font-semibold">{(nyquistFreq / 1000).toFixed(1)} kHz</p>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div className="space-y-1">
|
||||||
|
<div className="flex items-center gap-2 text-xs text-muted-foreground">
|
||||||
|
<HardDrive className="h-3 w-3" />
|
||||||
|
Data Size
|
||||||
|
</div>
|
||||||
|
<p className="font-semibold">{formatDataSize(dataSizeMB)}</p>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{/* Dynamic Range Analysis */}
|
||||||
|
<div className="border rounded-lg p-4 space-y-3 bg-muted/30">
|
||||||
|
<div className="flex items-center gap-2 text-sm font-medium">
|
||||||
|
<TrendingUp className="h-4 w-4" />
|
||||||
|
Dynamic Range Analysis
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div className="grid grid-cols-3 gap-3 text-sm">
|
||||||
|
<div>
|
||||||
|
<p className="text-xs text-muted-foreground">Dynamic Range</p>
|
||||||
|
<p className="font-semibold">{formatNumber(result.dynamic_range)} dB</p>
|
||||||
|
</div>
|
||||||
|
<div>
|
||||||
|
<p className="text-xs text-muted-foreground">Peak Level</p>
|
||||||
|
<p className="font-semibold">{formatNumber(result.peak_amplitude)} dB</p>
|
||||||
|
</div>
|
||||||
|
<div>
|
||||||
|
<p className="text-xs text-muted-foreground">RMS Level</p>
|
||||||
|
<p className="font-semibold">{formatNumber(result.rms_level)} dB</p>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{/* Technical Info Footer */}
|
||||||
|
<div className="pt-2 border-t">
|
||||||
|
<p className="text-xs text-muted-foreground">
|
||||||
|
Total Samples: {result.total_samples.toLocaleString()}
|
||||||
|
</p>
|
||||||
|
</div>
|
||||||
|
</CardContent>
|
||||||
|
</Card>
|
||||||
|
);
|
||||||
|
}
|
||||||
@@ -0,0 +1,159 @@
|
|||||||
|
import { useState, useCallback, useEffect } from "react";
|
||||||
|
import { Button } from "@/components/ui/button";
|
||||||
|
import { Activity, Upload, ArrowLeft } from "lucide-react";
|
||||||
|
import { AudioAnalysis } from "@/components/AudioAnalysis";
|
||||||
|
import { SpectrumVisualization } from "@/components/SpectrumVisualization";
|
||||||
|
import { useAudioAnalysis } from "@/hooks/useAudioAnalysis";
|
||||||
|
import { SelectFile } from "../../wailsjs/go/main/App";
|
||||||
|
import { toastWithSound as toast } from "@/lib/toast-with-sound";
|
||||||
|
import { OnFileDrop, OnFileDropOff } from "../../wailsjs/runtime/runtime";
|
||||||
|
|
||||||
|
interface AudioAnalysisPageProps {
|
||||||
|
onBack?: () => void;
|
||||||
|
}
|
||||||
|
|
||||||
|
export function AudioAnalysisPage({ onBack }: AudioAnalysisPageProps) {
|
||||||
|
const { analyzing, result, analyzeFile, clearResult } = useAudioAnalysis();
|
||||||
|
const [selectedFilePath, setSelectedFilePath] = useState<string>("");
|
||||||
|
const [isDragging, setIsDragging] = useState(false);
|
||||||
|
|
||||||
|
const handleSelectFile = async () => {
|
||||||
|
try {
|
||||||
|
const filePath = await SelectFile();
|
||||||
|
if (filePath) {
|
||||||
|
setSelectedFilePath(filePath);
|
||||||
|
await analyzeFile(filePath);
|
||||||
|
}
|
||||||
|
} catch (err) {
|
||||||
|
toast.error("File Selection Failed", {
|
||||||
|
description: err instanceof Error ? err.message : "Failed to select file",
|
||||||
|
});
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
const handleFileDrop = useCallback(
|
||||||
|
async (_x: number, _y: number, paths: string[]) => {
|
||||||
|
setIsDragging(false);
|
||||||
|
|
||||||
|
if (paths.length === 0) return;
|
||||||
|
|
||||||
|
const filePath = paths[0];
|
||||||
|
|
||||||
|
if (!filePath.toLowerCase().endsWith(".flac")) {
|
||||||
|
toast.error("Invalid File Type", {
|
||||||
|
description: "Please drop a FLAC file for analysis",
|
||||||
|
});
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
setSelectedFilePath(filePath);
|
||||||
|
await analyzeFile(filePath);
|
||||||
|
},
|
||||||
|
[analyzeFile]
|
||||||
|
);
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
OnFileDrop((x, y, paths) => {
|
||||||
|
handleFileDrop(x, y, paths);
|
||||||
|
}, true);
|
||||||
|
|
||||||
|
return () => {
|
||||||
|
OnFileDropOff();
|
||||||
|
};
|
||||||
|
}, [handleFileDrop]);
|
||||||
|
|
||||||
|
const handleAnalyzeAnother = () => {
|
||||||
|
clearResult();
|
||||||
|
setSelectedFilePath("");
|
||||||
|
};
|
||||||
|
|
||||||
|
return (
|
||||||
|
<div className="space-y-6">
|
||||||
|
{/* Header */}
|
||||||
|
<div className="flex items-center gap-4">
|
||||||
|
{onBack && (
|
||||||
|
<Button variant="ghost" size="icon" onClick={onBack}>
|
||||||
|
<ArrowLeft className="h-5 w-5" />
|
||||||
|
</Button>
|
||||||
|
)}
|
||||||
|
<h1 className="text-2xl font-bold">Audio Quality Analyzer</h1>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{/* File Selection */}
|
||||||
|
{!result && !analyzing && (
|
||||||
|
<div
|
||||||
|
className={`flex flex-col items-center justify-center py-24 border-2 border-dashed rounded-lg transition-colors ${
|
||||||
|
isDragging
|
||||||
|
? "border-primary bg-primary/10"
|
||||||
|
: "border-muted-foreground/30 hover:border-muted-foreground/50"
|
||||||
|
}`}
|
||||||
|
onDragOver={(e) => {
|
||||||
|
e.preventDefault();
|
||||||
|
setIsDragging(true);
|
||||||
|
}}
|
||||||
|
onDragLeave={(e) => {
|
||||||
|
e.preventDefault();
|
||||||
|
setIsDragging(false);
|
||||||
|
}}
|
||||||
|
onDrop={(e) => {
|
||||||
|
e.preventDefault();
|
||||||
|
setIsDragging(false);
|
||||||
|
}}
|
||||||
|
style={{ "--wails-drop-target": "drop" } as React.CSSProperties}
|
||||||
|
>
|
||||||
|
<Activity
|
||||||
|
className={`h-20 w-20 mb-4 transition-colors ${isDragging ? "text-primary" : "text-muted-foreground/50"}`}
|
||||||
|
/>
|
||||||
|
<h3 className="text-xl font-medium mb-2">Analyze FLAC Audio Quality</h3>
|
||||||
|
<p className="text-sm text-muted-foreground mb-6 text-center max-w-md">
|
||||||
|
{isDragging
|
||||||
|
? "Drop your FLAC file here"
|
||||||
|
: "Drag and drop a FLAC file here, or click the button below to select"}
|
||||||
|
</p>
|
||||||
|
<Button onClick={handleSelectFile} size="lg">
|
||||||
|
<Upload className="h-5 w-5" />
|
||||||
|
Select FLAC File
|
||||||
|
</Button>
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
|
||||||
|
{/* Loading State */}
|
||||||
|
{analyzing && !result && (
|
||||||
|
<div className="flex flex-col items-center justify-center py-16">
|
||||||
|
<div className="animate-spin rounded-full h-12 w-12 border-b-2 border-primary mb-4"></div>
|
||||||
|
<p className="text-sm text-muted-foreground">Analyzing audio file...</p>
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
|
||||||
|
{/* Analysis Results */}
|
||||||
|
{result && (
|
||||||
|
<div className="space-y-4">
|
||||||
|
{/* File Info */}
|
||||||
|
<div className="p-3 bg-muted/30 rounded-lg">
|
||||||
|
<p className="text-xs text-muted-foreground">Analyzing file:</p>
|
||||||
|
<p className="text-sm font-mono truncate">{selectedFilePath}</p>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{/* Spectrum Visualization */}
|
||||||
|
<SpectrumVisualization
|
||||||
|
sampleRate={result.sample_rate}
|
||||||
|
bitsPerSample={result.bits_per_sample}
|
||||||
|
duration={result.duration}
|
||||||
|
spectrumData={result.spectrum}
|
||||||
|
/>
|
||||||
|
|
||||||
|
{/* Detailed Analysis */}
|
||||||
|
<AudioAnalysis result={result} analyzing={analyzing} showAnalyzeButton={false} />
|
||||||
|
|
||||||
|
{/* Actions */}
|
||||||
|
<div className="flex gap-2 justify-end pt-2">
|
||||||
|
<Button onClick={handleAnalyzeAnother} variant="outline">
|
||||||
|
<Upload className="h-4 w-4" />
|
||||||
|
Analyze Another File
|
||||||
|
</Button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
}
|
||||||
@@ -0,0 +1,132 @@
|
|||||||
|
import { useState, useEffect, useRef } from "react";
|
||||||
|
import { Bug, Trash2, X, Copy, Check } from "lucide-react";
|
||||||
|
import { Button } from "@/components/ui/button";
|
||||||
|
import {
|
||||||
|
Dialog,
|
||||||
|
DialogContent,
|
||||||
|
DialogTitle,
|
||||||
|
DialogTrigger,
|
||||||
|
} from "@/components/ui/dialog";
|
||||||
|
import { logger, type LogEntry } from "@/lib/logger";
|
||||||
|
|
||||||
|
const levelColors: Record<string, string> = {
|
||||||
|
info: "text-blue-500",
|
||||||
|
success: "text-green-500",
|
||||||
|
warning: "text-yellow-500",
|
||||||
|
error: "text-red-500",
|
||||||
|
debug: "text-gray-500",
|
||||||
|
};
|
||||||
|
|
||||||
|
function formatTime(date: Date): string {
|
||||||
|
return date.toLocaleTimeString("en-US", {
|
||||||
|
hour12: false,
|
||||||
|
hour: "2-digit",
|
||||||
|
minute: "2-digit",
|
||||||
|
second: "2-digit",
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
export function DebugLogger() {
|
||||||
|
const [open, setOpen] = useState(false);
|
||||||
|
const [logs, setLogs] = useState<LogEntry[]>([]);
|
||||||
|
const [copied, setCopied] = useState(false);
|
||||||
|
const scrollRef = useRef<HTMLDivElement>(null);
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
const unsubscribe = logger.subscribe(() => {
|
||||||
|
setLogs(logger.getLogs());
|
||||||
|
});
|
||||||
|
setLogs(logger.getLogs());
|
||||||
|
return () => {
|
||||||
|
unsubscribe();
|
||||||
|
};
|
||||||
|
}, []);
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
if (scrollRef.current) {
|
||||||
|
scrollRef.current.scrollTop = scrollRef.current.scrollHeight;
|
||||||
|
}
|
||||||
|
}, [logs]);
|
||||||
|
|
||||||
|
const handleClear = () => {
|
||||||
|
logger.clear();
|
||||||
|
};
|
||||||
|
|
||||||
|
const handleCopy = async () => {
|
||||||
|
const logText = logs
|
||||||
|
.map((log) => `[${formatTime(log.timestamp)}] [${log.level}] ${log.message}`)
|
||||||
|
.join("\n");
|
||||||
|
|
||||||
|
try {
|
||||||
|
await navigator.clipboard.writeText(logText);
|
||||||
|
setCopied(true);
|
||||||
|
setTimeout(() => setCopied(false), 500);
|
||||||
|
} catch (err) {
|
||||||
|
console.error("Failed to copy logs:", err);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
return (
|
||||||
|
<Dialog open={open} onOpenChange={setOpen}>
|
||||||
|
<DialogTrigger asChild>
|
||||||
|
<Button
|
||||||
|
variant="ghost"
|
||||||
|
size="icon"
|
||||||
|
className="h-6 w-6 opacity-50 hover:opacity-100"
|
||||||
|
>
|
||||||
|
<Bug className="h-3.5 w-3.5" />
|
||||||
|
</Button>
|
||||||
|
</DialogTrigger>
|
||||||
|
<DialogContent className="sm:max-w-[600px] max-h-[80vh] p-6 [&>button]:hidden">
|
||||||
|
<DialogTitle className="text-sm font-medium">Debug Logs</DialogTitle>
|
||||||
|
<div className="absolute right-4 top-4 flex items-center gap-1">
|
||||||
|
<Button
|
||||||
|
variant="ghost"
|
||||||
|
size="icon"
|
||||||
|
className="h-6 w-6 opacity-70 hover:opacity-100"
|
||||||
|
onClick={handleCopy}
|
||||||
|
disabled={logs.length === 0}
|
||||||
|
>
|
||||||
|
{copied ? <Check className="h-4 w-4" /> : <Copy className="h-4 w-4" />}
|
||||||
|
</Button>
|
||||||
|
<Button
|
||||||
|
variant="ghost"
|
||||||
|
size="icon"
|
||||||
|
className="h-6 w-6 opacity-70 hover:opacity-100"
|
||||||
|
onClick={handleClear}
|
||||||
|
>
|
||||||
|
<Trash2 className="h-4 w-4" />
|
||||||
|
</Button>
|
||||||
|
<Button
|
||||||
|
variant="ghost"
|
||||||
|
size="icon"
|
||||||
|
className="h-6 w-6 opacity-70 hover:opacity-100"
|
||||||
|
onClick={() => setOpen(false)}
|
||||||
|
>
|
||||||
|
<X className="h-4 w-4" />
|
||||||
|
</Button>
|
||||||
|
</div>
|
||||||
|
<div
|
||||||
|
ref={scrollRef}
|
||||||
|
className="h-[400px] overflow-y-auto bg-muted/50 rounded-md p-3 font-mono text-xs"
|
||||||
|
>
|
||||||
|
{logs.length === 0 ? (
|
||||||
|
<p className="text-muted-foreground lowercase">no logs yet...</p>
|
||||||
|
) : (
|
||||||
|
logs.map((log, i) => (
|
||||||
|
<div key={i} className="flex gap-2 py-0.5">
|
||||||
|
<span className="text-muted-foreground shrink-0">
|
||||||
|
[{formatTime(log.timestamp)}]
|
||||||
|
</span>
|
||||||
|
<span className={`shrink-0 w-16 ${levelColors[log.level]}`}>
|
||||||
|
[{log.level}]
|
||||||
|
</span>
|
||||||
|
<span className="break-all">{log.message}</span>
|
||||||
|
</div>
|
||||||
|
))
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
</DialogContent>
|
||||||
|
</Dialog>
|
||||||
|
);
|
||||||
|
}
|
||||||
@@ -0,0 +1,112 @@
|
|||||||
|
import { useState, useEffect, useRef } from "react";
|
||||||
|
import { Trash2, Copy, Check } from "lucide-react";
|
||||||
|
import { Button } from "@/components/ui/button";
|
||||||
|
import { logger, type LogEntry } from "@/lib/logger";
|
||||||
|
|
||||||
|
const levelColors: Record<string, string> = {
|
||||||
|
info: "text-blue-500",
|
||||||
|
success: "text-green-500",
|
||||||
|
warning: "text-yellow-500",
|
||||||
|
error: "text-red-500",
|
||||||
|
debug: "text-gray-500",
|
||||||
|
};
|
||||||
|
|
||||||
|
function formatTime(date: Date): string {
|
||||||
|
return date.toLocaleTimeString("en-US", {
|
||||||
|
hour12: false,
|
||||||
|
hour: "2-digit",
|
||||||
|
minute: "2-digit",
|
||||||
|
second: "2-digit",
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
export function DebugLoggerPage() {
|
||||||
|
const [logs, setLogs] = useState<LogEntry[]>([]);
|
||||||
|
const [copied, setCopied] = useState(false);
|
||||||
|
const scrollRef = useRef<HTMLDivElement>(null);
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
const unsubscribe = logger.subscribe(() => {
|
||||||
|
setLogs(logger.getLogs());
|
||||||
|
});
|
||||||
|
setLogs(logger.getLogs());
|
||||||
|
return () => {
|
||||||
|
unsubscribe();
|
||||||
|
};
|
||||||
|
}, []);
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
if (scrollRef.current) {
|
||||||
|
scrollRef.current.scrollTop = scrollRef.current.scrollHeight;
|
||||||
|
}
|
||||||
|
}, [logs]);
|
||||||
|
|
||||||
|
const handleClear = () => {
|
||||||
|
logger.clear();
|
||||||
|
};
|
||||||
|
|
||||||
|
const handleCopy = async () => {
|
||||||
|
const logText = logs
|
||||||
|
.map((log) => `[${formatTime(log.timestamp)}] [${log.level}] ${log.message}`)
|
||||||
|
.join("\n");
|
||||||
|
|
||||||
|
try {
|
||||||
|
await navigator.clipboard.writeText(logText);
|
||||||
|
setCopied(true);
|
||||||
|
setTimeout(() => setCopied(false), 500);
|
||||||
|
} catch (err) {
|
||||||
|
console.error("Failed to copy logs:", err);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
return (
|
||||||
|
<div className="space-y-6">
|
||||||
|
<div className="flex items-center justify-between">
|
||||||
|
<h1 className="text-2xl font-bold">Debug Logs</h1>
|
||||||
|
<div className="flex items-center gap-2">
|
||||||
|
<Button
|
||||||
|
variant="outline"
|
||||||
|
size="sm"
|
||||||
|
className="gap-1.5"
|
||||||
|
onClick={handleCopy}
|
||||||
|
disabled={logs.length === 0}
|
||||||
|
>
|
||||||
|
{copied ? <Check className="h-4 w-4" /> : <Copy className="h-4 w-4" />}
|
||||||
|
Copy
|
||||||
|
</Button>
|
||||||
|
<Button
|
||||||
|
variant="outline"
|
||||||
|
size="sm"
|
||||||
|
className="gap-1.5"
|
||||||
|
onClick={handleClear}
|
||||||
|
disabled={logs.length === 0}
|
||||||
|
>
|
||||||
|
<Trash2 className="h-4 w-4" />
|
||||||
|
Clear
|
||||||
|
</Button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div
|
||||||
|
ref={scrollRef}
|
||||||
|
className="h-[calc(100vh-220px)] overflow-y-auto bg-muted/50 rounded-lg p-4 font-mono text-xs"
|
||||||
|
>
|
||||||
|
{logs.length === 0 ? (
|
||||||
|
<p className="text-muted-foreground lowercase">no logs yet...</p>
|
||||||
|
) : (
|
||||||
|
logs.map((log, i) => (
|
||||||
|
<div key={i} className="flex gap-2 py-0.5">
|
||||||
|
<span className="text-muted-foreground shrink-0">
|
||||||
|
[{formatTime(log.timestamp)}]
|
||||||
|
</span>
|
||||||
|
<span className={`shrink-0 w-16 ${levelColors[log.level]}`}>
|
||||||
|
[{log.level}]
|
||||||
|
</span>
|
||||||
|
<span className="break-all">{log.message}</span>
|
||||||
|
</div>
|
||||||
|
))
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
}
|
||||||
@@ -1,18 +1,35 @@
|
|||||||
import { useDownloadProgress } from "@/hooks/useDownloadProgress";
|
import { useDownloadProgress } from "@/hooks/useDownloadProgress";
|
||||||
import { Download } from "lucide-react";
|
import { useDownloadQueueData } from "@/hooks/useDownloadQueueData";
|
||||||
|
import { Download, ChevronRight } from "lucide-react";
|
||||||
|
import { Button } from "@/components/ui/button";
|
||||||
|
|
||||||
export function DownloadProgressToast() {
|
interface DownloadProgressToastProps {
|
||||||
|
onClick: () => void;
|
||||||
|
}
|
||||||
|
|
||||||
|
export function DownloadProgressToast({ onClick }: DownloadProgressToastProps) {
|
||||||
const progress = useDownloadProgress();
|
const progress = useDownloadProgress();
|
||||||
|
const queueInfo = useDownloadQueueData();
|
||||||
|
|
||||||
if (!progress.is_downloading) {
|
// Show indicator if there are any queued or downloading items
|
||||||
|
// Don't show for completed/failed/skipped only
|
||||||
|
const hasActiveDownloads = queueInfo.queue.some(
|
||||||
|
item => item.status === "queued" || item.status === "downloading"
|
||||||
|
);
|
||||||
|
|
||||||
|
if (!hasActiveDownloads) {
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div className="fixed bottom-4 left-4 z-50 animate-in slide-in-from-bottom-5 data-[state=closed]:animate-out data-[state=closed]:slide-out-to-bottom-5">
|
<div className="fixed bottom-4 left-[calc(56px+1rem)] z-50 animate-in slide-in-from-bottom-5 data-[state=closed]:animate-out data-[state=closed]:slide-out-to-bottom-5">
|
||||||
<div className="bg-background border rounded-lg shadow-lg p-3">
|
<Button
|
||||||
|
variant="outline"
|
||||||
|
className="bg-background border rounded-lg shadow-lg p-3 h-auto hover:bg-muted/50 transition-colors cursor-pointer"
|
||||||
|
onClick={onClick}
|
||||||
|
>
|
||||||
<div className="flex items-center gap-3">
|
<div className="flex items-center gap-3">
|
||||||
<Download className="h-4 w-4 text-primary animate-bounce" />
|
<Download className={`h-4 w-4 text-primary ${progress.is_downloading ? 'animate-bounce' : ''}`} />
|
||||||
<div className="flex flex-col min-w-[80px]">
|
<div className="flex flex-col min-w-[80px]">
|
||||||
<p className="text-sm font-medium font-mono tabular-nums">
|
<p className="text-sm font-medium font-mono tabular-nums">
|
||||||
{progress.mb_downloaded.toFixed(2)} MB
|
{progress.mb_downloaded.toFixed(2)} MB
|
||||||
@@ -23,8 +40,9 @@ export function DownloadProgressToast() {
|
|||||||
</p>
|
</p>
|
||||||
)}
|
)}
|
||||||
</div>
|
</div>
|
||||||
|
<ChevronRight className="h-4 w-4 text-muted-foreground ml-1" />
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</Button>
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,287 @@
|
|||||||
|
import { useEffect, useState } from "react";
|
||||||
|
import { X, Download, CheckCircle2, XCircle, Clock, FileCheck, Trash2, HardDrive, Zap, Timer } from "lucide-react";
|
||||||
|
import { Button } from "@/components/ui/button";
|
||||||
|
import {
|
||||||
|
Dialog,
|
||||||
|
DialogContent,
|
||||||
|
DialogHeader,
|
||||||
|
DialogTitle,
|
||||||
|
} from "@/components/ui/dialog";
|
||||||
|
|
||||||
|
import { Badge } from "@/components/ui/badge";
|
||||||
|
import { GetDownloadQueue, ClearCompletedDownloads } from "../../wailsjs/go/main/App";
|
||||||
|
import { backend } from "../../wailsjs/go/models";
|
||||||
|
|
||||||
|
interface DownloadQueueProps {
|
||||||
|
isOpen: boolean;
|
||||||
|
onClose: () => void;
|
||||||
|
}
|
||||||
|
|
||||||
|
export function DownloadQueue({ isOpen, onClose }: DownloadQueueProps) {
|
||||||
|
const [queueInfo, setQueueInfo] = useState<backend.DownloadQueueInfo>(
|
||||||
|
new backend.DownloadQueueInfo({
|
||||||
|
is_downloading: false,
|
||||||
|
queue: [],
|
||||||
|
current_speed: 0,
|
||||||
|
total_downloaded: 0,
|
||||||
|
session_start_time: 0,
|
||||||
|
queued_count: 0,
|
||||||
|
completed_count: 0,
|
||||||
|
failed_count: 0,
|
||||||
|
skipped_count: 0,
|
||||||
|
})
|
||||||
|
);
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
if (!isOpen) return;
|
||||||
|
|
||||||
|
const fetchQueue = async () => {
|
||||||
|
try {
|
||||||
|
const info = await GetDownloadQueue();
|
||||||
|
setQueueInfo(info);
|
||||||
|
} catch (error) {
|
||||||
|
console.error("Failed to get download queue:", error);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
// Initial fetch
|
||||||
|
fetchQueue();
|
||||||
|
|
||||||
|
// Poll every 500ms when dialog is open
|
||||||
|
const interval = setInterval(fetchQueue, 500);
|
||||||
|
|
||||||
|
return () => clearInterval(interval);
|
||||||
|
}, [isOpen]);
|
||||||
|
|
||||||
|
const handleClearHistory = async () => {
|
||||||
|
try {
|
||||||
|
await ClearCompletedDownloads();
|
||||||
|
// Refetch immediately to update UI
|
||||||
|
const info = await GetDownloadQueue();
|
||||||
|
setQueueInfo(info);
|
||||||
|
} catch (error) {
|
||||||
|
console.error("Failed to clear history:", error);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
const getStatusIcon = (status: string) => {
|
||||||
|
switch (status) {
|
||||||
|
case "downloading":
|
||||||
|
return <Download className="h-4 w-4 text-blue-500 animate-bounce" />;
|
||||||
|
case "completed":
|
||||||
|
return <CheckCircle2 className="h-4 w-4 text-green-500" />;
|
||||||
|
case "failed":
|
||||||
|
return <XCircle className="h-4 w-4 text-red-500" />;
|
||||||
|
case "skipped":
|
||||||
|
return <FileCheck className="h-4 w-4 text-yellow-500" />;
|
||||||
|
case "queued":
|
||||||
|
return <Clock className="h-4 w-4 text-muted-foreground" />;
|
||||||
|
default:
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
const getStatusBadge = (status: string) => {
|
||||||
|
const variants: Record<string, "default" | "secondary" | "destructive" | "outline"> = {
|
||||||
|
downloading: "default",
|
||||||
|
completed: "outline",
|
||||||
|
failed: "destructive",
|
||||||
|
skipped: "secondary",
|
||||||
|
queued: "outline",
|
||||||
|
};
|
||||||
|
|
||||||
|
return (
|
||||||
|
<Badge variant={variants[status] || "outline"} className="text-xs">
|
||||||
|
{status}
|
||||||
|
</Badge>
|
||||||
|
);
|
||||||
|
};
|
||||||
|
|
||||||
|
// Format session duration
|
||||||
|
const formatDuration = (startTimestamp: number) => {
|
||||||
|
if (startTimestamp === 0) return "—";
|
||||||
|
const now = Math.floor(Date.now() / 1000);
|
||||||
|
const durationSeconds = now - startTimestamp;
|
||||||
|
|
||||||
|
const hours = Math.floor(durationSeconds / 3600);
|
||||||
|
const minutes = Math.floor((durationSeconds % 3600) / 60);
|
||||||
|
const seconds = durationSeconds % 60;
|
||||||
|
|
||||||
|
if (hours > 0) {
|
||||||
|
return `${hours}h ${minutes}m ${seconds}s`;
|
||||||
|
} else if (minutes > 0) {
|
||||||
|
return `${minutes}m ${seconds}s`;
|
||||||
|
} else {
|
||||||
|
return `${seconds}s`;
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
return (
|
||||||
|
<Dialog open={isOpen} onOpenChange={onClose}>
|
||||||
|
<DialogContent className="max-w-[1200px] w-[95vw] max-h-[80vh] flex flex-col p-0 gap-0 [&>button]:hidden">
|
||||||
|
<DialogHeader className="px-6 pt-6 pb-4 border-b space-y-0">
|
||||||
|
<div className="flex items-center justify-between mb-4 pr-8">
|
||||||
|
<DialogTitle className="text-lg font-semibold">Download Queue</DialogTitle>
|
||||||
|
<div className="flex items-center gap-2">
|
||||||
|
{(queueInfo.completed_count > 0 || queueInfo.failed_count > 0 || queueInfo.skipped_count > 0) && (
|
||||||
|
<Button
|
||||||
|
variant="ghost"
|
||||||
|
size="sm"
|
||||||
|
className="h-7 text-xs gap-1.5"
|
||||||
|
onClick={handleClearHistory}
|
||||||
|
>
|
||||||
|
<Trash2 className="h-3 w-3" />
|
||||||
|
Clear History
|
||||||
|
</Button>
|
||||||
|
)}
|
||||||
|
<Button
|
||||||
|
variant="ghost"
|
||||||
|
size="icon"
|
||||||
|
className="h-7 w-7 rounded-full hover:bg-muted"
|
||||||
|
onClick={onClose}
|
||||||
|
>
|
||||||
|
<X className="h-4 w-4" />
|
||||||
|
</Button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{/* Queue Status */}
|
||||||
|
<div className="flex items-center gap-4 text-sm">
|
||||||
|
<div className="flex items-center gap-1.5">
|
||||||
|
<Clock className="h-3.5 w-3.5 text-muted-foreground" />
|
||||||
|
<span className="text-muted-foreground">Queued:</span>
|
||||||
|
<span className="font-semibold">{queueInfo.queued_count}</span>
|
||||||
|
</div>
|
||||||
|
<div className="flex items-center gap-1.5">
|
||||||
|
<CheckCircle2 className="h-3.5 w-3.5 text-green-500" />
|
||||||
|
<span className="text-muted-foreground">Completed:</span>
|
||||||
|
<span className="font-semibold">{queueInfo.completed_count}</span>
|
||||||
|
</div>
|
||||||
|
<div className="flex items-center gap-1.5">
|
||||||
|
<FileCheck className="h-3.5 w-3.5 text-yellow-500" />
|
||||||
|
<span className="text-muted-foreground">Skipped:</span>
|
||||||
|
<span className="font-semibold">{queueInfo.skipped_count}</span>
|
||||||
|
</div>
|
||||||
|
<div className="flex items-center gap-1.5">
|
||||||
|
<XCircle className="h-3.5 w-3.5 text-red-500" />
|
||||||
|
<span className="text-muted-foreground">Failed:</span>
|
||||||
|
<span className="font-semibold">{queueInfo.failed_count}</span>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{/* Session Stats */}
|
||||||
|
<div className="flex items-center gap-4 text-sm pt-3 mt-3 border-t">
|
||||||
|
<div className="flex items-center gap-1.5">
|
||||||
|
<HardDrive className="h-3.5 w-3.5 text-muted-foreground" />
|
||||||
|
<span className="text-muted-foreground">Downloaded:</span>
|
||||||
|
<span className="font-semibold font-mono">
|
||||||
|
{queueInfo.total_downloaded > 0 ? `${queueInfo.total_downloaded.toFixed(2)} MB` : "0.00 MB"}
|
||||||
|
</span>
|
||||||
|
</div>
|
||||||
|
<div className="flex items-center gap-1.5">
|
||||||
|
<Zap className="h-3.5 w-3.5 text-muted-foreground" />
|
||||||
|
<span className="text-muted-foreground">Speed:</span>
|
||||||
|
<span className="font-semibold font-mono">
|
||||||
|
{queueInfo.current_speed > 0 && queueInfo.is_downloading
|
||||||
|
? `${queueInfo.current_speed.toFixed(2)} MB/s`
|
||||||
|
: "—"}
|
||||||
|
</span>
|
||||||
|
</div>
|
||||||
|
<div className="flex items-center gap-1.5">
|
||||||
|
<Timer className="h-3.5 w-3.5 text-muted-foreground" />
|
||||||
|
<span className="text-muted-foreground">Duration:</span>
|
||||||
|
<span className="font-semibold font-mono">
|
||||||
|
{queueInfo.session_start_time > 0 ? formatDuration(queueInfo.session_start_time) : "—"}
|
||||||
|
</span>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
</DialogHeader>
|
||||||
|
|
||||||
|
{/* Download Queue List */}
|
||||||
|
<div className="flex-1 overflow-y-auto px-6 custom-scrollbar">
|
||||||
|
<div className="space-y-2 py-4">
|
||||||
|
{queueInfo.queue.length === 0 ? (
|
||||||
|
<div className="text-center py-12 text-muted-foreground">
|
||||||
|
<Download className="h-12 w-12 mx-auto mb-3 opacity-20" />
|
||||||
|
<p>No downloads in queue</p>
|
||||||
|
</div>
|
||||||
|
) : (
|
||||||
|
queueInfo.queue.map((item) => (
|
||||||
|
<div
|
||||||
|
key={item.id}
|
||||||
|
className="border rounded-lg p-3 hover:bg-muted/30 transition-colors"
|
||||||
|
>
|
||||||
|
<div className="flex items-start gap-3">
|
||||||
|
<div className="mt-1">{getStatusIcon(item.status)}</div>
|
||||||
|
|
||||||
|
<div className="flex-1 min-w-0">
|
||||||
|
<div className="flex items-start justify-between gap-2 mb-1">
|
||||||
|
<div className="flex-1 min-w-0">
|
||||||
|
<p className="font-medium truncate">{item.track_name}</p>
|
||||||
|
<p className="text-sm text-muted-foreground truncate">
|
||||||
|
{item.artist_name}
|
||||||
|
{item.album_name && ` • ${item.album_name}`}
|
||||||
|
</p>
|
||||||
|
</div>
|
||||||
|
{getStatusBadge(item.status)}
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{/* Info for downloading items */}
|
||||||
|
{item.status === "downloading" && (
|
||||||
|
<div className="flex items-center gap-3 mt-1.5 text-xs text-muted-foreground font-mono">
|
||||||
|
<span>
|
||||||
|
{item.progress > 0
|
||||||
|
? `${item.progress.toFixed(2)} MB`
|
||||||
|
: queueInfo.is_downloading && queueInfo.current_speed > 0
|
||||||
|
? "Downloading..."
|
||||||
|
: "Starting..."}
|
||||||
|
</span>
|
||||||
|
<span>
|
||||||
|
{item.speed > 0
|
||||||
|
? `${item.speed.toFixed(2)} MB/s`
|
||||||
|
: queueInfo.current_speed > 0
|
||||||
|
? `${queueInfo.current_speed.toFixed(2)} MB/s`
|
||||||
|
: "—"}
|
||||||
|
</span>
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
|
||||||
|
{/* Completed info */}
|
||||||
|
{item.status === "completed" && (
|
||||||
|
<div className="flex items-center gap-3 mt-1.5 text-xs text-muted-foreground">
|
||||||
|
<span className="font-mono">{item.progress.toFixed(2)} MB</span>
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
|
||||||
|
{/* Skipped info */}
|
||||||
|
{item.status === "skipped" && (
|
||||||
|
<div className="mt-1.5 text-xs text-muted-foreground">
|
||||||
|
File already exists
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
|
||||||
|
{/* Error message */}
|
||||||
|
{item.status === "failed" && item.error_message && (
|
||||||
|
<div className="mt-1.5 text-xs text-red-500 bg-red-50 dark:bg-red-950/20 rounded px-2 py-1">
|
||||||
|
{item.error_message}
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
|
||||||
|
{/* File path for completed/skipped */}
|
||||||
|
{(item.status === "completed" || item.status === "skipped") && item.file_path && (
|
||||||
|
<div className="mt-1.5 text-xs text-muted-foreground truncate font-mono">
|
||||||
|
{item.file_path}
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
))
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</DialogContent>
|
||||||
|
</Dialog>
|
||||||
|
);
|
||||||
|
}
|
||||||
@@ -0,0 +1,91 @@
|
|||||||
|
import { X } from "lucide-react";
|
||||||
|
|
||||||
|
export interface HistoryItem {
|
||||||
|
id: string;
|
||||||
|
url: string;
|
||||||
|
type: "track" | "album" | "playlist" | "artist";
|
||||||
|
name: string;
|
||||||
|
artist: string;
|
||||||
|
image: string;
|
||||||
|
timestamp: number;
|
||||||
|
}
|
||||||
|
|
||||||
|
interface FetchHistoryProps {
|
||||||
|
history: HistoryItem[];
|
||||||
|
onSelect: (item: HistoryItem) => void;
|
||||||
|
onRemove: (id: string) => void;
|
||||||
|
}
|
||||||
|
|
||||||
|
export function FetchHistory({ history, onSelect, onRemove }: FetchHistoryProps) {
|
||||||
|
if (history.length === 0) return null;
|
||||||
|
|
||||||
|
const getTypeLabel = (type: string) => {
|
||||||
|
switch (type) {
|
||||||
|
case "track":
|
||||||
|
return "Track";
|
||||||
|
case "album":
|
||||||
|
return "Album";
|
||||||
|
case "playlist":
|
||||||
|
return "Playlist";
|
||||||
|
case "artist":
|
||||||
|
return "Artist";
|
||||||
|
default:
|
||||||
|
return type;
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
return (
|
||||||
|
<div className="space-y-2">
|
||||||
|
<span className="text-sm text-muted-foreground">Recent Fetches</span>
|
||||||
|
<div className="flex gap-2 overflow-x-auto pb-2 pt-2">
|
||||||
|
{history.map((item) => (
|
||||||
|
<div
|
||||||
|
key={item.id}
|
||||||
|
className="relative shrink-0 w-[130px] group cursor-pointer rounded-lg border bg-card hover:bg-accent transition-colors overflow-visible"
|
||||||
|
onClick={() => onSelect(item)}
|
||||||
|
>
|
||||||
|
<button
|
||||||
|
type="button"
|
||||||
|
className="absolute -top-1.5 -right-1.5 z-10 w-5 h-5 rounded-full bg-red-500 hover:bg-red-600 flex items-center justify-center opacity-0 group-hover:opacity-100 transition-all cursor-pointer shadow-sm"
|
||||||
|
onClick={(e) => {
|
||||||
|
e.stopPropagation();
|
||||||
|
onRemove(item.id);
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
<X className="h-3 w-3 text-red-900" strokeWidth={3} />
|
||||||
|
</button>
|
||||||
|
<div className="p-2">
|
||||||
|
<div className="aspect-square w-full rounded-md overflow-hidden mb-2 bg-muted">
|
||||||
|
{item.image ? (
|
||||||
|
<img
|
||||||
|
src={item.image}
|
||||||
|
alt={item.name}
|
||||||
|
className="w-full h-full object-cover"
|
||||||
|
/>
|
||||||
|
) : (
|
||||||
|
<div className="w-full h-full flex items-center justify-center text-muted-foreground text-xs">
|
||||||
|
No Image
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
<div className="space-y-0.5">
|
||||||
|
<p className="text-xs font-medium truncate" title={item.name}>
|
||||||
|
{item.name}
|
||||||
|
</p>
|
||||||
|
<p
|
||||||
|
className="text-xs text-muted-foreground truncate"
|
||||||
|
title={item.artist}
|
||||||
|
>
|
||||||
|
{item.artist}
|
||||||
|
</p>
|
||||||
|
<span className="inline-block text-[10px] px-1.5 py-0.5 rounded bg-muted text-muted-foreground">
|
||||||
|
{getTypeLabel(item.type)}
|
||||||
|
</span>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
))}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
}
|
||||||
@@ -1,18 +1,19 @@
|
|||||||
import { Button } from "@/components/ui/button";
|
|
||||||
import { Badge } from "@/components/ui/badge";
|
import { Badge } from "@/components/ui/badge";
|
||||||
import { Settings } from "@/components/Settings";
|
|
||||||
import {
|
import {
|
||||||
Tooltip,
|
Tooltip,
|
||||||
TooltipContent,
|
TooltipContent,
|
||||||
TooltipTrigger,
|
TooltipTrigger,
|
||||||
} from "@/components/ui/tooltip";
|
} from "@/components/ui/tooltip";
|
||||||
|
import { openExternal } from "@/lib/utils";
|
||||||
|
import { formatRelativeTime } from "@/lib/relative-time";
|
||||||
|
|
||||||
interface HeaderProps {
|
interface HeaderProps {
|
||||||
version: string;
|
version: string;
|
||||||
hasUpdate: boolean;
|
hasUpdate: boolean;
|
||||||
|
releaseDate?: string | null;
|
||||||
}
|
}
|
||||||
|
|
||||||
export function Header({ version, hasUpdate }: HeaderProps) {
|
export function Header({ version, hasUpdate, releaseDate }: HeaderProps) {
|
||||||
return (
|
return (
|
||||||
<div className="relative">
|
<div className="relative">
|
||||||
<div className="text-center space-y-2">
|
<div className="text-center space-y-2">
|
||||||
@@ -30,16 +31,24 @@ export function Header({ version, hasUpdate }: HeaderProps) {
|
|||||||
SpotiFLAC
|
SpotiFLAC
|
||||||
</h1>
|
</h1>
|
||||||
<div className="relative">
|
<div className="relative">
|
||||||
<Badge variant="default" asChild>
|
<Tooltip>
|
||||||
<a
|
<TooltipTrigger asChild>
|
||||||
href="https://github.com/afkarxyz/SpotiFLAC/releases"
|
<Badge variant="default" asChild>
|
||||||
target="_blank"
|
<button
|
||||||
rel="noopener noreferrer"
|
type="button"
|
||||||
className="cursor-pointer hover:opacity-80 transition-opacity"
|
onClick={() => openExternal("https://github.com/afkarxyz/SpotiFLAC/releases")}
|
||||||
>
|
className="cursor-pointer hover:opacity-80 transition-opacity"
|
||||||
v{version}
|
>
|
||||||
</a>
|
v{version}
|
||||||
</Badge>
|
</button>
|
||||||
|
</Badge>
|
||||||
|
</TooltipTrigger>
|
||||||
|
{hasUpdate && releaseDate && (
|
||||||
|
<TooltipContent>
|
||||||
|
<p>{formatRelativeTime(releaseDate)}</p>
|
||||||
|
</TooltipContent>
|
||||||
|
)}
|
||||||
|
</Tooltip>
|
||||||
{hasUpdate && (
|
{hasUpdate && (
|
||||||
<span className="absolute -top-1 -right-1 flex h-3 w-3">
|
<span className="absolute -top-1 -right-1 flex h-3 w-3">
|
||||||
<span className="animate-ping absolute inline-flex h-full w-full rounded-full bg-green-400 opacity-75"></span>
|
<span className="animate-ping absolute inline-flex h-full w-full rounded-full bg-green-400 opacity-75"></span>
|
||||||
@@ -52,28 +61,6 @@ export function Header({ version, hasUpdate }: HeaderProps) {
|
|||||||
Get Spotify tracks in true FLAC from Tidal, Deezer, Qobuz & Amazon Music — no account required.
|
Get Spotify tracks in true FLAC from Tidal, Deezer, Qobuz & Amazon Music — no account required.
|
||||||
</p>
|
</p>
|
||||||
</div>
|
</div>
|
||||||
<div className="absolute right-0 top-0 flex gap-2">
|
|
||||||
<Tooltip>
|
|
||||||
<TooltipTrigger asChild>
|
|
||||||
<Button variant="outline" size="icon" asChild>
|
|
||||||
<a
|
|
||||||
href="https://github.com/afkarxyz/SpotiFLAC/issues"
|
|
||||||
target="_blank"
|
|
||||||
rel="noopener noreferrer"
|
|
||||||
aria-label="GitHub Issues"
|
|
||||||
>
|
|
||||||
<svg viewBox="0 0 24 24" className="h-5 w-5" fill="currentColor">
|
|
||||||
<path d="M12 0c-6.626 0-12 5.373-12 12 0 5.302 3.438 9.8 8.207 11.387.599.111.793-.261.793-.577v-2.234c-3.338.726-4.033-1.416-4.033-1.416-.546-1.387-1.333-1.756-1.333-1.756-1.089-.745.083-.729.083-.729 1.205.084 1.839 1.237 1.839 1.237 1.07 1.834 2.807 1.304 3.492.997.107-.775.418-1.305.762-1.604-2.665-.305-5.467-1.334-5.467-5.931 0-1.311.469-2.381 1.236-3.221-.124-.303-.535-1.524.117-3.176 0 0 1.008-.322 3.301 1.23.957-.266 1.983-.399 3.003-.404 1.02.005 2.047.138 3.006.404 2.291-1.552 3.297-1.23 3.297-1.23.653 1.653.242 2.874.118 3.176.77.84 1.235 1.911 1.235 3.221 0 4.609-2.807 5.624-5.479 5.921.43.372.823 1.102.823 2.222v3.293c0 .319.192.694.801.576 4.765-1.589 8.199-6.086 8.199-11.386 0-6.627-5.373-12-12-12z" />
|
|
||||||
</svg>
|
|
||||||
</a>
|
|
||||||
</Button>
|
|
||||||
</TooltipTrigger>
|
|
||||||
<TooltipContent side="left">
|
|
||||||
<p>Report bug or request feature</p>
|
|
||||||
</TooltipContent>
|
|
||||||
</Tooltip>
|
|
||||||
<Settings />
|
|
||||||
</div>
|
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,28 @@
|
|||||||
|
// Platform Icons for streaming services
|
||||||
|
|
||||||
|
export const TidalIcon = ({ className = "w-4 h-4" }: { className?: string }) => (
|
||||||
|
<svg viewBox="0 0 24 24" className={`${className} fill-current`}>
|
||||||
|
<path d="M4.022 4.5 0 8.516l3.997 3.99 3.997-3.984L4.022 4.5Zm7.956 0L7.994 8.522l4.003 3.984L16 8.484 11.978 4.5Zm8.007 0L24 8.528l-4.003 3.978L16 8.484 19.985 4.5Z"></path>
|
||||||
|
<path d="m8.012 16.534 3.991 3.966L16 16.49l-4.003-3.984-3.985 4.028Z"></path>
|
||||||
|
</svg>
|
||||||
|
);
|
||||||
|
|
||||||
|
export const DeezerIcon = ({ className = "w-4 h-4" }: { className?: string }) => (
|
||||||
|
<svg viewBox="0 0 24 24" className={`${className} fill-current`}>
|
||||||
|
<path d="M18.77 5.55c.19-1.07.46-1.75.76-1.75.56 0 1.02 2.34 1.02 5.23 0 2.89-.46 5.23-1.02 5.23-.23 0-.44-.4-.61-1.06-.27 2.43-.83 4.11-1.48 4.11-.5 0-.96-1-1.26-2.6-.2 3.03-.73 5.17-1.33 5.17-.39 0-.73-.85-.99-2.23-.31 2.85-1.03 4.85-1.86 4.85-.83 0-1.55-2-1.86-4.85-.25 1.38-.6 2.23-.99 2.23-.6 0-1.12-2.14-1.33-5.16-.3 1.58-.75 2.6-1.26 2.6-.65 0-1.2-1.68-1.48-4.12-.17.66-.38 1.06-.61 1.06-.56 0-1.02-2.34-1.02-5.23 0-2.89.46-5.23 1.02-5.23.3 0 .57.68.76 1.75C5.53 3.7 6 2.5 6.56 2.5c.66 0 1.22 1.7 1.49 4.17.26-1.8.66-2.94 1.1-2.94.63 0 1.16 2.25 1.36 5.4.36-1.62.9-2.63 1.5-2.63.58 0 1.12 1.01 1.49 2.62.2-3.14.72-5.4 1.35-5.4.44 0 .84 1.15 1.1 2.95.27-2.47.84-4.17 1.49-4.17.55 0 1.03 1.2 1.33 3.05ZM2 8.52c0-1.3.26-2.34.58-2.34.32 0 .57 1.05.57 2.34 0 1.29-.25 2.34-.57 2.34-.32 0-.58-1.05-.58-2.34Zm18.85 0c0-1.3.25-2.34.57-2.34.32 0 .58 1.05.58 2.34 0 1.29-.26 2.34-.58 2.34-.32 0-.57-1.05-.57-2.34Z"></path>
|
||||||
|
</svg>
|
||||||
|
);
|
||||||
|
|
||||||
|
export const QobuzIcon = ({ className = "w-4 h-4" }: { className?: string }) => (
|
||||||
|
<svg viewBox="0 0 24 24" className={`${className} fill-current`}>
|
||||||
|
<path d="M21.744 9.815C19.836 1.261 8.393-1 3.55 6.64-.618 13.214 4 22 11.988 22c2.387 0 4.63-.83 6.394-2.304l2.252 2.252 1.224-1.224-2.252-2.253c1.983-2.407 2.823-5.586 2.138-8.656Zm-3.508 7.297L16.4 15.275c-.786-.787-2.017.432-1.224 1.225L17 18.326C10.29 23.656.5 16 5.16 7.667c3.502-6.264 13.172-4.348 14.707 2.574.529 2.385-.06 4.987-1.63 6.87Z"></path>
|
||||||
|
<path d="M13.4 8.684a3.59 3.59 0 0 0-4.712 1.9 3.59 3.59 0 0 0 1.9 4.712 3.594 3.594 0 0 0 4.711-1.89 3.598 3.598 0 0 0-1.9-4.722Zm-.737 3.591a.727.727 0 0 1-.965.384.727.727 0 0 1-.384-.965.727.727 0 0 1 .965-.384.73.73 0 0 1 .384.965Z"></path>
|
||||||
|
</svg>
|
||||||
|
);
|
||||||
|
|
||||||
|
export const AmazonIcon = ({ className = "w-4 h-4" }: { className?: string }) => (
|
||||||
|
<svg viewBox="0 0 24 24" className={`${className} fill-current`}>
|
||||||
|
<path fillRule="evenodd" d="M15.62 11.13c-.15.1-.37.18-.64.18-.42 0-.82-.05-1.21-.18l-.22-.04c-.08 0-.1.04-.1.14v.25c0 .08.02.12.05.17.02.03.07.08.15.1.4.18.84.25 1.33.25.52 0 .91-.12 1.24-.37.32-.25.47-.57.47-.99 0-.3-.08-.52-.23-.72-.15-.17-.4-.34-.74-.47l-.7-.27c-.26-.1-.46-.2-.53-.3a.47.47 0 0 1-.15-.36c0-.38.27-.57.84-.57.32 0 .64.05.94.15l.2.04c.07 0 .12-.04.12-.14v-.25c0-.08-.03-.12-.05-.17-.03-.05-.08-.08-.15-.1-.37-.13-.74-.2-1.11-.2-.47 0-.87.12-1.16.35-.3.22-.45.54-.45.91 0 .57.32.99.97 1.24l.74.27c.24.1.4.17.5.27.09.1.12.2.12.35 0 .2-.08.37-.23.46Zm-3.88-3.55v3.28c-.42.28-.84.42-1.26.42-.27 0-.47-.07-.6-.22-.11-.15-.16-.37-.16-.7V7.59c0-.13-.05-.18-.18-.18h-.52c-.12 0-.17.05-.17.18v3.06c0 .42.1.77.32.99.22.22.55.35.97.35.56 0 1.13-.2 1.68-.6l.05.3c0 .07.02.1.07.12.02.03.07.03.15.03h.37c.12 0 .17-.05.17-.18V7.58c0-.13-.05-.18-.17-.18h-.52c-.15 0-.2.08-.2.18Zm-4.69 4.27h.52c.12 0 .17-.05.17-.17v-3.1c0-.41-.1-.73-.32-.95a1.25 1.25 0 0 0-.94-.35c-.57 0-1.16.2-1.73.62-.2-.42-.57-.62-1.11-.62-.55 0-1.1.2-1.64.57l-.04-.27c0-.08-.03-.1-.08-.13-.02-.02-.07-.02-.12-.02h-.4c-.12 0-.17.05-.17.17v4.1c0 .13.05.18.17.18h.52c.12 0 .17-.05.17-.18V8.37c.42-.25.84-.4 1.29-.4.25 0 .42.08.52.22.1.15.17.35.17.65v2.84c0 .12.05.17.17.17h.52c.13 0 .18-.05.18-.17V8.37c.44-.27.86-.4 1.28-.4.25 0 .42.08.52.22.1.15.17.35.17.65v2.84c0 .12.05.17.18.17Zm13.47 3.29a21.8 21.8 0 0 1-8.3 1.7c-3.96 0-7.8-1.08-10.88-2.89a.35.35 0 0 0-.15-.05c-.17 0-.27.2-.1.37a16.11 16.11 0 0 0 10.87 4.16c3.02 0 6.5-.94 8.9-2.72.42-.3.08-.74-.34-.57Zm-.08-6.74c.22-.26.57-.38 1.06-.38.25 0 .5.03.72.1l.15.02c.07 0 .12-.04.12-.17v-.25c0-.07-.02-.14-.05-.17a.54.54 0 0 0-.12-.1c-.32-.07-.64-.15-.94-.15-.7 0-1.21.2-1.6.62-.38.4-.57 1-.57 1.73 0 .74.17 1.31.54 1.7.37.4.89.6 1.58.6.37 0 .72-.05.99-.17.07-.03.12-.05.15-.1.02-.03.02-.1.02-.17v-.25c0-.13-.05-.17-.12-.17-.03 0-.07 0-.12.02-.28.07-.55.12-.8.12-.46 0-.81-.12-1.03-.37-.23-.24-.32-.64-.32-1.16v-.12c.02-.55.12-.94.34-1.19Z" clipRule="evenodd"></path>
|
||||||
|
<path fillRule="evenodd" d="M21.55 17.46c1.29-1.09 1.64-3.33 1.36-3.68-.12-.15-.71-.3-1.45-.3-.8 0-1.73.18-2.45.67-.22.15-.17.35.05.32.76-.1 2.5-.3 2.82.1.3.4-.35 2.03-.65 2.74-.07.23.1.3.32.15ZM18.12 7.4h-.52c-.12 0-.17.05-.17.18v4.1c0 .12.05.17.17.17h.52c.12 0 .17-.05.17-.17v-4.1c0-.1-.05-.18-.17-.18Zm.15-1.68a.58.58 0 0 0-.42-.15c-.18 0-.3.05-.4.15a.5.5 0 0 0-.15.37c0 .15.05.3.15.37.1.1.22.15.4.15.17 0 .3-.05.4-.15a.5.5 0 0 0 .14-.37c0-.15-.02-.3-.12-.37Z" clipRule="evenodd"></path>
|
||||||
|
</svg>
|
||||||
|
);
|
||||||
@@ -1,11 +1,12 @@
|
|||||||
import { Button } from "@/components/ui/button";
|
import { Button } from "@/components/ui/button";
|
||||||
import { Card, CardContent } from "@/components/ui/card";
|
import { Card, CardContent } from "@/components/ui/card";
|
||||||
import { Download, FolderOpen } from "lucide-react";
|
import { Download, FolderOpen, ImageDown } from "lucide-react";
|
||||||
import { Spinner } from "@/components/ui/spinner";
|
import { Spinner } from "@/components/ui/spinner";
|
||||||
|
import { Tooltip, TooltipContent, TooltipTrigger } from "@/components/ui/tooltip";
|
||||||
import { SearchAndSort } from "./SearchAndSort";
|
import { SearchAndSort } from "./SearchAndSort";
|
||||||
import { TrackList } from "./TrackList";
|
import { TrackList } from "./TrackList";
|
||||||
import { DownloadProgress } from "./DownloadProgress";
|
import { DownloadProgress } from "./DownloadProgress";
|
||||||
import type { TrackMetadata } from "@/types/api";
|
import type { TrackMetadata, TrackAvailability } from "@/types/api";
|
||||||
|
|
||||||
interface PlaylistInfoProps {
|
interface PlaylistInfoProps {
|
||||||
playlistInfo: {
|
playlistInfo: {
|
||||||
@@ -27,6 +28,7 @@ interface PlaylistInfoProps {
|
|||||||
selectedTracks: string[];
|
selectedTracks: string[];
|
||||||
downloadedTracks: Set<string>;
|
downloadedTracks: Set<string>;
|
||||||
failedTracks: Set<string>;
|
failedTracks: Set<string>;
|
||||||
|
skippedTracks: Set<string>;
|
||||||
downloadingTrack: string | null;
|
downloadingTrack: string | null;
|
||||||
isDownloading: boolean;
|
isDownloading: boolean;
|
||||||
bulkDownloadType: "all" | "selected" | null;
|
bulkDownloadType: "all" | "selected" | null;
|
||||||
@@ -34,16 +36,37 @@ interface PlaylistInfoProps {
|
|||||||
currentDownloadInfo: { name: string; artists: string } | null;
|
currentDownloadInfo: { name: string; artists: string } | null;
|
||||||
currentPage: number;
|
currentPage: number;
|
||||||
itemsPerPage: number;
|
itemsPerPage: number;
|
||||||
|
// Lyrics props
|
||||||
|
downloadedLyrics?: Set<string>;
|
||||||
|
failedLyrics?: Set<string>;
|
||||||
|
skippedLyrics?: Set<string>;
|
||||||
|
downloadingLyricsTrack?: string | null;
|
||||||
|
// Availability props
|
||||||
|
checkingAvailabilityTrack?: string | null;
|
||||||
|
availabilityMap?: Map<string, TrackAvailability>;
|
||||||
|
// Cover props
|
||||||
|
downloadedCovers?: Set<string>;
|
||||||
|
failedCovers?: Set<string>;
|
||||||
|
skippedCovers?: Set<string>;
|
||||||
|
downloadingCoverTrack?: string | null;
|
||||||
|
isBulkDownloadingCovers?: boolean;
|
||||||
onSearchChange: (value: string) => void;
|
onSearchChange: (value: string) => void;
|
||||||
onSortChange: (value: string) => void;
|
onSortChange: (value: string) => void;
|
||||||
onToggleTrack: (isrc: string) => void;
|
onToggleTrack: (isrc: string) => void;
|
||||||
onToggleSelectAll: (tracks: TrackMetadata[]) => void;
|
onToggleSelectAll: (tracks: TrackMetadata[]) => void;
|
||||||
onDownloadTrack: (isrc: string, name: string, artists: string, albumName: string) => void;
|
onDownloadTrack: (isrc: string, name: string, artists: string, albumName: string, spotifyId?: string) => void;
|
||||||
|
onDownloadLyrics?: (spotifyId: string, name: string, artists: string, albumName: string, folderName?: string, isArtistDiscography?: boolean, position?: number) => void;
|
||||||
|
onDownloadCover?: (coverUrl: string, trackName: string, artistName: string, albumName: string, folderName?: string, isArtistDiscography?: boolean, position?: number, trackId?: string) => void;
|
||||||
|
onCheckAvailability?: (spotifyId: string) => void;
|
||||||
|
onDownloadAllCovers?: () => void;
|
||||||
onDownloadAll: () => void;
|
onDownloadAll: () => void;
|
||||||
onDownloadSelected: () => void;
|
onDownloadSelected: () => void;
|
||||||
onStopDownload: () => void;
|
onStopDownload: () => void;
|
||||||
onOpenFolder: () => void;
|
onOpenFolder: () => void;
|
||||||
onPageChange: (page: number) => void;
|
onPageChange: (page: number) => void;
|
||||||
|
onAlbumClick: (album: { id: string; name: string; external_urls: string }) => void;
|
||||||
|
onArtistClick: (artist: { id: string; name: string; external_urls: string }) => void;
|
||||||
|
onTrackClick: (track: TrackMetadata) => void;
|
||||||
}
|
}
|
||||||
|
|
||||||
export function PlaylistInfo({
|
export function PlaylistInfo({
|
||||||
@@ -54,6 +77,7 @@ export function PlaylistInfo({
|
|||||||
selectedTracks,
|
selectedTracks,
|
||||||
downloadedTracks,
|
downloadedTracks,
|
||||||
failedTracks,
|
failedTracks,
|
||||||
|
skippedTracks,
|
||||||
downloadingTrack,
|
downloadingTrack,
|
||||||
isDownloading,
|
isDownloading,
|
||||||
bulkDownloadType,
|
bulkDownloadType,
|
||||||
@@ -61,16 +85,34 @@ export function PlaylistInfo({
|
|||||||
currentDownloadInfo,
|
currentDownloadInfo,
|
||||||
currentPage,
|
currentPage,
|
||||||
itemsPerPage,
|
itemsPerPage,
|
||||||
|
downloadedLyrics,
|
||||||
|
failedLyrics,
|
||||||
|
skippedLyrics,
|
||||||
|
downloadingLyricsTrack,
|
||||||
|
checkingAvailabilityTrack,
|
||||||
|
availabilityMap,
|
||||||
|
downloadedCovers,
|
||||||
|
failedCovers,
|
||||||
|
skippedCovers,
|
||||||
|
downloadingCoverTrack,
|
||||||
|
isBulkDownloadingCovers,
|
||||||
onSearchChange,
|
onSearchChange,
|
||||||
onSortChange,
|
onSortChange,
|
||||||
onToggleTrack,
|
onToggleTrack,
|
||||||
onToggleSelectAll,
|
onToggleSelectAll,
|
||||||
onDownloadTrack,
|
onDownloadTrack,
|
||||||
|
onDownloadLyrics,
|
||||||
|
onDownloadCover,
|
||||||
|
onCheckAvailability,
|
||||||
|
onDownloadAllCovers,
|
||||||
onDownloadAll,
|
onDownloadAll,
|
||||||
onDownloadSelected,
|
onDownloadSelected,
|
||||||
onStopDownload,
|
onStopDownload,
|
||||||
onOpenFolder,
|
onOpenFolder,
|
||||||
onPageChange,
|
onPageChange,
|
||||||
|
onAlbumClick,
|
||||||
|
onArtistClick,
|
||||||
|
onTrackClick,
|
||||||
}: PlaylistInfoProps) {
|
}: PlaylistInfoProps) {
|
||||||
return (
|
return (
|
||||||
<div className="space-y-6">
|
<div className="space-y-6">
|
||||||
@@ -96,11 +138,8 @@ export function PlaylistInfo({
|
|||||||
<span>{playlistInfo.followers.total.toLocaleString()} followers</span>
|
<span>{playlistInfo.followers.total.toLocaleString()} followers</span>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div className="flex gap-2">
|
<div className="flex gap-2 flex-wrap">
|
||||||
<Button
|
<Button onClick={onDownloadAll} disabled={isDownloading}>
|
||||||
onClick={onDownloadAll}
|
|
||||||
disabled={isDownloading}
|
|
||||||
>
|
|
||||||
{isDownloading && bulkDownloadType === "all" ? (
|
{isDownloading && bulkDownloadType === "all" ? (
|
||||||
<Spinner />
|
<Spinner />
|
||||||
) : (
|
) : (
|
||||||
@@ -122,6 +161,22 @@ export function PlaylistInfo({
|
|||||||
Download Selected ({selectedTracks.length})
|
Download Selected ({selectedTracks.length})
|
||||||
</Button>
|
</Button>
|
||||||
)}
|
)}
|
||||||
|
{onDownloadAllCovers && (
|
||||||
|
<Tooltip>
|
||||||
|
<TooltipTrigger asChild>
|
||||||
|
<Button
|
||||||
|
onClick={onDownloadAllCovers}
|
||||||
|
variant="outline"
|
||||||
|
disabled={isBulkDownloadingCovers}
|
||||||
|
>
|
||||||
|
{isBulkDownloadingCovers ? <Spinner /> : <ImageDown className="h-4 w-4" />}
|
||||||
|
</Button>
|
||||||
|
</TooltipTrigger>
|
||||||
|
<TooltipContent>
|
||||||
|
<p>Download All Covers</p>
|
||||||
|
</TooltipContent>
|
||||||
|
</Tooltip>
|
||||||
|
)}
|
||||||
{downloadedTracks.size > 0 && (
|
{downloadedTracks.size > 0 && (
|
||||||
<Button onClick={onOpenFolder} variant="outline">
|
<Button onClick={onOpenFolder} variant="outline">
|
||||||
<FolderOpen className="h-4 w-4" />
|
<FolderOpen className="h-4 w-4" />
|
||||||
@@ -154,16 +209,34 @@ export function PlaylistInfo({
|
|||||||
selectedTracks={selectedTracks}
|
selectedTracks={selectedTracks}
|
||||||
downloadedTracks={downloadedTracks}
|
downloadedTracks={downloadedTracks}
|
||||||
failedTracks={failedTracks}
|
failedTracks={failedTracks}
|
||||||
|
skippedTracks={skippedTracks}
|
||||||
downloadingTrack={downloadingTrack}
|
downloadingTrack={downloadingTrack}
|
||||||
isDownloading={isDownloading}
|
isDownloading={isDownloading}
|
||||||
currentPage={currentPage}
|
currentPage={currentPage}
|
||||||
itemsPerPage={itemsPerPage}
|
itemsPerPage={itemsPerPage}
|
||||||
showCheckboxes={true}
|
showCheckboxes={true}
|
||||||
hideAlbumColumn={false}
|
hideAlbumColumn={false}
|
||||||
|
folderName={playlistInfo.owner.name}
|
||||||
|
downloadedLyrics={downloadedLyrics}
|
||||||
|
failedLyrics={failedLyrics}
|
||||||
|
skippedLyrics={skippedLyrics}
|
||||||
|
downloadingLyricsTrack={downloadingLyricsTrack}
|
||||||
|
checkingAvailabilityTrack={checkingAvailabilityTrack}
|
||||||
|
availabilityMap={availabilityMap}
|
||||||
|
downloadedCovers={downloadedCovers}
|
||||||
|
failedCovers={failedCovers}
|
||||||
|
skippedCovers={skippedCovers}
|
||||||
|
downloadingCoverTrack={downloadingCoverTrack}
|
||||||
onToggleTrack={onToggleTrack}
|
onToggleTrack={onToggleTrack}
|
||||||
onToggleSelectAll={onToggleSelectAll}
|
onToggleSelectAll={onToggleSelectAll}
|
||||||
onDownloadTrack={onDownloadTrack}
|
onDownloadTrack={onDownloadTrack}
|
||||||
|
onDownloadLyrics={onDownloadLyrics}
|
||||||
|
onDownloadCover={onDownloadCover}
|
||||||
|
onCheckAvailability={onCheckAvailability}
|
||||||
onPageChange={onPageChange}
|
onPageChange={onPageChange}
|
||||||
|
onAlbumClick={onAlbumClick}
|
||||||
|
onArtistClick={onArtistClick}
|
||||||
|
onTrackClick={onTrackClick}
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -6,7 +6,7 @@ import {
|
|||||||
SelectTrigger,
|
SelectTrigger,
|
||||||
SelectValue,
|
SelectValue,
|
||||||
} from "@/components/ui/select";
|
} from "@/components/ui/select";
|
||||||
import { Search, ArrowUpDown } from "lucide-react";
|
import { Search, ArrowUpDown, XCircle } from "lucide-react";
|
||||||
|
|
||||||
interface SearchAndSortProps {
|
interface SearchAndSortProps {
|
||||||
searchQuery: string;
|
searchQuery: string;
|
||||||
@@ -29,8 +29,17 @@ export function SearchAndSort({
|
|||||||
placeholder="Search tracks..."
|
placeholder="Search tracks..."
|
||||||
value={searchQuery}
|
value={searchQuery}
|
||||||
onChange={(e) => onSearchChange(e.target.value)}
|
onChange={(e) => onSearchChange(e.target.value)}
|
||||||
className="pl-10"
|
className="pl-10 pr-8"
|
||||||
/>
|
/>
|
||||||
|
{searchQuery && (
|
||||||
|
<button
|
||||||
|
type="button"
|
||||||
|
className="absolute right-2 top-1/2 -translate-y-1/2 text-muted-foreground hover:text-foreground transition-colors cursor-pointer"
|
||||||
|
onClick={() => onSearchChange("")}
|
||||||
|
>
|
||||||
|
<XCircle className="h-4 w-4" />
|
||||||
|
</button>
|
||||||
|
)}
|
||||||
</div>
|
</div>
|
||||||
<Select value={sortBy} onValueChange={onSortChange}>
|
<Select value={sortBy} onValueChange={onSortChange}>
|
||||||
<SelectTrigger className="w-[200px] gap-1.5">
|
<SelectTrigger className="w-[200px] gap-1.5">
|
||||||
|
|||||||
@@ -8,62 +8,86 @@ import {
|
|||||||
TooltipContent,
|
TooltipContent,
|
||||||
TooltipTrigger,
|
TooltipTrigger,
|
||||||
} from "@/components/ui/tooltip";
|
} from "@/components/ui/tooltip";
|
||||||
|
import { FetchHistory } from "@/components/FetchHistory";
|
||||||
|
import type { HistoryItem } from "@/components/FetchHistory";
|
||||||
|
|
||||||
interface SearchBarProps {
|
interface SearchBarProps {
|
||||||
url: string;
|
url: string;
|
||||||
loading: boolean;
|
loading: boolean;
|
||||||
onUrlChange: (url: string) => void;
|
onUrlChange: (url: string) => void;
|
||||||
onFetch: () => void;
|
onFetch: () => void;
|
||||||
|
history: HistoryItem[];
|
||||||
|
onHistorySelect: (item: HistoryItem) => void;
|
||||||
|
onHistoryRemove: (id: string) => void;
|
||||||
|
hasResult: boolean;
|
||||||
}
|
}
|
||||||
|
|
||||||
export function SearchBar({ url, loading, onUrlChange, onFetch }: SearchBarProps) {
|
export function SearchBar({
|
||||||
|
url,
|
||||||
|
loading,
|
||||||
|
onUrlChange,
|
||||||
|
onFetch,
|
||||||
|
history,
|
||||||
|
onHistorySelect,
|
||||||
|
onHistoryRemove,
|
||||||
|
hasResult,
|
||||||
|
}: SearchBarProps) {
|
||||||
return (
|
return (
|
||||||
<div className="space-y-2">
|
<div className="space-y-3">
|
||||||
<div className="flex items-center gap-2">
|
<div className="space-y-2">
|
||||||
<Label htmlFor="spotify-url">Spotify URL</Label>
|
<div className="flex items-center gap-2">
|
||||||
<Tooltip>
|
<Label htmlFor="spotify-url">Spotify URL</Label>
|
||||||
<TooltipTrigger asChild>
|
<Tooltip>
|
||||||
<Info className="h-4 w-4 text-muted-foreground cursor-help" />
|
<TooltipTrigger asChild>
|
||||||
</TooltipTrigger>
|
<Info className="h-4 w-4 text-muted-foreground cursor-help" />
|
||||||
<TooltipContent side="right">
|
</TooltipTrigger>
|
||||||
<p>Supports track, album, playlist, and artist URLs</p>
|
<TooltipContent side="right">
|
||||||
</TooltipContent>
|
<p>Supports track, album, playlist, and artist URLs</p>
|
||||||
</Tooltip>
|
</TooltipContent>
|
||||||
</div>
|
</Tooltip>
|
||||||
<div className="flex gap-2">
|
</div>
|
||||||
<div className="relative flex-1">
|
<div className="flex gap-2">
|
||||||
<InputWithContext
|
<div className="relative flex-1">
|
||||||
id="spotify-url"
|
<InputWithContext
|
||||||
placeholder="https://open.spotify.com/..."
|
id="spotify-url"
|
||||||
value={url}
|
placeholder="https://open.spotify.com/..."
|
||||||
onChange={(e) => onUrlChange(e.target.value)}
|
value={url}
|
||||||
onKeyDown={(e) => e.key === "Enter" && onFetch()}
|
onChange={(e) => onUrlChange(e.target.value)}
|
||||||
className="pr-8"
|
onKeyDown={(e) => e.key === "Enter" && onFetch()}
|
||||||
/>
|
className="pr-8"
|
||||||
{url && (
|
/>
|
||||||
<button
|
{url && (
|
||||||
type="button"
|
<button
|
||||||
className="absolute right-2 top-1/2 -translate-y-1/2 text-muted-foreground hover:text-foreground transition-colors"
|
type="button"
|
||||||
onClick={() => onUrlChange("")}
|
className="absolute right-2 top-1/2 -translate-y-1/2 text-muted-foreground hover:text-foreground transition-colors cursor-pointer"
|
||||||
>
|
onClick={() => onUrlChange("")}
|
||||||
<XCircle className="h-4 w-4" />
|
>
|
||||||
</button>
|
<XCircle className="h-4 w-4" />
|
||||||
)}
|
</button>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
<Button onClick={onFetch} disabled={loading}>
|
||||||
|
{loading ? (
|
||||||
|
<>
|
||||||
|
<Spinner />
|
||||||
|
Fetching...
|
||||||
|
</>
|
||||||
|
) : (
|
||||||
|
<>
|
||||||
|
<Search className="h-4 w-4" />
|
||||||
|
Fetch
|
||||||
|
</>
|
||||||
|
)}
|
||||||
|
</Button>
|
||||||
</div>
|
</div>
|
||||||
<Button onClick={onFetch} disabled={loading}>
|
|
||||||
{loading ? (
|
|
||||||
<>
|
|
||||||
<Spinner />
|
|
||||||
Fetching...
|
|
||||||
</>
|
|
||||||
) : (
|
|
||||||
<>
|
|
||||||
<Search className="h-4 w-4" />
|
|
||||||
Fetch
|
|
||||||
</>
|
|
||||||
)}
|
|
||||||
</Button>
|
|
||||||
</div>
|
</div>
|
||||||
|
{!hasResult && (
|
||||||
|
<FetchHistory
|
||||||
|
history={history}
|
||||||
|
onSelect={onHistorySelect}
|
||||||
|
onRemove={onHistoryRemove}
|
||||||
|
/>
|
||||||
|
)}
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -6,7 +6,6 @@ import {
|
|||||||
Dialog,
|
Dialog,
|
||||||
DialogContent,
|
DialogContent,
|
||||||
DialogFooter,
|
DialogFooter,
|
||||||
DialogHeader,
|
|
||||||
DialogTitle,
|
DialogTitle,
|
||||||
DialogTrigger,
|
DialogTrigger,
|
||||||
} from "@/components/ui/dialog";
|
} from "@/components/ui/dialog";
|
||||||
@@ -20,34 +19,35 @@ import {
|
|||||||
import { Checkbox } from "@/components/ui/checkbox";
|
import { Checkbox } from "@/components/ui/checkbox";
|
||||||
import { RadioGroup, RadioGroupItem } from "@/components/ui/radio-group";
|
import { RadioGroup, RadioGroupItem } from "@/components/ui/radio-group";
|
||||||
import { Tooltip, TooltipContent, TooltipTrigger } from "@/components/ui/tooltip";
|
import { Tooltip, TooltipContent, TooltipTrigger } from "@/components/ui/tooltip";
|
||||||
import { Settings as SettingsIcon, FolderOpen, Save, RotateCcw, Info } from "lucide-react";
|
import { Settings as SettingsIcon, FolderOpen, Save, RotateCcw, Info, X, Volume2 } from "lucide-react";
|
||||||
|
import { Switch } from "@/components/ui/switch";
|
||||||
import { getSettings, getSettingsWithDefaults, saveSettings, resetToDefaultSettings, applyThemeMode, type Settings as SettingsType } from "@/lib/settings";
|
import { getSettings, getSettingsWithDefaults, saveSettings, resetToDefaultSettings, applyThemeMode, type Settings as SettingsType } from "@/lib/settings";
|
||||||
import { themes, applyTheme } from "@/lib/themes";
|
import { themes, applyTheme } from "@/lib/themes";
|
||||||
import { SelectFolder } from "../../wailsjs/go/main/App";
|
import { SelectFolder } from "../../wailsjs/go/main/App";
|
||||||
|
|
||||||
// Service Icons
|
// Service Icons
|
||||||
const TidalIcon = () => (
|
const TidalIcon = () => (
|
||||||
<svg viewBox="0 0 24 24" fill="currentColor" className="inline-block w-[1.1em] h-[1.1em] mr-2">
|
<svg viewBox="0 0 24 24" className="inline-block w-[1.1em] h-[1.1em] mr-2 fill-muted-foreground">
|
||||||
<path d="M4.022 4.5 0 8.516l3.997 3.99 3.997-3.984L4.022 4.5Zm7.956 0L7.994 8.522l4.003 3.984L16 8.484 11.978 4.5Zm8.007 0L24 8.528l-4.003 3.978L16 8.484 19.985 4.5Z"></path>
|
<path d="M4.022 4.5 0 8.516l3.997 3.99 3.997-3.984L4.022 4.5Zm7.956 0L7.994 8.522l4.003 3.984L16 8.484 11.978 4.5Zm8.007 0L24 8.528l-4.003 3.978L16 8.484 19.985 4.5Z"></path>
|
||||||
<path d="m8.012 16.534 3.991 3.966L16 16.49l-4.003-3.984-3.985 4.028Z"></path>
|
<path d="m8.012 16.534 3.991 3.966L16 16.49l-4.003-3.984-3.985 4.028Z"></path>
|
||||||
</svg>
|
</svg>
|
||||||
);
|
);
|
||||||
|
|
||||||
const DeezerIcon = () => (
|
const DeezerIcon = () => (
|
||||||
<svg viewBox="0 0 24 24" fill="currentColor" className="inline-block w-[1.1em] h-[1.1em] mr-2">
|
<svg viewBox="0 0 24 24" className="inline-block w-[1.1em] h-[1.1em] mr-2 fill-muted-foreground">
|
||||||
<path d="M18.77 5.55c.19-1.07.46-1.75.76-1.75.56 0 1.02 2.34 1.02 5.23 0 2.89-.46 5.23-1.02 5.23-.23 0-.44-.4-.61-1.06-.27 2.43-.83 4.11-1.48 4.11-.5 0-.96-1-1.26-2.6-.2 3.03-.73 5.17-1.33 5.17-.39 0-.73-.85-.99-2.23-.31 2.85-1.03 4.85-1.86 4.85-.83 0-1.55-2-1.86-4.85-.25 1.38-.6 2.23-.99 2.23-.6 0-1.12-2.14-1.33-5.16-.3 1.58-.75 2.6-1.26 2.6-.65 0-1.2-1.68-1.48-4.12-.17.66-.38 1.06-.61 1.06-.56 0-1.02-2.34-1.02-5.23 0-2.89.46-5.23 1.02-5.23.3 0 .57.68.76 1.75C5.53 3.7 6 2.5 6.56 2.5c.66 0 1.22 1.7 1.49 4.17.26-1.8.66-2.94 1.1-2.94.63 0 1.16 2.25 1.36 5.4.36-1.62.9-2.63 1.5-2.63.58 0 1.12 1.01 1.49 2.62.2-3.14.72-5.4 1.35-5.4.44 0 .84 1.15 1.1 2.95.27-2.47.84-4.17 1.49-4.17.55 0 1.03 1.2 1.33 3.05ZM2 8.52c0-1.3.26-2.34.58-2.34.32 0 .57 1.05.57 2.34 0 1.29-.25 2.34-.57 2.34-.32 0-.58-1.05-.58-2.34Zm18.85 0c0-1.3.25-2.34.57-2.34.32 0 .58 1.05.58 2.34 0 1.29-.26 2.34-.58 2.34-.32 0-.57-1.05-.57-2.34Z"></path>
|
<path d="M18.77 5.55c.19-1.07.46-1.75.76-1.75.56 0 1.02 2.34 1.02 5.23 0 2.89-.46 5.23-1.02 5.23-.23 0-.44-.4-.61-1.06-.27 2.43-.83 4.11-1.48 4.11-.5 0-.96-1-1.26-2.6-.2 3.03-.73 5.17-1.33 5.17-.39 0-.73-.85-.99-2.23-.31 2.85-1.03 4.85-1.86 4.85-.83 0-1.55-2-1.86-4.85-.25 1.38-.6 2.23-.99 2.23-.6 0-1.12-2.14-1.33-5.16-.3 1.58-.75 2.6-1.26 2.6-.65 0-1.2-1.68-1.48-4.12-.17.66-.38 1.06-.61 1.06-.56 0-1.02-2.34-1.02-5.23 0-2.89.46-5.23 1.02-5.23.3 0 .57.68.76 1.75C5.53 3.7 6 2.5 6.56 2.5c.66 0 1.22 1.7 1.49 4.17.26-1.8.66-2.94 1.1-2.94.63 0 1.16 2.25 1.36 5.4.36-1.62.9-2.63 1.5-2.63.58 0 1.12 1.01 1.49 2.62.2-3.14.72-5.4 1.35-5.4.44 0 .84 1.15 1.1 2.95.27-2.47.84-4.17 1.49-4.17.55 0 1.03 1.2 1.33 3.05ZM2 8.52c0-1.3.26-2.34.58-2.34.32 0 .57 1.05.57 2.34 0 1.29-.25 2.34-.57 2.34-.32 0-.58-1.05-.58-2.34Zm18.85 0c0-1.3.25-2.34.57-2.34.32 0 .58 1.05.58 2.34 0 1.29-.26 2.34-.58 2.34-.32 0-.57-1.05-.57-2.34Z"></path>
|
||||||
</svg>
|
</svg>
|
||||||
);
|
);
|
||||||
|
|
||||||
const QobuzIcon = () => (
|
const QobuzIcon = () => (
|
||||||
<svg viewBox="0 0 24 24" fill="currentColor" className="inline-block w-[1.1em] h-[1.1em] mr-2">
|
<svg viewBox="0 0 24 24" className="inline-block w-[1.1em] h-[1.1em] mr-2 fill-muted-foreground">
|
||||||
<path d="M21.744 9.815C19.836 1.261 8.393-1 3.55 6.64-.618 13.214 4 22 11.988 22c2.387 0 4.63-.83 6.394-2.304l2.252 2.252 1.224-1.224-2.252-2.253c1.983-2.407 2.823-5.586 2.138-8.656Zm-3.508 7.297L16.4 15.275c-.786-.787-2.017.432-1.224 1.225L17 18.326C10.29 23.656.5 16 5.16 7.667c3.502-6.264 13.172-4.348 14.707 2.574.529 2.385-.06 4.987-1.63 6.87Z"></path>
|
<path d="M21.744 9.815C19.836 1.261 8.393-1 3.55 6.64-.618 13.214 4 22 11.988 22c2.387 0 4.63-.83 6.394-2.304l2.252 2.252 1.224-1.224-2.252-2.253c1.983-2.407 2.823-5.586 2.138-8.656Zm-3.508 7.297L16.4 15.275c-.786-.787-2.017.432-1.224 1.225L17 18.326C10.29 23.656.5 16 5.16 7.667c3.502-6.264 13.172-4.348 14.707 2.574.529 2.385-.06 4.987-1.63 6.87Z"></path>
|
||||||
<path d="M13.4 8.684a3.59 3.59 0 0 0-4.712 1.9 3.59 3.59 0 0 0 1.9 4.712 3.594 3.594 0 0 0 4.711-1.89 3.598 3.598 0 0 0-1.9-4.722Zm-.737 3.591a.727.727 0 0 1-.965.384.727.727 0 0 1-.384-.965.727.727 0 0 1 .965-.384.73.73 0 0 1 .384.965Z"></path>
|
<path d="M13.4 8.684a3.59 3.59 0 0 0-4.712 1.9 3.59 3.59 0 0 0 1.9 4.712 3.594 3.594 0 0 0 4.711-1.89 3.598 3.598 0 0 0-1.9-4.722Zm-.737 3.591a.727.727 0 0 1-.965.384.727.727 0 0 1-.384-.965.727.727 0 0 1 .965-.384.73.73 0 0 1 .384.965Z"></path>
|
||||||
</svg>
|
</svg>
|
||||||
);
|
);
|
||||||
|
|
||||||
const AmazonIcon = () => (
|
const AmazonIcon = () => (
|
||||||
<svg viewBox="0 0 24 24" fill="currentColor" style={{ display: "block", width: "1.1em", height: "1.1em" }} className="inline-block mr-2">
|
<svg viewBox="0 0 24 24" className="inline-block w-[1.1em] h-[1.1em] mr-2 fill-muted-foreground">
|
||||||
<path fillRule="evenodd" d="M15.62 11.13c-.15.1-.37.18-.64.18-.42 0-.82-.05-1.21-.18l-.22-.04c-.08 0-.1.04-.1.14v.25c0 .08.02.12.05.17.02.03.07.08.15.1.4.18.84.25 1.33.25.52 0 .91-.12 1.24-.37.32-.25.47-.57.47-.99 0-.3-.08-.52-.23-.72-.15-.17-.4-.34-.74-.47l-.7-.27c-.26-.1-.46-.2-.53-.3a.47.47 0 0 1-.15-.36c0-.38.27-.57.84-.57.32 0 .64.05.94.15l.2.04c.07 0 .12-.04.12-.14v-.25c0-.08-.03-.12-.05-.17-.03-.05-.08-.08-.15-.1-.37-.13-.74-.2-1.11-.2-.47 0-.87.12-1.16.35-.3.22-.45.54-.45.91 0 .57.32.99.97 1.24l.74.27c.24.1.4.17.5.27.09.1.12.2.12.35 0 .2-.08.37-.23.46Zm-3.88-3.55v3.28c-.42.28-.84.42-1.26.42-.27 0-.47-.07-.6-.22-.11-.15-.16-.37-.16-.7V7.59c0-.13-.05-.18-.18-.18h-.52c-.12 0-.17.05-.17.18v3.06c0 .42.1.77.32.99.22.22.55.35.97.35.56 0 1.13-.2 1.68-.6l.05.3c0 .07.02.1.07.12.02.03.07.03.15.03h.37c.12 0 .17-.05.17-.18V7.58c0-.13-.05-.18-.17-.18h-.52c-.15 0-.2.08-.2.18Zm-4.69 4.27h.52c.12 0 .17-.05.17-.17v-3.1c0-.41-.1-.73-.32-.95a1.25 1.25 0 0 0-.94-.35c-.57 0-1.16.2-1.73.62-.2-.42-.57-.62-1.11-.62-.55 0-1.1.2-1.64.57l-.04-.27c0-.08-.03-.1-.08-.13-.02-.02-.07-.02-.12-.02h-.4c-.12 0-.17.05-.17.17v4.1c0 .13.05.18.17.18h.52c.12 0 .17-.05.17-.18V8.37c.42-.25.84-.4 1.29-.4.25 0 .42.08.52.22.1.15.17.35.17.65v2.84c0 .12.05.17.17.17h.52c.13 0 .18-.05.18-.17V8.37c.44-.27.86-.4 1.28-.4.25 0 .42.08.52.22.1.15.17.35.17.65v2.84c0 .12.05.17.18.17Zm13.47 3.29a21.8 21.8 0 0 1-8.3 1.7c-3.96 0-7.8-1.08-10.88-2.89a.35.35 0 0 0-.15-.05c-.17 0-.27.2-.1.37a16.11 16.11 0 0 0 10.87 4.16c3.02 0 6.5-.94 8.9-2.72.42-.3.08-.74-.34-.57Zm-.08-6.74c.22-.26.57-.38 1.06-.38.25 0 .5.03.72.1l.15.02c.07 0 .12-.04.12-.17v-.25c0-.07-.02-.14-.05-.17a.54.54 0 0 0-.12-.1c-.32-.07-.64-.15-.94-.15-.7 0-1.21.2-1.6.62-.38.4-.57 1-.57 1.73 0 .74.17 1.31.54 1.7.37.4.89.6 1.58.6.37 0 .72-.05.99-.17.07-.03.12-.05.15-.1.02-.03.02-.1.02-.17v-.25c0-.13-.05-.17-.12-.17-.03 0-.07 0-.12.02-.28.07-.55.12-.8.12-.46 0-.81-.12-1.03-.37-.23-.24-.32-.64-.32-1.16v-.12c.02-.55.12-.94.34-1.19Z" clipRule="evenodd"></path>
|
<path fillRule="evenodd" d="M15.62 11.13c-.15.1-.37.18-.64.18-.42 0-.82-.05-1.21-.18l-.22-.04c-.08 0-.1.04-.1.14v.25c0 .08.02.12.05.17.02.03.07.08.15.1.4.18.84.25 1.33.25.52 0 .91-.12 1.24-.37.32-.25.47-.57.47-.99 0-.3-.08-.52-.23-.72-.15-.17-.4-.34-.74-.47l-.7-.27c-.26-.1-.46-.2-.53-.3a.47.47 0 0 1-.15-.36c0-.38.27-.57.84-.57.32 0 .64.05.94.15l.2.04c.07 0 .12-.04.12-.14v-.25c0-.08-.03-.12-.05-.17-.03-.05-.08-.08-.15-.1-.37-.13-.74-.2-1.11-.2-.47 0-.87.12-1.16.35-.3.22-.45.54-.45.91 0 .57.32.99.97 1.24l.74.27c.24.1.4.17.5.27.09.1.12.2.12.35 0 .2-.08.37-.23.46Zm-3.88-3.55v3.28c-.42.28-.84.42-1.26.42-.27 0-.47-.07-.6-.22-.11-.15-.16-.37-.16-.7V7.59c0-.13-.05-.18-.18-.18h-.52c-.12 0-.17.05-.17.18v3.06c0 .42.1.77.32.99.22.22.55.35.97.35.56 0 1.13-.2 1.68-.6l.05.3c0 .07.02.1.07.12.02.03.07.03.15.03h.37c.12 0 .17-.05.17-.18V7.58c0-.13-.05-.18-.17-.18h-.52c-.15 0-.2.08-.2.18Zm-4.69 4.27h.52c.12 0 .17-.05.17-.17v-3.1c0-.41-.1-.73-.32-.95a1.25 1.25 0 0 0-.94-.35c-.57 0-1.16.2-1.73.62-.2-.42-.57-.62-1.11-.62-.55 0-1.1.2-1.64.57l-.04-.27c0-.08-.03-.1-.08-.13-.02-.02-.07-.02-.12-.02h-.4c-.12 0-.17.05-.17.17v4.1c0 .13.05.18.17.18h.52c.12 0 .17-.05.17-.18V8.37c.42-.25.84-.4 1.29-.4.25 0 .42.08.52.22.1.15.17.35.17.65v2.84c0 .12.05.17.17.17h.52c.13 0 .18-.05.18-.17V8.37c.44-.27.86-.4 1.28-.4.25 0 .42.08.52.22.1.15.17.35.17.65v2.84c0 .12.05.17.18.17Zm13.47 3.29a21.8 21.8 0 0 1-8.3 1.7c-3.96 0-7.8-1.08-10.88-2.89a.35.35 0 0 0-.15-.05c-.17 0-.27.2-.1.37a16.11 16.11 0 0 0 10.87 4.16c3.02 0 6.5-.94 8.9-2.72.42-.3.08-.74-.34-.57Zm-.08-6.74c.22-.26.57-.38 1.06-.38.25 0 .5.03.72.1l.15.02c.07 0 .12-.04.12-.17v-.25c0-.07-.02-.14-.05-.17a.54.54 0 0 0-.12-.1c-.32-.07-.64-.15-.94-.15-.7 0-1.21.2-1.6.62-.38.4-.57 1-.57 1.73 0 .74.17 1.31.54 1.7.37.4.89.6 1.58.6.37 0 .72-.05.99-.17.07-.03.12-.05.15-.1.02-.03.02-.1.02-.17v-.25c0-.13-.05-.17-.12-.17-.03 0-.07 0-.12.02-.28.07-.55.12-.8.12-.46 0-.81-.12-1.03-.37-.23-.24-.32-.64-.32-1.16v-.12c.02-.55.12-.94.34-1.19Z" clipRule="evenodd"></path>
|
||||||
<path fillRule="evenodd" d="M21.55 17.46c1.29-1.09 1.64-3.33 1.36-3.68-.12-.15-.71-.3-1.45-.3-.8 0-1.73.18-2.45.67-.22.15-.17.35.05.32.76-.1 2.5-.3 2.82.1.3.4-.35 2.03-.65 2.74-.07.23.1.3.32.15ZM18.12 7.4h-.52c-.12 0-.17.05-.17.18v4.1c0 .12.05.17.17.17h.52c.12 0 .17-.05.17-.17v-4.1c0-.1-.05-.18-.17-.18Zm.15-1.68a.58.58 0 0 0-.42-.15c-.18 0-.3.05-.4.15a.5.5 0 0 0-.15.37c0 .15.05.3.15.37.1.1.22.15.4.15.17 0 .3-.05.4-.15a.5.5 0 0 0 .14-.37c0-.15-.02-.3-.12-.37Z" clipRule="evenodd"></path>
|
<path fillRule="evenodd" d="M21.55 17.46c1.29-1.09 1.64-3.33 1.36-3.68-.12-.15-.71-.3-1.45-.3-.8 0-1.73.18-2.45.67-.22.15-.17.35.05.32.76-.1 2.5-.3 2.82.1.3.4-.35 2.03-.65 2.74-.07.23.1.3.32.15ZM18.12 7.4h-.52c-.12 0-.17.05-.17.18v4.1c0 .12.05.17.17.17h.52c.12 0 .17-.05.17-.17v-4.1c0-.1-.05-.18-.17-.18Zm.15-1.68a.58.58 0 0 0-.42-.15c-.18 0-.3.05-.4.15a.5.5 0 0 0-.15.37c0 .15.05.3.15.37.1.1.22.15.4.15.17 0 .3-.05.4-.15a.5.5 0 0 0 .14-.37c0-.15-.02-.3-.12-.37Z" clipRule="evenodd"></path>
|
||||||
</svg>
|
</svg>
|
||||||
@@ -58,6 +58,7 @@ export function Settings() {
|
|||||||
const [savedSettings, setSavedSettings] = useState<SettingsType>(getSettings());
|
const [savedSettings, setSavedSettings] = useState<SettingsType>(getSettings());
|
||||||
const [tempSettings, setTempSettings] = useState<SettingsType>(savedSettings);
|
const [tempSettings, setTempSettings] = useState<SettingsType>(savedSettings);
|
||||||
const [, setIsLoadingDefaults] = useState(false);
|
const [, setIsLoadingDefaults] = useState(false);
|
||||||
|
const [isDark, setIsDark] = useState(document.documentElement.classList.contains('dark'));
|
||||||
|
|
||||||
// Apply saved settings
|
// Apply saved settings
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
@@ -85,6 +86,11 @@ export function Settings() {
|
|||||||
if (open) {
|
if (open) {
|
||||||
applyThemeMode(tempSettings.themeMode);
|
applyThemeMode(tempSettings.themeMode);
|
||||||
applyTheme(tempSettings.theme);
|
applyTheme(tempSettings.theme);
|
||||||
|
|
||||||
|
// Update isDark state after theme is applied
|
||||||
|
setTimeout(() => {
|
||||||
|
setIsDark(document.documentElement.classList.contains('dark'));
|
||||||
|
}, 0);
|
||||||
|
|
||||||
// Setup listener for system theme changes during preview
|
// Setup listener for system theme changes during preview
|
||||||
const mediaQuery = window.matchMedia("(prefers-color-scheme: dark)");
|
const mediaQuery = window.matchMedia("(prefers-color-scheme: dark)");
|
||||||
@@ -92,6 +98,9 @@ export function Settings() {
|
|||||||
if (tempSettings.themeMode === "auto") {
|
if (tempSettings.themeMode === "auto") {
|
||||||
applyThemeMode("auto");
|
applyThemeMode("auto");
|
||||||
applyTheme(tempSettings.theme);
|
applyTheme(tempSettings.theme);
|
||||||
|
setTimeout(() => {
|
||||||
|
setIsDark(document.documentElement.classList.contains('dark'));
|
||||||
|
}, 0);
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -199,11 +208,19 @@ export function Settings() {
|
|||||||
<SettingsIcon className="h-5 w-5" />
|
<SettingsIcon className="h-5 w-5" />
|
||||||
</Button>
|
</Button>
|
||||||
</DialogTrigger>
|
</DialogTrigger>
|
||||||
<DialogContent className="sm:max-w-[700px] flex flex-col" aria-describedby={undefined}>
|
<DialogContent className="sm:max-w-[600px] flex flex-col p-6 [&>button]:hidden" aria-describedby={undefined}>
|
||||||
<DialogHeader>
|
<div className="absolute right-4 top-4">
|
||||||
<DialogTitle>Settings</DialogTitle>
|
<Button
|
||||||
</DialogHeader>
|
variant="ghost"
|
||||||
<div className="grid grid-cols-2 gap-6 py-2">
|
size="icon"
|
||||||
|
className="h-6 w-6 opacity-70 hover:opacity-100"
|
||||||
|
onClick={handleCancel}
|
||||||
|
>
|
||||||
|
<X className="h-4 w-4" />
|
||||||
|
</Button>
|
||||||
|
</div>
|
||||||
|
<DialogTitle className="text-sm font-medium">Settings</DialogTitle>
|
||||||
|
<div className="grid grid-cols-[1.2fr_0.8fr] gap-6 py-2">
|
||||||
{/* Left Column */}
|
{/* Left Column */}
|
||||||
<div className="space-y-4">
|
<div className="space-y-4">
|
||||||
{/* Download Path */}
|
{/* Download Path */}
|
||||||
@@ -265,7 +282,7 @@ export function Settings() {
|
|||||||
|
|
||||||
{/* Theme Mode Selection */}
|
{/* Theme Mode Selection */}
|
||||||
<div className="space-y-2">
|
<div className="space-y-2">
|
||||||
<Label htmlFor="theme-mode">Theme</Label>
|
<Label htmlFor="theme-mode">Mode</Label>
|
||||||
<Select value={tempSettings.themeMode} onValueChange={handleThemeModeChange}>
|
<Select value={tempSettings.themeMode} onValueChange={handleThemeModeChange}>
|
||||||
<SelectTrigger id="theme-mode">
|
<SelectTrigger id="theme-mode">
|
||||||
<SelectValue placeholder="Select theme mode" />
|
<SelectValue placeholder="Select theme mode" />
|
||||||
@@ -278,9 +295,9 @@ export function Settings() {
|
|||||||
</Select>
|
</Select>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
{/* Theme Color Selection */}
|
{/* Accent Selection */}
|
||||||
<div className="space-y-2">
|
<div className="space-y-2">
|
||||||
<Label htmlFor="theme">Theme Color</Label>
|
<Label htmlFor="theme">Accent</Label>
|
||||||
<Select value={tempSettings.theme} onValueChange={handleThemeChange}>
|
<Select value={tempSettings.theme} onValueChange={handleThemeChange}>
|
||||||
<SelectTrigger id="theme">
|
<SelectTrigger id="theme">
|
||||||
<SelectValue placeholder="Select a theme" />
|
<SelectValue placeholder="Select a theme" />
|
||||||
@@ -290,8 +307,12 @@ export function Settings() {
|
|||||||
<SelectItem key={theme.name} value={theme.name}>
|
<SelectItem key={theme.name} value={theme.name}>
|
||||||
<span className="flex items-center gap-2">
|
<span className="flex items-center gap-2">
|
||||||
<span
|
<span
|
||||||
className="w-3 h-3 rounded-full"
|
className="w-3 h-3 rounded-full border border-border"
|
||||||
style={{ backgroundColor: theme.cssVars.light.primary }}
|
style={{
|
||||||
|
backgroundColor: isDark
|
||||||
|
? theme.cssVars.dark.primary
|
||||||
|
: theme.cssVars.light.primary
|
||||||
|
}}
|
||||||
/>
|
/>
|
||||||
{theme.label}
|
{theme.label}
|
||||||
</span>
|
</span>
|
||||||
@@ -353,7 +374,15 @@ export function Settings() {
|
|||||||
checked={tempSettings.artistSubfolder}
|
checked={tempSettings.artistSubfolder}
|
||||||
onCheckedChange={(checked) => setTempSettings(prev => ({ ...prev, artistSubfolder: checked as boolean }))}
|
onCheckedChange={(checked) => setTempSettings(prev => ({ ...prev, artistSubfolder: checked as boolean }))}
|
||||||
/>
|
/>
|
||||||
<Label htmlFor="artist-subfolder" className="cursor-pointer text-sm">Artist Subfolder <span className="font-normal">(Playlist only)</span></Label>
|
<Label htmlFor="artist-subfolder" className="cursor-pointer text-sm">Artist Subfolder</Label>
|
||||||
|
<Tooltip>
|
||||||
|
<TooltipTrigger asChild>
|
||||||
|
<Info className="h-3.5 w-3.5 text-muted-foreground cursor-help" />
|
||||||
|
</TooltipTrigger>
|
||||||
|
<TooltipContent side="top" className="max-w-xs">
|
||||||
|
<p className="text-xs text-center">Playlist only</p>
|
||||||
|
</TooltipContent>
|
||||||
|
</Tooltip>
|
||||||
</div>
|
</div>
|
||||||
<div className="flex items-center gap-2">
|
<div className="flex items-center gap-2">
|
||||||
<Checkbox
|
<Checkbox
|
||||||
@@ -361,22 +390,45 @@ export function Settings() {
|
|||||||
checked={tempSettings.albumSubfolder}
|
checked={tempSettings.albumSubfolder}
|
||||||
onCheckedChange={(checked) => setTempSettings(prev => ({ ...prev, albumSubfolder: checked as boolean }))}
|
onCheckedChange={(checked) => setTempSettings(prev => ({ ...prev, albumSubfolder: checked as boolean }))}
|
||||||
/>
|
/>
|
||||||
<Label htmlFor="album-subfolder" className="cursor-pointer text-sm">Album Subfolder <span className="font-normal">(Playlist & Discography)</span></Label>
|
<Label htmlFor="album-subfolder" className="cursor-pointer text-sm">Album Subfolder</Label>
|
||||||
|
<Tooltip>
|
||||||
|
<TooltipTrigger asChild>
|
||||||
|
<Info className="h-3.5 w-3.5 text-muted-foreground cursor-help" />
|
||||||
|
</TooltipTrigger>
|
||||||
|
<TooltipContent side="top" className="max-w-xs">
|
||||||
|
<p className="text-xs text-center">Playlist & Discography</p>
|
||||||
|
</TooltipContent>
|
||||||
|
</Tooltip>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
<div className="border-t" />
|
||||||
|
|
||||||
|
{/* Sound Effects */}
|
||||||
|
<div className="flex items-center justify-between">
|
||||||
|
<div className="flex items-center gap-2">
|
||||||
|
<Volume2 className="h-4 w-4 text-muted-foreground" />
|
||||||
|
<Label htmlFor="sfx-enabled" className="cursor-pointer text-sm">Sound Effects</Label>
|
||||||
|
</div>
|
||||||
|
<Switch
|
||||||
|
id="sfx-enabled"
|
||||||
|
checked={tempSettings.sfxEnabled}
|
||||||
|
onCheckedChange={(checked) => setTempSettings(prev => ({ ...prev, sfxEnabled: checked }))}
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<DialogFooter className="gap-2 sm:justify-between">
|
<DialogFooter className="gap-2 sm:justify-between">
|
||||||
<Button variant="outline" onClick={handleReset} size="sm" className="gap-1.5">
|
<Button variant="outline" onClick={handleReset} className="gap-1.5">
|
||||||
<RotateCcw className="h-3.5 w-3.5" />
|
<RotateCcw className="h-4 w-4" />
|
||||||
Reset to Default
|
Reset to Default
|
||||||
</Button>
|
</Button>
|
||||||
<div className="flex gap-2">
|
<div className="flex gap-2">
|
||||||
<Button variant="outline" onClick={handleCancel} size="sm">
|
<Button variant="outline" onClick={handleCancel}>
|
||||||
Cancel
|
Cancel
|
||||||
</Button>
|
</Button>
|
||||||
<Button onClick={handleSave} size="sm" className="gap-1.5">
|
<Button onClick={handleSave} className="gap-1.5">
|
||||||
<Save className="h-3.5 w-3.5" />
|
<Save className="h-4 w-4" />
|
||||||
Save Changes
|
Save Changes
|
||||||
</Button>
|
</Button>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -0,0 +1,345 @@
|
|||||||
|
import { useState, useEffect } from "react";
|
||||||
|
import { Button } from "@/components/ui/button";
|
||||||
|
import { InputWithContext } from "@/components/ui/input-with-context";
|
||||||
|
import { Label } from "@/components/ui/label";
|
||||||
|
import {
|
||||||
|
Select,
|
||||||
|
SelectContent,
|
||||||
|
SelectItem,
|
||||||
|
SelectTrigger,
|
||||||
|
SelectValue,
|
||||||
|
} from "@/components/ui/select";
|
||||||
|
import { Checkbox } from "@/components/ui/checkbox";
|
||||||
|
import { RadioGroup, RadioGroupItem } from "@/components/ui/radio-group";
|
||||||
|
import { Tooltip, TooltipContent, TooltipTrigger } from "@/components/ui/tooltip";
|
||||||
|
import { FolderOpen, Save, RotateCcw, Info, Volume2 } from "lucide-react";
|
||||||
|
import { Switch } from "@/components/ui/switch";
|
||||||
|
import { getSettings, getSettingsWithDefaults, saveSettings, resetToDefaultSettings, applyThemeMode, applyFont, FONT_OPTIONS, type Settings as SettingsType, type FontFamily } from "@/lib/settings";
|
||||||
|
import { themes, applyTheme } from "@/lib/themes";
|
||||||
|
import { SelectFolder } from "../../wailsjs/go/main/App";
|
||||||
|
import { toastWithSound as toast } from "@/lib/toast-with-sound";
|
||||||
|
|
||||||
|
// Service Icons
|
||||||
|
const TidalIcon = () => (
|
||||||
|
<svg viewBox="0 0 24 24" className="inline-block w-[1.1em] h-[1.1em] mr-2 fill-muted-foreground">
|
||||||
|
<path d="M4.022 4.5 0 8.516l3.997 3.99 3.997-3.984L4.022 4.5Zm7.956 0L7.994 8.522l4.003 3.984L16 8.484 11.978 4.5Zm8.007 0L24 8.528l-4.003 3.978L16 8.484 19.985 4.5Z"></path>
|
||||||
|
<path d="m8.012 16.534 3.991 3.966L16 16.49l-4.003-3.984-3.985 4.028Z"></path>
|
||||||
|
</svg>
|
||||||
|
);
|
||||||
|
|
||||||
|
const DeezerIcon = () => (
|
||||||
|
<svg viewBox="0 0 24 24" className="inline-block w-[1.1em] h-[1.1em] mr-2 fill-muted-foreground">
|
||||||
|
<path d="M18.77 5.55c.19-1.07.46-1.75.76-1.75.56 0 1.02 2.34 1.02 5.23 0 2.89-.46 5.23-1.02 5.23-.23 0-.44-.4-.61-1.06-.27 2.43-.83 4.11-1.48 4.11-.5 0-.96-1-1.26-2.6-.2 3.03-.73 5.17-1.33 5.17-.39 0-.73-.85-.99-2.23-.31 2.85-1.03 4.85-1.86 4.85-.83 0-1.55-2-1.86-4.85-.25 1.38-.6 2.23-.99 2.23-.6 0-1.12-2.14-1.33-5.16-.3 1.58-.75 2.6-1.26 2.6-.65 0-1.2-1.68-1.48-4.12-.17.66-.38 1.06-.61 1.06-.56 0-1.02-2.34-1.02-5.23 0-2.89.46-5.23 1.02-5.23.3 0 .57.68.76 1.75C5.53 3.7 6 2.5 6.56 2.5c.66 0 1.22 1.7 1.49 4.17.26-1.8.66-2.94 1.1-2.94.63 0 1.16 2.25 1.36 5.4.36-1.62.9-2.63 1.5-2.63.58 0 1.12 1.01 1.49 2.62.2-3.14.72-5.4 1.35-5.4.44 0 .84 1.15 1.1 2.95.27-2.47.84-4.17 1.49-4.17.55 0 1.03 1.2 1.33 3.05ZM2 8.52c0-1.3.26-2.34.58-2.34.32 0 .57 1.05.57 2.34 0 1.29-.25 2.34-.57 2.34-.32 0-.58-1.05-.58-2.34Zm18.85 0c0-1.3.25-2.34.57-2.34.32 0 .58 1.05.58 2.34 0 1.29-.26 2.34-.58 2.34-.32 0-.57-1.05-.57-2.34Z"></path>
|
||||||
|
</svg>
|
||||||
|
);
|
||||||
|
|
||||||
|
const QobuzIcon = () => (
|
||||||
|
<svg viewBox="0 0 24 24" className="inline-block w-[1.1em] h-[1.1em] mr-2 fill-muted-foreground">
|
||||||
|
<path d="M21.744 9.815C19.836 1.261 8.393-1 3.55 6.64-.618 13.214 4 22 11.988 22c2.387 0 4.63-.83 6.394-2.304l2.252 2.252 1.224-1.224-2.252-2.253c1.983-2.407 2.823-5.586 2.138-8.656Zm-3.508 7.297L16.4 15.275c-.786-.787-2.017.432-1.224 1.225L17 18.326C10.29 23.656.5 16 5.16 7.667c3.502-6.264 13.172-4.348 14.707 2.574.529 2.385-.06 4.987-1.63 6.87Z"></path>
|
||||||
|
<path d="M13.4 8.684a3.59 3.59 0 0 0-4.712 1.9 3.59 3.59 0 0 0 1.9 4.712 3.594 3.594 0 0 0 4.711-1.89 3.598 3.598 0 0 0-1.9-4.722Zm-.737 3.591a.727.727 0 0 1-.965.384.727.727 0 0 1-.384-.965.727.727 0 0 1 .965-.384.73.73 0 0 1 .384.965Z"></path>
|
||||||
|
</svg>
|
||||||
|
);
|
||||||
|
|
||||||
|
const AmazonIcon = () => (
|
||||||
|
<svg viewBox="0 0 24 24" className="inline-block w-[1.1em] h-[1.1em] mr-2 fill-muted-foreground">
|
||||||
|
<path fillRule="evenodd" d="M15.62 11.13c-.15.1-.37.18-.64.18-.42 0-.82-.05-1.21-.18l-.22-.04c-.08 0-.1.04-.1.14v.25c0 .08.02.12.05.17.02.03.07.08.15.1.4.18.84.25 1.33.25.52 0 .91-.12 1.24-.37.32-.25.47-.57.47-.99 0-.3-.08-.52-.23-.72-.15-.17-.4-.34-.74-.47l-.7-.27c-.26-.1-.46-.2-.53-.3a.47.47 0 0 1-.15-.36c0-.38.27-.57.84-.57.32 0 .64.05.94.15l.2.04c.07 0 .12-.04.12-.14v-.25c0-.08-.03-.12-.05-.17-.03-.05-.08-.08-.15-.1-.37-.13-.74-.2-1.11-.2-.47 0-.87.12-1.16.35-.3.22-.45.54-.45.91 0 .57.32.99.97 1.24l.74.27c.24.1.4.17.5.27.09.1.12.2.12.35 0 .2-.08.37-.23.46Zm-3.88-3.55v3.28c-.42.28-.84.42-1.26.42-.27 0-.47-.07-.6-.22-.11-.15-.16-.37-.16-.7V7.59c0-.13-.05-.18-.18-.18h-.52c-.12 0-.17.05-.17.18v3.06c0 .42.1.77.32.99.22.22.55.35.97.35.56 0 1.13-.2 1.68-.6l.05.3c0 .07.02.1.07.12.02.03.07.03.15.03h.37c.12 0 .17-.05.17-.18V7.58c0-.13-.05-.18-.17-.18h-.52c-.15 0-.2.08-.2.18Zm-4.69 4.27h.52c.12 0 .17-.05.17-.17v-3.1c0-.41-.1-.73-.32-.95a1.25 1.25 0 0 0-.94-.35c-.57 0-1.16.2-1.73.62-.2-.42-.57-.62-1.11-.62-.55 0-1.1.2-1.64.57l-.04-.27c0-.08-.03-.1-.08-.13-.02-.02-.07-.02-.12-.02h-.4c-.12 0-.17.05-.17.17v4.1c0 .13.05.18.17.18h.52c.12 0 .17-.05.17-.18V8.37c.42-.25.84-.4 1.29-.4.25 0 .42.08.52.22.1.15.17.35.17.65v2.84c0 .12.05.17.17.17h.52c.13 0 .18-.05.18-.17V8.37c.44-.27.86-.4 1.28-.4.25 0 .42.08.52.22.1.15.17.35.17.65v2.84c0 .12.05.17.18.17Zm13.47 3.29a21.8 21.8 0 0 1-8.3 1.7c-3.96 0-7.8-1.08-10.88-2.89a.35.35 0 0 0-.15-.05c-.17 0-.27.2-.1.37a16.11 16.11 0 0 0 10.87 4.16c3.02 0 6.5-.94 8.9-2.72.42-.3.08-.74-.34-.57Zm-.08-6.74c.22-.26.57-.38 1.06-.38.25 0 .5.03.72.1l.15.02c.07 0 .12-.04.12-.17v-.25c0-.07-.02-.14-.05-.17a.54.54 0 0 0-.12-.1c-.32-.07-.64-.15-.94-.15-.7 0-1.21.2-1.6.62-.38.4-.57 1-.57 1.73 0 .74.17 1.31.54 1.7.37.4.89.6 1.58.6.37 0 .72-.05.99-.17.07-.03.12-.05.15-.1.02-.03.02-.1.02-.17v-.25c0-.13-.05-.17-.12-.17-.03 0-.07 0-.12.02-.28.07-.55.12-.8.12-.46 0-.81-.12-1.03-.37-.23-.24-.32-.64-.32-1.16v-.12c.02-.55.12-.94.34-1.19Z" clipRule="evenodd"></path>
|
||||||
|
<path fillRule="evenodd" d="M21.55 17.46c1.29-1.09 1.64-3.33 1.36-3.68-.12-.15-.71-.3-1.45-.3-.8 0-1.73.18-2.45.67-.22.15-.17.35.05.32.76-.1 2.5-.3 2.82.1.3.4-.35 2.03-.65 2.74-.07.23.1.3.32.15ZM18.12 7.4h-.52c-.12 0-.17.05-.17.18v4.1c0 .12.05.17.17.17h.52c.12 0 .17-.05.17-.17v-4.1c0-.1-.05-.18-.17-.18Zm.15-1.68a.58.58 0 0 0-.42-.15c-.18 0-.3.05-.4.15a.5.5 0 0 0-.15.37c0 .15.05.3.15.37.1.1.22.15.4.15.17 0 .3-.05.4-.15a.5.5 0 0 0 .14-.37c0-.15-.02-.3-.12-.37Z" clipRule="evenodd"></path>
|
||||||
|
</svg>
|
||||||
|
);
|
||||||
|
|
||||||
|
export function SettingsPage() {
|
||||||
|
const [savedSettings, setSavedSettings] = useState<SettingsType>(getSettings());
|
||||||
|
const [tempSettings, setTempSettings] = useState<SettingsType>(savedSettings);
|
||||||
|
const [isDark, setIsDark] = useState(document.documentElement.classList.contains('dark'));
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
applyThemeMode(savedSettings.themeMode);
|
||||||
|
applyTheme(savedSettings.theme);
|
||||||
|
|
||||||
|
const mediaQuery = window.matchMedia("(prefers-color-scheme: dark)");
|
||||||
|
const handleChange = () => {
|
||||||
|
if (savedSettings.themeMode === "auto") {
|
||||||
|
applyThemeMode("auto");
|
||||||
|
applyTheme(savedSettings.theme);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
mediaQuery.addEventListener("change", handleChange);
|
||||||
|
return () => mediaQuery.removeEventListener("change", handleChange);
|
||||||
|
}, [savedSettings.themeMode, savedSettings.theme]);
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
applyThemeMode(tempSettings.themeMode);
|
||||||
|
applyTheme(tempSettings.theme);
|
||||||
|
applyFont(tempSettings.fontFamily);
|
||||||
|
setTimeout(() => {
|
||||||
|
setIsDark(document.documentElement.classList.contains('dark'));
|
||||||
|
}, 0);
|
||||||
|
}, [tempSettings.themeMode, tempSettings.theme, tempSettings.fontFamily]);
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
const loadDefaults = async () => {
|
||||||
|
if (!savedSettings.downloadPath) {
|
||||||
|
const settingsWithDefaults = await getSettingsWithDefaults();
|
||||||
|
setSavedSettings(settingsWithDefaults);
|
||||||
|
setTempSettings(settingsWithDefaults);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
loadDefaults();
|
||||||
|
}, []);
|
||||||
|
|
||||||
|
const handleSave = () => {
|
||||||
|
saveSettings(tempSettings);
|
||||||
|
setSavedSettings(tempSettings);
|
||||||
|
toast.success("Settings saved");
|
||||||
|
};
|
||||||
|
|
||||||
|
const handleReset = async () => {
|
||||||
|
const defaultSettings = await resetToDefaultSettings();
|
||||||
|
setTempSettings(defaultSettings);
|
||||||
|
setSavedSettings(defaultSettings);
|
||||||
|
applyThemeMode(defaultSettings.themeMode);
|
||||||
|
applyTheme(defaultSettings.theme);
|
||||||
|
applyFont(defaultSettings.fontFamily);
|
||||||
|
toast.success("Settings reset to default");
|
||||||
|
};
|
||||||
|
|
||||||
|
const handleBrowseFolder = async () => {
|
||||||
|
try {
|
||||||
|
const selectedPath = await SelectFolder(tempSettings.downloadPath || "");
|
||||||
|
if (selectedPath && selectedPath.trim() !== "") {
|
||||||
|
setTempSettings((prev) => ({ ...prev, downloadPath: selectedPath }));
|
||||||
|
}
|
||||||
|
} catch (error) {
|
||||||
|
console.error("Error selecting folder:", error);
|
||||||
|
toast.error(`Error selecting folder: ${error}`);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
return (
|
||||||
|
<div className="space-y-6">
|
||||||
|
<h1 className="text-2xl font-bold">Settings</h1>
|
||||||
|
|
||||||
|
<div className="grid grid-cols-1 md:grid-cols-2 gap-6">
|
||||||
|
{/* Left Column */}
|
||||||
|
<div className="space-y-4">
|
||||||
|
{/* Download Path */}
|
||||||
|
<div className="space-y-2">
|
||||||
|
<Label htmlFor="download-path">Download Path</Label>
|
||||||
|
<div className="flex gap-2">
|
||||||
|
<InputWithContext
|
||||||
|
id="download-path"
|
||||||
|
value={tempSettings.downloadPath}
|
||||||
|
onChange={(e) => setTempSettings((prev) => ({ ...prev, downloadPath: e.target.value }))}
|
||||||
|
placeholder="C:\Users\YourUsername\Music"
|
||||||
|
/>
|
||||||
|
<Button type="button" onClick={handleBrowseFolder} className="gap-1.5">
|
||||||
|
<FolderOpen className="h-4 w-4" />
|
||||||
|
Browse
|
||||||
|
</Button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{/* Source Selection */}
|
||||||
|
<div className="space-y-2">
|
||||||
|
<Label htmlFor="downloader">Source</Label>
|
||||||
|
<Select
|
||||||
|
value={tempSettings.downloader}
|
||||||
|
onValueChange={(value: "auto" | "deezer" | "tidal" | "qobuz" | "amazon") => setTempSettings((prev) => ({ ...prev, downloader: value }))}
|
||||||
|
>
|
||||||
|
<SelectTrigger id="downloader">
|
||||||
|
<SelectValue placeholder="Select a source" />
|
||||||
|
</SelectTrigger>
|
||||||
|
<SelectContent>
|
||||||
|
<SelectItem value="auto">Auto</SelectItem>
|
||||||
|
<SelectItem value="tidal">
|
||||||
|
<span className="flex items-center"><TidalIcon />Tidal</span>
|
||||||
|
</SelectItem>
|
||||||
|
<SelectItem value="deezer">
|
||||||
|
<span className="flex items-center"><DeezerIcon />Deezer</span>
|
||||||
|
</SelectItem>
|
||||||
|
<SelectItem value="qobuz">
|
||||||
|
<span className="flex items-center"><QobuzIcon />Qobuz</span>
|
||||||
|
</SelectItem>
|
||||||
|
<SelectItem value="amazon">
|
||||||
|
<span className="flex items-center"><AmazonIcon />Amazon Music</span>
|
||||||
|
</SelectItem>
|
||||||
|
</SelectContent>
|
||||||
|
</Select>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{/* Theme Mode */}
|
||||||
|
<div className="space-y-2">
|
||||||
|
<Label htmlFor="theme-mode">Mode</Label>
|
||||||
|
<Select
|
||||||
|
value={tempSettings.themeMode}
|
||||||
|
onValueChange={(value: "auto" | "light" | "dark") => setTempSettings((prev) => ({ ...prev, themeMode: value }))}
|
||||||
|
>
|
||||||
|
<SelectTrigger id="theme-mode">
|
||||||
|
<SelectValue placeholder="Select theme mode" />
|
||||||
|
</SelectTrigger>
|
||||||
|
<SelectContent>
|
||||||
|
<SelectItem value="auto">Auto</SelectItem>
|
||||||
|
<SelectItem value="light">Light</SelectItem>
|
||||||
|
<SelectItem value="dark">Dark</SelectItem>
|
||||||
|
</SelectContent>
|
||||||
|
</Select>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{/* Accent */}
|
||||||
|
<div className="space-y-2">
|
||||||
|
<Label htmlFor="theme">Accent</Label>
|
||||||
|
<Select
|
||||||
|
value={tempSettings.theme}
|
||||||
|
onValueChange={(value) => setTempSettings((prev) => ({ ...prev, theme: value }))}
|
||||||
|
>
|
||||||
|
<SelectTrigger id="theme">
|
||||||
|
<SelectValue placeholder="Select a theme" />
|
||||||
|
</SelectTrigger>
|
||||||
|
<SelectContent>
|
||||||
|
{themes.map((theme) => (
|
||||||
|
<SelectItem key={theme.name} value={theme.name}>
|
||||||
|
<span className="flex items-center gap-2">
|
||||||
|
<span
|
||||||
|
className="w-3 h-3 rounded-full border border-border"
|
||||||
|
style={{
|
||||||
|
backgroundColor: isDark ? theme.cssVars.dark.primary : theme.cssVars.light.primary
|
||||||
|
}}
|
||||||
|
/>
|
||||||
|
{theme.label}
|
||||||
|
</span>
|
||||||
|
</SelectItem>
|
||||||
|
))}
|
||||||
|
</SelectContent>
|
||||||
|
</Select>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{/* Font */}
|
||||||
|
<div className="space-y-2">
|
||||||
|
<Label htmlFor="font">Font</Label>
|
||||||
|
<Select
|
||||||
|
value={tempSettings.fontFamily}
|
||||||
|
onValueChange={(value: FontFamily) => setTempSettings((prev) => ({ ...prev, fontFamily: value }))}
|
||||||
|
>
|
||||||
|
<SelectTrigger id="font">
|
||||||
|
<SelectValue placeholder="Select a font" />
|
||||||
|
</SelectTrigger>
|
||||||
|
<SelectContent>
|
||||||
|
{FONT_OPTIONS.map((font) => (
|
||||||
|
<SelectItem key={font.value} value={font.value}>
|
||||||
|
<span style={{ fontFamily: font.fontFamily }}>{font.label}</span>
|
||||||
|
</SelectItem>
|
||||||
|
))}
|
||||||
|
</SelectContent>
|
||||||
|
</Select>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{/* Right Column */}
|
||||||
|
<div className="space-y-4">
|
||||||
|
{/* Filename Format */}
|
||||||
|
<div className="space-y-2">
|
||||||
|
<Label className="text-sm">Filename Format</Label>
|
||||||
|
<RadioGroup
|
||||||
|
value={tempSettings.filenameFormat}
|
||||||
|
onValueChange={(value) => setTempSettings(prev => ({ ...prev, filenameFormat: value as any }))}
|
||||||
|
>
|
||||||
|
<div className="flex items-center space-x-2">
|
||||||
|
<RadioGroupItem value="title-artist" id="title-artist" />
|
||||||
|
<Label htmlFor="title-artist" className="cursor-pointer font-normal text-sm">Title - Artist</Label>
|
||||||
|
</div>
|
||||||
|
<div className="flex items-center space-x-2">
|
||||||
|
<RadioGroupItem value="artist-title" id="artist-title" />
|
||||||
|
<Label htmlFor="artist-title" className="cursor-pointer font-normal text-sm">Artist - Title</Label>
|
||||||
|
</div>
|
||||||
|
<div className="flex items-center space-x-2">
|
||||||
|
<RadioGroupItem value="title" id="title" />
|
||||||
|
<Label htmlFor="title" className="cursor-pointer font-normal text-sm">Title</Label>
|
||||||
|
</div>
|
||||||
|
</RadioGroup>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div className="border-t pt-4" />
|
||||||
|
|
||||||
|
{/* Folder Settings */}
|
||||||
|
<div className="space-y-2">
|
||||||
|
<h3 className="font-medium text-sm">Folder Settings</h3>
|
||||||
|
<div className="flex items-center gap-2">
|
||||||
|
<Checkbox
|
||||||
|
id="track-number"
|
||||||
|
checked={tempSettings.trackNumber}
|
||||||
|
onCheckedChange={(checked) => setTempSettings(prev => ({ ...prev, trackNumber: checked as boolean }))}
|
||||||
|
/>
|
||||||
|
<Label htmlFor="track-number" className="cursor-pointer text-sm">Track Number</Label>
|
||||||
|
<Tooltip>
|
||||||
|
<TooltipTrigger asChild>
|
||||||
|
<Info className="h-3.5 w-3.5 text-muted-foreground cursor-help" />
|
||||||
|
</TooltipTrigger>
|
||||||
|
<TooltipContent side="top" className="max-w-xs">
|
||||||
|
<p className="text-xs text-center">Adds track numbers to filenames</p>
|
||||||
|
</TooltipContent>
|
||||||
|
</Tooltip>
|
||||||
|
</div>
|
||||||
|
<div className="flex items-center gap-2">
|
||||||
|
<Checkbox
|
||||||
|
id="artist-subfolder"
|
||||||
|
checked={tempSettings.artistSubfolder}
|
||||||
|
onCheckedChange={(checked) => setTempSettings(prev => ({ ...prev, artistSubfolder: checked as boolean }))}
|
||||||
|
/>
|
||||||
|
<Label htmlFor="artist-subfolder" className="cursor-pointer text-sm">Artist Subfolder</Label>
|
||||||
|
<Tooltip>
|
||||||
|
<TooltipTrigger asChild>
|
||||||
|
<Info className="h-3.5 w-3.5 text-muted-foreground cursor-help" />
|
||||||
|
</TooltipTrigger>
|
||||||
|
<TooltipContent side="top" className="max-w-xs">
|
||||||
|
<p className="text-xs text-center">Playlist only</p>
|
||||||
|
</TooltipContent>
|
||||||
|
</Tooltip>
|
||||||
|
</div>
|
||||||
|
<div className="flex items-center gap-2">
|
||||||
|
<Checkbox
|
||||||
|
id="album-subfolder"
|
||||||
|
checked={tempSettings.albumSubfolder}
|
||||||
|
onCheckedChange={(checked) => setTempSettings(prev => ({ ...prev, albumSubfolder: checked as boolean }))}
|
||||||
|
/>
|
||||||
|
<Label htmlFor="album-subfolder" className="cursor-pointer text-sm">Album Subfolder</Label>
|
||||||
|
<Tooltip>
|
||||||
|
<TooltipTrigger asChild>
|
||||||
|
<Info className="h-3.5 w-3.5 text-muted-foreground cursor-help" />
|
||||||
|
</TooltipTrigger>
|
||||||
|
<TooltipContent side="top" className="max-w-xs">
|
||||||
|
<p className="text-xs text-center">Playlist & Discography</p>
|
||||||
|
</TooltipContent>
|
||||||
|
</Tooltip>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div className="border-t pt-4" />
|
||||||
|
|
||||||
|
{/* Sound Effects */}
|
||||||
|
<div className="flex items-center gap-3">
|
||||||
|
<Volume2 className="h-4 w-4 text-muted-foreground" />
|
||||||
|
<Label htmlFor="sfx-enabled" className="cursor-pointer text-sm">Sound Effects</Label>
|
||||||
|
<Switch
|
||||||
|
id="sfx-enabled"
|
||||||
|
checked={tempSettings.sfxEnabled}
|
||||||
|
onCheckedChange={(checked) => setTempSettings(prev => ({ ...prev, sfxEnabled: checked }))}
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{/* Actions */}
|
||||||
|
<div className="flex gap-2 justify-between pt-4 border-t">
|
||||||
|
<Button variant="outline" onClick={handleReset} className="gap-1.5">
|
||||||
|
<RotateCcw className="h-4 w-4" />
|
||||||
|
Reset to Default
|
||||||
|
</Button>
|
||||||
|
<Button onClick={handleSave} className="gap-1.5">
|
||||||
|
<Save className="h-4 w-4" />
|
||||||
|
Save Changes
|
||||||
|
</Button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
}
|
||||||
@@ -0,0 +1,86 @@
|
|||||||
|
import { Home, Settings, Bug, Activity, LayoutGrid } from "lucide-react";
|
||||||
|
import {
|
||||||
|
Tooltip,
|
||||||
|
TooltipContent,
|
||||||
|
TooltipTrigger,
|
||||||
|
} from "@/components/ui/tooltip";
|
||||||
|
import { Button } from "@/components/ui/button";
|
||||||
|
import { openExternal } from "@/lib/utils";
|
||||||
|
|
||||||
|
export type PageType = "main" | "settings" | "debug" | "audio-analysis";
|
||||||
|
|
||||||
|
interface SidebarProps {
|
||||||
|
currentPage: PageType;
|
||||||
|
onPageChange: (page: PageType) => void;
|
||||||
|
}
|
||||||
|
|
||||||
|
export function Sidebar({ currentPage, onPageChange }: SidebarProps) {
|
||||||
|
const navItems = [
|
||||||
|
{ id: "main" as PageType, icon: Home, label: "Home" },
|
||||||
|
{ id: "settings" as PageType, icon: Settings, label: "Settings" },
|
||||||
|
{ id: "audio-analysis" as PageType, icon: Activity, label: "Audio Quality Analyzer" },
|
||||||
|
{ id: "debug" as PageType, icon: Bug, label: "Debug Logs" },
|
||||||
|
];
|
||||||
|
|
||||||
|
return (
|
||||||
|
<div className="fixed left-0 top-0 h-full w-14 bg-card border-r border-border flex flex-col items-center py-14 z-30">
|
||||||
|
<div className="flex flex-col gap-2 flex-1">
|
||||||
|
{navItems.map((item) => (
|
||||||
|
<Tooltip key={item.id} delayDuration={0}>
|
||||||
|
<TooltipTrigger asChild>
|
||||||
|
<Button
|
||||||
|
variant={currentPage === item.id ? "secondary" : "ghost"}
|
||||||
|
size="icon"
|
||||||
|
className="h-10 w-10"
|
||||||
|
onClick={() => onPageChange(item.id)}
|
||||||
|
>
|
||||||
|
<item.icon className="h-5 w-5" />
|
||||||
|
</Button>
|
||||||
|
</TooltipTrigger>
|
||||||
|
<TooltipContent side="right">
|
||||||
|
<p>{item.label}</p>
|
||||||
|
</TooltipContent>
|
||||||
|
</Tooltip>
|
||||||
|
))}
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{/* GitHub - below debug */}
|
||||||
|
<Tooltip delayDuration={0}>
|
||||||
|
<TooltipTrigger asChild>
|
||||||
|
<Button
|
||||||
|
variant="ghost"
|
||||||
|
size="icon"
|
||||||
|
className="h-10 w-10"
|
||||||
|
onClick={() => openExternal("https://github.com/afkarxyz/SpotiFLAC/issues")}
|
||||||
|
>
|
||||||
|
<svg viewBox="0 0 24 24" className="h-5 w-5" fill="currentColor">
|
||||||
|
<path d="M12 0c-6.626 0-12 5.373-12 12 0 5.302 3.438 9.8 8.207 11.387.599.111.793-.261.793-.577v-2.234c-3.338.726-4.033-1.416-4.033-1.416-.546-1.387-1.333-1.756-1.333-1.756-1.089-.745.083-.729.083-.729 1.205.084 1.839 1.237 1.839 1.237 1.07 1.834 2.807 1.304 3.492.997.107-.775.418-1.305.762-1.604-2.665-.305-5.467-1.334-5.467-5.931 0-1.311.469-2.381 1.236-3.221-.124-.303-.535-1.524.117-3.176 0 0 1.008-.322 3.301 1.23.957-.266 1.983-.399 3.003-.404 1.02.005 2.047.138 3.006.404 2.291-1.552 3.297-1.23 3.297-1.23.653 1.653.242 2.874.118 3.176.77.84 1.235 1.911 1.235 3.221 0 4.609-2.807 5.624-5.479 5.921.43.372.823 1.102.823 2.222v3.293c0 .319.192.694.801.576 4.765-1.589 8.199-6.086 8.199-11.386 0-6.627-5.373-12-12-12z" />
|
||||||
|
</svg>
|
||||||
|
</Button>
|
||||||
|
</TooltipTrigger>
|
||||||
|
<TooltipContent side="right">
|
||||||
|
<p>Report Bug</p>
|
||||||
|
</TooltipContent>
|
||||||
|
</Tooltip>
|
||||||
|
|
||||||
|
{/* Other Projects at bottom */}
|
||||||
|
<div className="mt-auto">
|
||||||
|
<Tooltip delayDuration={0}>
|
||||||
|
<TooltipTrigger asChild>
|
||||||
|
<Button
|
||||||
|
variant="ghost"
|
||||||
|
size="icon"
|
||||||
|
className="h-10 w-10"
|
||||||
|
onClick={() => openExternal("https://exyezed.cc/")}
|
||||||
|
>
|
||||||
|
<LayoutGrid className="h-5 w-5" />
|
||||||
|
</Button>
|
||||||
|
</TooltipTrigger>
|
||||||
|
<TooltipContent side="right">
|
||||||
|
<p>Other Projects</p>
|
||||||
|
</TooltipContent>
|
||||||
|
</Tooltip>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
}
|
||||||
@@ -0,0 +1,289 @@
|
|||||||
|
import { useEffect, useRef } from "react";
|
||||||
|
import type { SpectrumData } from "@/types/api";
|
||||||
|
|
||||||
|
interface SpectrumVisualizationProps {
|
||||||
|
sampleRate: number;
|
||||||
|
bitsPerSample: number;
|
||||||
|
duration: number;
|
||||||
|
spectrumData?: SpectrumData;
|
||||||
|
}
|
||||||
|
|
||||||
|
export function SpectrumVisualization({
|
||||||
|
sampleRate,
|
||||||
|
bitsPerSample,
|
||||||
|
duration,
|
||||||
|
spectrumData,
|
||||||
|
}: SpectrumVisualizationProps) {
|
||||||
|
const canvasRef = useRef<HTMLCanvasElement>(null);
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
const canvas = canvasRef.current;
|
||||||
|
if (!canvas) return;
|
||||||
|
|
||||||
|
const ctx = canvas.getContext("2d");
|
||||||
|
if (!ctx) return;
|
||||||
|
|
||||||
|
const width = canvas.width;
|
||||||
|
const height = canvas.height;
|
||||||
|
|
||||||
|
// Calculate margins for labels
|
||||||
|
const marginLeft = 70; // More space for Frequency label
|
||||||
|
const marginRight = 70; // Space for color bar
|
||||||
|
const marginTop = 30; // More space at top
|
||||||
|
const marginBottom = 65; // More space at bottom for Time label
|
||||||
|
|
||||||
|
const plotWidth = width - marginLeft - marginRight;
|
||||||
|
const plotHeight = height - marginTop - marginBottom;
|
||||||
|
|
||||||
|
// Black background
|
||||||
|
ctx.fillStyle = "#000000";
|
||||||
|
ctx.fillRect(0, 0, width, height);
|
||||||
|
|
||||||
|
// Calculate Nyquist frequency
|
||||||
|
const nyquistFreq = sampleRate / 2;
|
||||||
|
|
||||||
|
if (spectrumData) {
|
||||||
|
drawRealSpectrum(
|
||||||
|
ctx,
|
||||||
|
marginLeft,
|
||||||
|
marginTop,
|
||||||
|
plotWidth,
|
||||||
|
plotHeight,
|
||||||
|
spectrumData
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Draw axes, labels, and color bar
|
||||||
|
drawAxesAndLabels(ctx, marginLeft, marginTop, plotWidth, plotHeight, nyquistFreq, duration, sampleRate);
|
||||||
|
drawColorBar(ctx, marginLeft + plotWidth + 15, marginTop, 20, plotHeight);
|
||||||
|
}, [sampleRate, bitsPerSample, duration, spectrumData]);
|
||||||
|
|
||||||
|
const drawRealSpectrum = (
|
||||||
|
ctx: CanvasRenderingContext2D,
|
||||||
|
x: number,
|
||||||
|
y: number,
|
||||||
|
width: number,
|
||||||
|
height: number,
|
||||||
|
spectrum: SpectrumData
|
||||||
|
) => {
|
||||||
|
const timeSlices = spectrum.time_slices;
|
||||||
|
if (timeSlices.length === 0) return;
|
||||||
|
|
||||||
|
const freqBins = timeSlices[0].magnitudes.length;
|
||||||
|
const nyquistFreq = spectrum.max_freq;
|
||||||
|
|
||||||
|
// Find min/max dB values
|
||||||
|
let minDB = 0;
|
||||||
|
let maxDB = -200;
|
||||||
|
|
||||||
|
timeSlices.forEach((slice) => {
|
||||||
|
slice.magnitudes.forEach((db) => {
|
||||||
|
if (db > maxDB) maxDB = db;
|
||||||
|
if (db < minDB && db > -200) minDB = db;
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
// Clamp range for better visualization
|
||||||
|
minDB = Math.max(minDB, maxDB - 90); // 90dB dynamic range
|
||||||
|
const dbRange = maxDB - minDB;
|
||||||
|
|
||||||
|
const sliceWidth = Math.ceil(width / timeSlices.length);
|
||||||
|
|
||||||
|
for (let t = 0; t < timeSlices.length; t++) {
|
||||||
|
const slice = timeSlices[t];
|
||||||
|
const xPos = x + (t / timeSlices.length) * width;
|
||||||
|
|
||||||
|
for (let f = 0; f < freqBins && f < slice.magnitudes.length; f++) {
|
||||||
|
const db = slice.magnitudes[f];
|
||||||
|
|
||||||
|
// Linear frequency scale
|
||||||
|
const freq = (f / freqBins) * nyquistFreq;
|
||||||
|
const freqRatio = freq / nyquistFreq;
|
||||||
|
|
||||||
|
const yPos = y + height - (freqRatio * height);
|
||||||
|
|
||||||
|
// Calculate bin height
|
||||||
|
const nextFreq = ((f + 1) / freqBins) * nyquistFreq;
|
||||||
|
const nextFreqRatio = nextFreq / nyquistFreq;
|
||||||
|
const nextYPos = y + height - (nextFreqRatio * height);
|
||||||
|
|
||||||
|
const binHeight = Math.max(1, Math.abs(yPos - nextYPos) + 1);
|
||||||
|
|
||||||
|
// Normalize intensity
|
||||||
|
const intensity = Math.max(0, Math.min(1, (db - minDB) / dbRange));
|
||||||
|
|
||||||
|
const color = getSpekColor(intensity);
|
||||||
|
ctx.fillStyle = color;
|
||||||
|
ctx.fillRect(xPos, nextYPos, sliceWidth, binHeight);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
// Vibrant color scheme like Spek - NGEJERENG!
|
||||||
|
const getSpekColor = (intensity: number): string => {
|
||||||
|
if (intensity < 0.08) {
|
||||||
|
// Black to deep blue
|
||||||
|
const t = intensity / 0.08;
|
||||||
|
return `rgb(0, 0, ${Math.floor(t * 80)})`;
|
||||||
|
} else if (intensity < 0.18) {
|
||||||
|
// Deep blue to bright blue
|
||||||
|
const t = (intensity - 0.08) / 0.10;
|
||||||
|
return `rgb(${Math.floor(t * 50)}, ${Math.floor(t * 30)}, ${Math.floor(80 + t * 175)})`;
|
||||||
|
} else if (intensity < 0.28) {
|
||||||
|
// Blue to magenta/purple
|
||||||
|
const t = (intensity - 0.18) / 0.10;
|
||||||
|
return `rgb(${Math.floor(50 + t * 150)}, ${Math.floor(30 - t * 30)}, ${Math.floor(255 - t * 55)})`;
|
||||||
|
} else if (intensity < 0.40) {
|
||||||
|
// Magenta to bright red
|
||||||
|
const t = (intensity - 0.28) / 0.12;
|
||||||
|
return `rgb(${Math.floor(200 + t * 55)}, 0, ${Math.floor(200 - t * 200)})`;
|
||||||
|
} else if (intensity < 0.52) {
|
||||||
|
// Red to orange-red
|
||||||
|
const t = (intensity - 0.40) / 0.12;
|
||||||
|
return `rgb(255, ${Math.floor(t * 100)}, 0)`;
|
||||||
|
} else if (intensity < 0.65) {
|
||||||
|
// Orange-red to bright orange
|
||||||
|
const t = (intensity - 0.52) / 0.13;
|
||||||
|
return `rgb(255, ${Math.floor(100 + t * 80)}, 0)`;
|
||||||
|
} else if (intensity < 0.78) {
|
||||||
|
// Orange to yellow-orange
|
||||||
|
const t = (intensity - 0.65) / 0.13;
|
||||||
|
return `rgb(255, ${Math.floor(180 + t * 55)}, ${Math.floor(t * 30)})`;
|
||||||
|
} else if (intensity < 0.90) {
|
||||||
|
// Yellow-orange to bright yellow
|
||||||
|
const t = (intensity - 0.78) / 0.12;
|
||||||
|
return `rgb(255, ${Math.floor(235 + t * 20)}, ${Math.floor(30 + t * 100)})`;
|
||||||
|
} else {
|
||||||
|
// Yellow to white (hottest)
|
||||||
|
const t = (intensity - 0.90) / 0.10;
|
||||||
|
return `rgb(255, 255, ${Math.floor(130 + t * 125)})`;
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
const drawAxesAndLabels = (
|
||||||
|
ctx: CanvasRenderingContext2D,
|
||||||
|
x: number,
|
||||||
|
y: number,
|
||||||
|
width: number,
|
||||||
|
height: number,
|
||||||
|
nyquistFreq: number,
|
||||||
|
duration: number,
|
||||||
|
sampleRate: number
|
||||||
|
) => {
|
||||||
|
// Frequency labels on Y-axis
|
||||||
|
ctx.fillStyle = "#CCCCCC";
|
||||||
|
ctx.font = "12px Arial";
|
||||||
|
ctx.textAlign = "right";
|
||||||
|
ctx.textBaseline = "middle";
|
||||||
|
|
||||||
|
// Generate frequency labels based on Nyquist
|
||||||
|
const freqLabels = generateFreqLabels(nyquistFreq);
|
||||||
|
|
||||||
|
freqLabels.forEach(freq => {
|
||||||
|
if (freq <= nyquistFreq) {
|
||||||
|
const freqRatio = freq / nyquistFreq;
|
||||||
|
const yPos = y + height - (freqRatio * height);
|
||||||
|
const label = freq >= 1000 ? `${freq / 1000}k` : `${freq}`;
|
||||||
|
ctx.fillText(label, x - 8, yPos);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
// "0" at bottom
|
||||||
|
ctx.fillText("0", x - 8, y + height);
|
||||||
|
|
||||||
|
// Time labels on X-axis
|
||||||
|
ctx.textAlign = "center";
|
||||||
|
ctx.textBaseline = "top";
|
||||||
|
|
||||||
|
const timeStep = getTimeStep(duration);
|
||||||
|
for (let t = 0; t <= duration; t += timeStep) {
|
||||||
|
const xPos = x + (t / duration) * width;
|
||||||
|
ctx.fillText(`${Math.round(t)}s`, xPos, y + height + 8);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Axis titles
|
||||||
|
ctx.fillStyle = "#FFFFFF";
|
||||||
|
ctx.font = "13px Arial";
|
||||||
|
|
||||||
|
// Y-axis title: "Frequency (Hz)"
|
||||||
|
ctx.save();
|
||||||
|
ctx.translate(12, y + height / 2);
|
||||||
|
ctx.rotate(-Math.PI / 2);
|
||||||
|
ctx.textAlign = "center";
|
||||||
|
ctx.fillText("Frequency (Hz)", 0, 0);
|
||||||
|
ctx.restore();
|
||||||
|
|
||||||
|
// X-axis title: "Time (seconds)"
|
||||||
|
ctx.textAlign = "center";
|
||||||
|
ctx.fillText("Time (seconds)", x + width / 2, y + height + 35);
|
||||||
|
|
||||||
|
// Sample rate info in top right
|
||||||
|
ctx.textAlign = "right";
|
||||||
|
ctx.fillStyle = "#CCCCCC";
|
||||||
|
ctx.font = "12px Arial";
|
||||||
|
ctx.fillText(`Sample Rate: ${sampleRate} Hz`, x + width - 5, y - 3);
|
||||||
|
};
|
||||||
|
|
||||||
|
const generateFreqLabels = (nyquistFreq: number): number[] => {
|
||||||
|
if (nyquistFreq <= 24000) {
|
||||||
|
return [2000, 4000, 6000, 8000, 10000, 12000, 14000, 16000, 18000, 20000, 22000];
|
||||||
|
} else if (nyquistFreq <= 48000) {
|
||||||
|
return [5000, 10000, 15000, 20000, 25000, 30000, 35000, 40000, 45000];
|
||||||
|
} else if (nyquistFreq <= 96000) {
|
||||||
|
return [10000, 20000, 30000, 40000, 50000, 60000, 70000, 80000, 90000];
|
||||||
|
} else {
|
||||||
|
return [20000, 40000, 60000, 80000, 100000, 120000, 140000, 160000, 180000];
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
const getTimeStep = (duration: number): number => {
|
||||||
|
// Always use 30s intervals like the reference image
|
||||||
|
if (duration <= 60) return 15;
|
||||||
|
if (duration <= 120) return 30;
|
||||||
|
if (duration <= 300) return 30;
|
||||||
|
if (duration <= 600) return 60;
|
||||||
|
return 60;
|
||||||
|
};
|
||||||
|
|
||||||
|
const drawColorBar = (
|
||||||
|
ctx: CanvasRenderingContext2D,
|
||||||
|
x: number,
|
||||||
|
y: number,
|
||||||
|
width: number,
|
||||||
|
height: number
|
||||||
|
) => {
|
||||||
|
// Draw gradient color bar
|
||||||
|
for (let i = 0; i < height; i++) {
|
||||||
|
const intensity = 1 - (i / height); // Top is high, bottom is low
|
||||||
|
const color = getSpekColor(intensity);
|
||||||
|
ctx.fillStyle = color;
|
||||||
|
ctx.fillRect(x, y + i, width, 1);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Border around color bar
|
||||||
|
ctx.strokeStyle = "#666666";
|
||||||
|
ctx.lineWidth = 1;
|
||||||
|
ctx.strokeRect(x, y, width, height);
|
||||||
|
|
||||||
|
// Labels
|
||||||
|
ctx.fillStyle = "#FFFFFF";
|
||||||
|
ctx.font = "11px Arial";
|
||||||
|
ctx.textAlign = "left";
|
||||||
|
ctx.textBaseline = "middle";
|
||||||
|
|
||||||
|
ctx.fillText("High", x + width + 5, y + 10);
|
||||||
|
ctx.fillText("Low", x + width + 5, y + height - 10);
|
||||||
|
};
|
||||||
|
|
||||||
|
return (
|
||||||
|
<div className="border border-white/10 rounded-lg overflow-hidden bg-black shadow-xl">
|
||||||
|
<canvas
|
||||||
|
ref={canvasRef}
|
||||||
|
width={1200}
|
||||||
|
height={600}
|
||||||
|
className="w-full h-auto"
|
||||||
|
style={{ imageRendering: "auto" }}
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
}
|
||||||
@@ -1,10 +1,7 @@
|
|||||||
import { useState } from "react";
|
import { X, Minus, Maximize } from "lucide-react";
|
||||||
import { X, Minus, Square } from "lucide-react";
|
|
||||||
import { WindowMinimise, WindowToggleMaximise, Quit } from "../../wailsjs/runtime/runtime";
|
import { WindowMinimise, WindowToggleMaximise, Quit } from "../../wailsjs/runtime/runtime";
|
||||||
|
|
||||||
export function TitleBar() {
|
export function TitleBar() {
|
||||||
const [hoveredButton, setHoveredButton] = useState<string | null>(null);
|
|
||||||
|
|
||||||
const handleMinimize = () => {
|
const handleMinimize = () => {
|
||||||
WindowMinimise();
|
WindowMinimise();
|
||||||
};
|
};
|
||||||
@@ -21,48 +18,36 @@ export function TitleBar() {
|
|||||||
<>
|
<>
|
||||||
{/* Draggable area */}
|
{/* Draggable area */}
|
||||||
<div
|
<div
|
||||||
className="fixed top-0 left-0 right-0 h-12 z-40"
|
className="fixed top-0 left-14 right-0 h-10 z-40 bg-background/80 backdrop-blur-sm"
|
||||||
style={{ "--wails-draggable": "drag" } as React.CSSProperties}
|
style={{ "--wails-draggable": "drag" } as React.CSSProperties}
|
||||||
onDoubleClick={handleMaximize}
|
onDoubleClick={handleMaximize}
|
||||||
/>
|
/>
|
||||||
|
|
||||||
{/* Window control buttons */}
|
{/* Window control buttons - Windows style, right side */}
|
||||||
<div className="fixed top-4 left-4 z-50 flex gap-2">
|
<div className="fixed top-1.5 right-2 z-50 flex h-7 gap-0.5">
|
||||||
<button
|
|
||||||
onClick={handleClose}
|
|
||||||
onMouseEnter={() => setHoveredButton("close")}
|
|
||||||
onMouseLeave={() => setHoveredButton(null)}
|
|
||||||
className="w-3 h-3 rounded-full bg-red-500 hover:bg-red-600 transition-colors flex items-center justify-center"
|
|
||||||
style={{ "--wails-draggable": "no-drag" } as React.CSSProperties}
|
|
||||||
aria-label="Close"
|
|
||||||
>
|
|
||||||
{hoveredButton === "close" && (
|
|
||||||
<X className="w-2 h-2 text-red-900" strokeWidth={3} />
|
|
||||||
)}
|
|
||||||
</button>
|
|
||||||
<button
|
<button
|
||||||
onClick={handleMinimize}
|
onClick={handleMinimize}
|
||||||
onMouseEnter={() => setHoveredButton("minimize")}
|
className="w-8 h-7 flex items-center justify-center hover:bg-muted transition-colors rounded"
|
||||||
onMouseLeave={() => setHoveredButton(null)}
|
|
||||||
className="w-3 h-3 rounded-full bg-yellow-500 hover:bg-yellow-600 transition-colors flex items-center justify-center"
|
|
||||||
style={{ "--wails-draggable": "no-drag" } as React.CSSProperties}
|
style={{ "--wails-draggable": "no-drag" } as React.CSSProperties}
|
||||||
aria-label="Minimize"
|
aria-label="Minimize"
|
||||||
>
|
>
|
||||||
{hoveredButton === "minimize" && (
|
<Minus className="w-3.5 h-3.5" />
|
||||||
<Minus className="w-2 h-2 text-yellow-900" strokeWidth={3} />
|
|
||||||
)}
|
|
||||||
</button>
|
</button>
|
||||||
<button
|
<button
|
||||||
onClick={handleMaximize}
|
onClick={handleMaximize}
|
||||||
onMouseEnter={() => setHoveredButton("maximize")}
|
className="w-8 h-7 flex items-center justify-center hover:bg-muted transition-colors rounded"
|
||||||
onMouseLeave={() => setHoveredButton(null)}
|
|
||||||
className="w-3 h-3 rounded-full bg-green-500 hover:bg-green-600 transition-colors flex items-center justify-center"
|
|
||||||
style={{ "--wails-draggable": "no-drag" } as React.CSSProperties}
|
style={{ "--wails-draggable": "no-drag" } as React.CSSProperties}
|
||||||
aria-label="Maximize"
|
aria-label="Maximize"
|
||||||
>
|
>
|
||||||
{hoveredButton === "maximize" && (
|
<Maximize className="w-3.5 h-3.5" />
|
||||||
<Square className="w-1.5 h-1.5 text-green-900" strokeWidth={3} />
|
</button>
|
||||||
)}
|
<button
|
||||||
|
onClick={handleClose}
|
||||||
|
className="w-8 h-7 flex items-center justify-center hover:bg-destructive hover:text-white transition-colors rounded"
|
||||||
|
style={{ "--wails-draggable": "no-drag" } as React.CSSProperties}
|
||||||
|
aria-label="Close"
|
||||||
|
>
|
||||||
|
<X className="w-3.5 h-3.5" />
|
||||||
</button>
|
</button>
|
||||||
</div>
|
</div>
|
||||||
</>
|
</>
|
||||||
|
|||||||
@@ -1,8 +1,15 @@
|
|||||||
|
import { useState } from "react";
|
||||||
import { Button } from "@/components/ui/button";
|
import { Button } from "@/components/ui/button";
|
||||||
import { Card, CardContent } from "@/components/ui/card";
|
import { Card, CardContent } from "@/components/ui/card";
|
||||||
import { Download, FolderOpen, CheckCircle, XCircle } from "lucide-react";
|
import { Download, FolderOpen, CheckCircle, XCircle, FileText, FileCheck, Globe, ImageDown } from "lucide-react";
|
||||||
import { Spinner } from "@/components/ui/spinner";
|
import { Spinner } from "@/components/ui/spinner";
|
||||||
import type { TrackMetadata } from "@/types/api";
|
import {
|
||||||
|
Tooltip,
|
||||||
|
TooltipContent,
|
||||||
|
TooltipTrigger,
|
||||||
|
} from "@/components/ui/tooltip";
|
||||||
|
import type { TrackMetadata, TrackAvailability } from "@/types/api";
|
||||||
|
import { TidalIcon, DeezerIcon, QobuzIcon, AmazonIcon } from "./PlatformIcons";
|
||||||
|
|
||||||
interface TrackInfoProps {
|
interface TrackInfoProps {
|
||||||
track: TrackMetadata & { album_name: string; release_date: string };
|
track: TrackMetadata & { album_name: string; release_date: string };
|
||||||
@@ -10,7 +17,18 @@ interface TrackInfoProps {
|
|||||||
downloadingTrack: string | null;
|
downloadingTrack: string | null;
|
||||||
isDownloaded: boolean;
|
isDownloaded: boolean;
|
||||||
isFailed: boolean;
|
isFailed: boolean;
|
||||||
|
isSkipped: boolean;
|
||||||
|
downloadingLyricsTrack?: string | null;
|
||||||
|
downloadedLyrics?: boolean;
|
||||||
|
failedLyrics?: boolean;
|
||||||
|
skippedLyrics?: boolean;
|
||||||
|
checkingAvailability?: boolean;
|
||||||
|
availability?: TrackAvailability;
|
||||||
|
downloadingCover?: boolean;
|
||||||
onDownload: (isrc: string, name: string, artists: string, albumName?: string, spotifyId?: string) => void;
|
onDownload: (isrc: string, name: string, artists: string, albumName?: string, spotifyId?: string) => void;
|
||||||
|
onDownloadLyrics?: (spotifyId: string, name: string, artists: string, albumName?: string) => void;
|
||||||
|
onCheckAvailability?: (spotifyId: string, isrc?: string) => void;
|
||||||
|
onDownloadCover?: (coverUrl: string, trackName: string, artistName: string, albumName?: string) => void;
|
||||||
onOpenFolder: () => void;
|
onOpenFolder: () => void;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -20,30 +38,72 @@ export function TrackInfo({
|
|||||||
downloadingTrack,
|
downloadingTrack,
|
||||||
isDownloaded,
|
isDownloaded,
|
||||||
isFailed,
|
isFailed,
|
||||||
|
isSkipped,
|
||||||
|
downloadingLyricsTrack,
|
||||||
|
downloadedLyrics,
|
||||||
|
failedLyrics,
|
||||||
|
skippedLyrics,
|
||||||
|
checkingAvailability,
|
||||||
|
availability,
|
||||||
|
downloadingCover,
|
||||||
onDownload,
|
onDownload,
|
||||||
|
onDownloadLyrics,
|
||||||
|
onCheckAvailability,
|
||||||
|
onDownloadCover,
|
||||||
onOpenFolder,
|
onOpenFolder,
|
||||||
}: TrackInfoProps) {
|
}: TrackInfoProps) {
|
||||||
|
const [isHoveringCover, setIsHoveringCover] = useState(false);
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Card>
|
<Card>
|
||||||
<CardContent className="px-6">
|
<CardContent className="px-6">
|
||||||
<div className="flex gap-6 items-start">
|
<div className="flex gap-6 items-start">
|
||||||
{track.images && (
|
<div
|
||||||
<img
|
className="shrink-0 relative"
|
||||||
src={track.images}
|
onMouseEnter={() => setIsHoveringCover(true)}
|
||||||
alt={track.name}
|
onMouseLeave={() => setIsHoveringCover(false)}
|
||||||
className="w-48 h-48 rounded-md shadow-lg object-cover shrink-0"
|
>
|
||||||
/>
|
{track.images && (
|
||||||
)}
|
<>
|
||||||
|
<img
|
||||||
|
src={track.images}
|
||||||
|
alt={track.name}
|
||||||
|
className="w-48 h-48 rounded-md shadow-lg object-cover"
|
||||||
|
/>
|
||||||
|
{isHoveringCover && onDownloadCover && (
|
||||||
|
<div className="absolute inset-0 bg-black/50 rounded-md flex items-center justify-center">
|
||||||
|
<Tooltip>
|
||||||
|
<TooltipTrigger asChild>
|
||||||
|
<Button
|
||||||
|
size="icon"
|
||||||
|
variant="secondary"
|
||||||
|
className="cursor-pointer"
|
||||||
|
onClick={() => onDownloadCover(track.images, track.name, track.artists, track.album_name)}
|
||||||
|
disabled={downloadingCover}
|
||||||
|
>
|
||||||
|
{downloadingCover ? <Spinner /> : <ImageDown className="h-5 w-5" />}
|
||||||
|
</Button>
|
||||||
|
</TooltipTrigger>
|
||||||
|
<TooltipContent>
|
||||||
|
<p>Download Cover</p>
|
||||||
|
</TooltipContent>
|
||||||
|
</Tooltip>
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
</>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
<div className="flex-1 space-y-4 min-w-0">
|
<div className="flex-1 space-y-4 min-w-0">
|
||||||
<div className="space-y-1">
|
<div className="space-y-1">
|
||||||
<div className="flex items-center gap-3">
|
<div className="flex items-center gap-3">
|
||||||
<h1 className="text-3xl font-bold wrap-break-word">{track.name}</h1>
|
<h1 className="text-3xl font-bold wrap-break-word">{track.name}</h1>
|
||||||
{isDownloaded && (
|
{isSkipped ? (
|
||||||
|
<FileCheck className="h-6 w-6 text-yellow-500 shrink-0" />
|
||||||
|
) : isDownloaded ? (
|
||||||
<CheckCircle className="h-6 w-6 text-green-500 shrink-0" />
|
<CheckCircle className="h-6 w-6 text-green-500 shrink-0" />
|
||||||
)}
|
) : isFailed ? (
|
||||||
{isFailed && (
|
|
||||||
<XCircle className="h-6 w-6 text-red-500 shrink-0" />
|
<XCircle className="h-6 w-6 text-red-500 shrink-0" />
|
||||||
)}
|
) : null}
|
||||||
</div>
|
</div>
|
||||||
<p className="text-lg text-muted-foreground">{track.artists}</p>
|
<p className="text-lg text-muted-foreground">{track.artists}</p>
|
||||||
</div>
|
</div>
|
||||||
@@ -58,7 +118,7 @@ export function TrackInfo({
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
{track.isrc && (
|
{track.isrc && (
|
||||||
<div className="flex gap-2">
|
<div className="flex gap-2 flex-wrap">
|
||||||
<Button
|
<Button
|
||||||
onClick={() => onDownload(track.isrc, track.name, track.artists, track.album_name, track.spotify_id)}
|
onClick={() => onDownload(track.isrc, track.name, track.artists, track.album_name, track.spotify_id)}
|
||||||
disabled={isDownloading || downloadingTrack === track.isrc}
|
disabled={isDownloading || downloadingTrack === track.isrc}
|
||||||
@@ -72,6 +132,63 @@ export function TrackInfo({
|
|||||||
</>
|
</>
|
||||||
)}
|
)}
|
||||||
</Button>
|
</Button>
|
||||||
|
{track.spotify_id && onDownloadLyrics && (
|
||||||
|
<Tooltip>
|
||||||
|
<TooltipTrigger asChild>
|
||||||
|
<Button
|
||||||
|
onClick={() => onDownloadLyrics(track.spotify_id!, track.name, track.artists, track.album_name)}
|
||||||
|
variant="outline"
|
||||||
|
disabled={downloadingLyricsTrack === track.spotify_id}
|
||||||
|
>
|
||||||
|
{downloadingLyricsTrack === track.spotify_id ? (
|
||||||
|
<Spinner />
|
||||||
|
) : skippedLyrics ? (
|
||||||
|
<FileCheck className="h-4 w-4 text-yellow-500" />
|
||||||
|
) : downloadedLyrics ? (
|
||||||
|
<CheckCircle className="h-4 w-4 text-green-500" />
|
||||||
|
) : failedLyrics ? (
|
||||||
|
<XCircle className="h-4 w-4 text-red-500" />
|
||||||
|
) : (
|
||||||
|
<FileText className="h-4 w-4" />
|
||||||
|
)}
|
||||||
|
</Button>
|
||||||
|
</TooltipTrigger>
|
||||||
|
<TooltipContent>
|
||||||
|
<p>Download Lyric</p>
|
||||||
|
</TooltipContent>
|
||||||
|
</Tooltip>
|
||||||
|
)}
|
||||||
|
{track.spotify_id && onCheckAvailability && (
|
||||||
|
<Tooltip>
|
||||||
|
<TooltipTrigger asChild>
|
||||||
|
<Button
|
||||||
|
onClick={() => onCheckAvailability(track.spotify_id!, track.isrc)}
|
||||||
|
variant="outline"
|
||||||
|
disabled={checkingAvailability}
|
||||||
|
>
|
||||||
|
{checkingAvailability ? (
|
||||||
|
<Spinner />
|
||||||
|
) : availability ? (
|
||||||
|
<CheckCircle className="h-4 w-4 text-green-500" />
|
||||||
|
) : (
|
||||||
|
<Globe className="h-4 w-4" />
|
||||||
|
)}
|
||||||
|
</Button>
|
||||||
|
</TooltipTrigger>
|
||||||
|
<TooltipContent>
|
||||||
|
{availability ? (
|
||||||
|
<div className="flex items-center gap-2">
|
||||||
|
<TidalIcon className={`w-4 h-4 ${availability.tidal ? "text-green-500" : "text-red-500"}`} />
|
||||||
|
<DeezerIcon className={`w-4 h-4 ${availability.deezer ? "text-green-500" : "text-red-500"}`} />
|
||||||
|
<QobuzIcon className={`w-4 h-4 ${availability.qobuz ? "text-green-500" : "text-red-500"}`} />
|
||||||
|
<AmazonIcon className={`w-4 h-4 ${availability.amazon ? "text-green-500" : "text-red-500"}`} />
|
||||||
|
</div>
|
||||||
|
) : (
|
||||||
|
<p>Check Availability</p>
|
||||||
|
)}
|
||||||
|
</TooltipContent>
|
||||||
|
</Tooltip>
|
||||||
|
)}
|
||||||
{isDownloaded && (
|
{isDownloaded && (
|
||||||
<Button onClick={onOpenFolder} variant="outline">
|
<Button onClick={onOpenFolder} variant="outline">
|
||||||
<FolderOpen className="h-4 w-4" />
|
<FolderOpen className="h-4 w-4" />
|
||||||
|
|||||||
@@ -1,7 +1,12 @@
|
|||||||
import { Button } from "@/components/ui/button";
|
import { Button } from "@/components/ui/button";
|
||||||
import { Checkbox } from "@/components/ui/checkbox";
|
import { Checkbox } from "@/components/ui/checkbox";
|
||||||
import { Download, CheckCircle, XCircle } from "lucide-react";
|
import { Download, CheckCircle, XCircle, FileCheck, FileText, Globe, ImageDown } from "lucide-react";
|
||||||
import { Spinner } from "@/components/ui/spinner";
|
import { Spinner } from "@/components/ui/spinner";
|
||||||
|
import {
|
||||||
|
Tooltip,
|
||||||
|
TooltipContent,
|
||||||
|
TooltipTrigger,
|
||||||
|
} from "@/components/ui/tooltip";
|
||||||
import {
|
import {
|
||||||
Pagination,
|
Pagination,
|
||||||
PaginationContent,
|
PaginationContent,
|
||||||
@@ -10,7 +15,8 @@ import {
|
|||||||
PaginationNext,
|
PaginationNext,
|
||||||
PaginationPrevious,
|
PaginationPrevious,
|
||||||
} from "@/components/ui/pagination";
|
} from "@/components/ui/pagination";
|
||||||
import type { TrackMetadata } from "@/types/api";
|
import type { TrackMetadata, TrackAvailability } from "@/types/api";
|
||||||
|
import { TidalIcon, DeezerIcon, QobuzIcon, AmazonIcon } from "./PlatformIcons";
|
||||||
|
|
||||||
interface TrackListProps {
|
interface TrackListProps {
|
||||||
tracks: TrackMetadata[];
|
tracks: TrackMetadata[];
|
||||||
@@ -19,16 +25,38 @@ interface TrackListProps {
|
|||||||
selectedTracks: string[];
|
selectedTracks: string[];
|
||||||
downloadedTracks: Set<string>;
|
downloadedTracks: Set<string>;
|
||||||
failedTracks: Set<string>;
|
failedTracks: Set<string>;
|
||||||
|
skippedTracks: Set<string>;
|
||||||
downloadingTrack: string | null;
|
downloadingTrack: string | null;
|
||||||
isDownloading: boolean;
|
isDownloading: boolean;
|
||||||
currentPage: number;
|
currentPage: number;
|
||||||
itemsPerPage: number;
|
itemsPerPage: number;
|
||||||
showCheckboxes?: boolean;
|
showCheckboxes?: boolean;
|
||||||
hideAlbumColumn?: boolean;
|
hideAlbumColumn?: boolean;
|
||||||
|
folderName?: string;
|
||||||
|
isArtistDiscography?: boolean;
|
||||||
|
// Lyrics props
|
||||||
|
downloadedLyrics?: Set<string>;
|
||||||
|
failedLyrics?: Set<string>;
|
||||||
|
skippedLyrics?: Set<string>;
|
||||||
|
downloadingLyricsTrack?: string | null;
|
||||||
|
// Availability props
|
||||||
|
checkingAvailabilityTrack?: string | null;
|
||||||
|
availabilityMap?: Map<string, TrackAvailability>;
|
||||||
|
// Cover props
|
||||||
|
downloadedCovers?: Set<string>;
|
||||||
|
failedCovers?: Set<string>;
|
||||||
|
skippedCovers?: Set<string>;
|
||||||
|
downloadingCoverTrack?: string | null;
|
||||||
onToggleTrack: (isrc: string) => void;
|
onToggleTrack: (isrc: string) => void;
|
||||||
onToggleSelectAll: (tracks: TrackMetadata[]) => void;
|
onToggleSelectAll: (tracks: TrackMetadata[]) => void;
|
||||||
onDownloadTrack: (isrc: string, name: string, artists: string, albumName: string) => void;
|
onDownloadTrack: (isrc: string, name: string, artists: string, albumName: string, spotifyId?: string, folderName?: string, isArtistDiscography?: boolean) => void;
|
||||||
|
onDownloadLyrics?: (spotifyId: string, name: string, artists: string, albumName: string, folderName?: string, isArtistDiscography?: boolean, position?: number) => void;
|
||||||
|
onCheckAvailability?: (spotifyId: string, isrc?: string) => void;
|
||||||
|
onDownloadCover?: (coverUrl: string, trackName: string, artistName: string, albumName: string, folderName?: string, isArtistDiscography?: boolean, position?: number, trackId?: string) => void;
|
||||||
onPageChange: (page: number) => void;
|
onPageChange: (page: number) => void;
|
||||||
|
onAlbumClick?: (album: { id: string; name: string; external_urls: string }) => void;
|
||||||
|
onArtistClick?: (artist: { id: string; name: string; external_urls: string }) => void;
|
||||||
|
onTrackClick?: (track: TrackMetadata) => void;
|
||||||
}
|
}
|
||||||
|
|
||||||
export function TrackList({
|
export function TrackList({
|
||||||
@@ -38,16 +66,35 @@ export function TrackList({
|
|||||||
selectedTracks,
|
selectedTracks,
|
||||||
downloadedTracks,
|
downloadedTracks,
|
||||||
failedTracks,
|
failedTracks,
|
||||||
|
skippedTracks,
|
||||||
downloadingTrack,
|
downloadingTrack,
|
||||||
isDownloading,
|
isDownloading,
|
||||||
currentPage,
|
currentPage,
|
||||||
itemsPerPage,
|
itemsPerPage,
|
||||||
showCheckboxes = false,
|
showCheckboxes = false,
|
||||||
hideAlbumColumn = false,
|
hideAlbumColumn = false,
|
||||||
|
folderName,
|
||||||
|
isArtistDiscography = false,
|
||||||
|
downloadedLyrics,
|
||||||
|
failedLyrics,
|
||||||
|
skippedLyrics,
|
||||||
|
downloadingLyricsTrack,
|
||||||
|
checkingAvailabilityTrack,
|
||||||
|
availabilityMap,
|
||||||
|
downloadedCovers,
|
||||||
|
failedCovers,
|
||||||
|
skippedCovers,
|
||||||
|
downloadingCoverTrack,
|
||||||
onToggleTrack,
|
onToggleTrack,
|
||||||
onToggleSelectAll,
|
onToggleSelectAll,
|
||||||
onDownloadTrack,
|
onDownloadTrack,
|
||||||
|
onDownloadLyrics,
|
||||||
|
onCheckAvailability,
|
||||||
|
onDownloadCover,
|
||||||
onPageChange,
|
onPageChange,
|
||||||
|
onAlbumClick,
|
||||||
|
onArtistClick,
|
||||||
|
onTrackClick,
|
||||||
}: TrackListProps) {
|
}: TrackListProps) {
|
||||||
let filteredTracks = tracks.filter((track) => {
|
let filteredTracks = tracks.filter((track) => {
|
||||||
if (!searchQuery) return true;
|
if (!searchQuery) return true;
|
||||||
@@ -163,48 +210,222 @@ export function TrackList({
|
|||||||
)}
|
)}
|
||||||
<div className="flex flex-col">
|
<div className="flex flex-col">
|
||||||
<div className="flex items-center gap-2">
|
<div className="flex items-center gap-2">
|
||||||
<span className="font-medium">{track.name}</span>
|
{onTrackClick ? (
|
||||||
{downloadedTracks.has(track.isrc) && (
|
<span
|
||||||
|
className="font-medium cursor-pointer hover:underline"
|
||||||
|
onClick={() => onTrackClick(track)}
|
||||||
|
>
|
||||||
|
{track.name}
|
||||||
|
</span>
|
||||||
|
) : (
|
||||||
|
<span className="font-medium">{track.name}</span>
|
||||||
|
)}
|
||||||
|
{skippedTracks.has(track.isrc) ? (
|
||||||
|
<FileCheck className="h-4 w-4 text-yellow-500 shrink-0" />
|
||||||
|
) : downloadedTracks.has(track.isrc) ? (
|
||||||
<CheckCircle className="h-4 w-4 text-green-500 shrink-0" />
|
<CheckCircle className="h-4 w-4 text-green-500 shrink-0" />
|
||||||
)}
|
) : failedTracks.has(track.isrc) ? (
|
||||||
{failedTracks.has(track.isrc) && (
|
|
||||||
<XCircle className="h-4 w-4 text-red-500 shrink-0" />
|
<XCircle className="h-4 w-4 text-red-500 shrink-0" />
|
||||||
)}
|
) : null}
|
||||||
</div>
|
</div>
|
||||||
<span className="text-sm text-muted-foreground">
|
<span className="text-sm text-muted-foreground">
|
||||||
{track.artists}
|
{track.artists_data && track.artists_data.length > 0 ? (
|
||||||
|
track.artists_data.map((artist, i, arr) => (
|
||||||
|
<span key={artist.id}>
|
||||||
|
{onArtistClick ? (
|
||||||
|
<span
|
||||||
|
className="cursor-pointer hover:underline"
|
||||||
|
onClick={() =>
|
||||||
|
onArtistClick({
|
||||||
|
id: artist.id,
|
||||||
|
name: artist.name,
|
||||||
|
external_urls: artist.external_urls,
|
||||||
|
})
|
||||||
|
}
|
||||||
|
>
|
||||||
|
{artist.name}
|
||||||
|
</span>
|
||||||
|
) : (
|
||||||
|
artist.name
|
||||||
|
)}
|
||||||
|
{i < arr.length - 1 && ", "}
|
||||||
|
</span>
|
||||||
|
))
|
||||||
|
) : onArtistClick && track.artist_id && track.artist_url ? (
|
||||||
|
<span
|
||||||
|
className="cursor-pointer hover:underline"
|
||||||
|
onClick={() =>
|
||||||
|
onArtistClick({
|
||||||
|
id: track.artist_id!,
|
||||||
|
name: track.artists,
|
||||||
|
external_urls: track.artist_url!,
|
||||||
|
})
|
||||||
|
}
|
||||||
|
>
|
||||||
|
{track.artists}
|
||||||
|
</span>
|
||||||
|
) : (
|
||||||
|
track.artists
|
||||||
|
)}
|
||||||
</span>
|
</span>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</td>
|
</td>
|
||||||
{!hideAlbumColumn && (
|
{!hideAlbumColumn && (
|
||||||
<td className="p-4 align-middle text-sm text-muted-foreground hidden md:table-cell">
|
<td className="p-4 align-middle text-sm text-muted-foreground hidden md:table-cell">
|
||||||
{track.album_name}
|
{onAlbumClick && track.album_id && track.album_url ? (
|
||||||
|
<span
|
||||||
|
className="cursor-pointer hover:underline"
|
||||||
|
onClick={() =>
|
||||||
|
onAlbumClick({
|
||||||
|
id: track.album_id!,
|
||||||
|
name: track.album_name,
|
||||||
|
external_urls: track.album_url!,
|
||||||
|
})
|
||||||
|
}
|
||||||
|
>
|
||||||
|
{track.album_name}
|
||||||
|
</span>
|
||||||
|
) : (
|
||||||
|
track.album_name
|
||||||
|
)}
|
||||||
</td>
|
</td>
|
||||||
)}
|
)}
|
||||||
<td className="p-4 align-middle text-sm text-muted-foreground hidden lg:table-cell">
|
<td className="p-4 align-middle text-sm text-muted-foreground hidden lg:table-cell">
|
||||||
{formatDuration(track.duration_ms)}
|
{formatDuration(track.duration_ms)}
|
||||||
</td>
|
</td>
|
||||||
<td className="p-4 align-middle text-center">
|
<td className="p-4 align-middle text-center">
|
||||||
{track.isrc && (
|
<div className="flex items-center justify-center gap-1">
|
||||||
<Button
|
{track.isrc && (
|
||||||
onClick={() =>
|
<Tooltip>
|
||||||
onDownloadTrack(track.isrc, track.name, track.artists, track.album_name)
|
<TooltipTrigger asChild>
|
||||||
}
|
<Button
|
||||||
size="sm"
|
onClick={() =>
|
||||||
className="gap-1.5"
|
onDownloadTrack(track.isrc, track.name, track.artists, track.album_name, track.spotify_id, folderName, isArtistDiscography)
|
||||||
disabled={isDownloading || downloadingTrack === track.isrc}
|
}
|
||||||
>
|
size="sm"
|
||||||
{downloadingTrack === track.isrc ? (
|
disabled={isDownloading || downloadingTrack === track.isrc}
|
||||||
<Spinner />
|
>
|
||||||
) : (
|
{downloadingTrack === track.isrc ? (
|
||||||
<>
|
<Spinner />
|
||||||
<Download className="h-4 w-4" />
|
) : skippedTracks.has(track.isrc) ? (
|
||||||
Download
|
<FileCheck className="h-4 w-4" />
|
||||||
</>
|
) : downloadedTracks.has(track.isrc) ? (
|
||||||
)}
|
<CheckCircle className="h-4 w-4" />
|
||||||
</Button>
|
) : failedTracks.has(track.isrc) ? (
|
||||||
)}
|
<XCircle className="h-4 w-4" />
|
||||||
|
) : (
|
||||||
|
<Download className="h-4 w-4" />
|
||||||
|
)}
|
||||||
|
</Button>
|
||||||
|
</TooltipTrigger>
|
||||||
|
<TooltipContent>
|
||||||
|
{downloadingTrack === track.isrc ? (
|
||||||
|
<p>Downloading...</p>
|
||||||
|
) : skippedTracks.has(track.isrc) ? (
|
||||||
|
<p>Already exists</p>
|
||||||
|
) : downloadedTracks.has(track.isrc) ? (
|
||||||
|
<p>Downloaded</p>
|
||||||
|
) : failedTracks.has(track.isrc) ? (
|
||||||
|
<p>Failed</p>
|
||||||
|
) : (
|
||||||
|
<p>Download Track</p>
|
||||||
|
)}
|
||||||
|
</TooltipContent>
|
||||||
|
</Tooltip>
|
||||||
|
)}
|
||||||
|
{track.spotify_id && onDownloadLyrics && (
|
||||||
|
<Tooltip>
|
||||||
|
<TooltipTrigger asChild>
|
||||||
|
<Button
|
||||||
|
onClick={() =>
|
||||||
|
onDownloadLyrics(track.spotify_id!, track.name, track.artists, track.album_name, folderName, isArtistDiscography, startIndex + index + 1)
|
||||||
|
}
|
||||||
|
size="sm"
|
||||||
|
variant="outline"
|
||||||
|
disabled={downloadingLyricsTrack === track.spotify_id}
|
||||||
|
>
|
||||||
|
{downloadingLyricsTrack === track.spotify_id ? (
|
||||||
|
<Spinner />
|
||||||
|
) : skippedLyrics?.has(track.spotify_id) ? (
|
||||||
|
<FileCheck className="h-4 w-4 text-yellow-500" />
|
||||||
|
) : downloadedLyrics?.has(track.spotify_id) ? (
|
||||||
|
<CheckCircle className="h-4 w-4 text-green-500" />
|
||||||
|
) : failedLyrics?.has(track.spotify_id) ? (
|
||||||
|
<XCircle className="h-4 w-4 text-red-500" />
|
||||||
|
) : (
|
||||||
|
<FileText className="h-4 w-4" />
|
||||||
|
)}
|
||||||
|
</Button>
|
||||||
|
</TooltipTrigger>
|
||||||
|
<TooltipContent>
|
||||||
|
<p>Download Lyric</p>
|
||||||
|
</TooltipContent>
|
||||||
|
</Tooltip>
|
||||||
|
)}
|
||||||
|
{track.images && onDownloadCover && (
|
||||||
|
<Tooltip>
|
||||||
|
<TooltipTrigger asChild>
|
||||||
|
<Button
|
||||||
|
onClick={() => {
|
||||||
|
const trackId = track.spotify_id || `${track.name}-${track.artists}`;
|
||||||
|
onDownloadCover(track.images, track.name, track.artists, track.album_name, folderName, isArtistDiscography, startIndex + index + 1, trackId);
|
||||||
|
}}
|
||||||
|
size="sm"
|
||||||
|
variant="outline"
|
||||||
|
disabled={downloadingCoverTrack === (track.spotify_id || `${track.name}-${track.artists}`)}
|
||||||
|
>
|
||||||
|
{downloadingCoverTrack === (track.spotify_id || `${track.name}-${track.artists}`) ? (
|
||||||
|
<Spinner />
|
||||||
|
) : skippedCovers?.has(track.spotify_id || `${track.name}-${track.artists}`) ? (
|
||||||
|
<FileCheck className="h-4 w-4 text-yellow-500" />
|
||||||
|
) : downloadedCovers?.has(track.spotify_id || `${track.name}-${track.artists}`) ? (
|
||||||
|
<CheckCircle className="h-4 w-4 text-green-500" />
|
||||||
|
) : failedCovers?.has(track.spotify_id || `${track.name}-${track.artists}`) ? (
|
||||||
|
<XCircle className="h-4 w-4 text-red-500" />
|
||||||
|
) : (
|
||||||
|
<ImageDown className="h-4 w-4" />
|
||||||
|
)}
|
||||||
|
</Button>
|
||||||
|
</TooltipTrigger>
|
||||||
|
<TooltipContent>
|
||||||
|
<p>Download Cover</p>
|
||||||
|
</TooltipContent>
|
||||||
|
</Tooltip>
|
||||||
|
)}
|
||||||
|
{track.spotify_id && onCheckAvailability && (
|
||||||
|
<Tooltip>
|
||||||
|
<TooltipTrigger asChild>
|
||||||
|
<Button
|
||||||
|
onClick={() => onCheckAvailability(track.spotify_id!, track.isrc)}
|
||||||
|
size="sm"
|
||||||
|
variant="outline"
|
||||||
|
disabled={checkingAvailabilityTrack === track.spotify_id}
|
||||||
|
>
|
||||||
|
{checkingAvailabilityTrack === track.spotify_id ? (
|
||||||
|
<Spinner />
|
||||||
|
) : availabilityMap?.has(track.spotify_id) ? (
|
||||||
|
<CheckCircle className="h-4 w-4 text-green-500" />
|
||||||
|
) : (
|
||||||
|
<Globe className="h-4 w-4" />
|
||||||
|
)}
|
||||||
|
</Button>
|
||||||
|
</TooltipTrigger>
|
||||||
|
<TooltipContent>
|
||||||
|
{availabilityMap?.has(track.spotify_id) ? (
|
||||||
|
<div className="flex items-center gap-2">
|
||||||
|
<TidalIcon className={`w-4 h-4 ${availabilityMap.get(track.spotify_id)?.tidal ? "text-green-500" : "text-red-500"}`} />
|
||||||
|
<DeezerIcon className={`w-4 h-4 ${availabilityMap.get(track.spotify_id)?.deezer ? "text-green-500" : "text-red-500"}`} />
|
||||||
|
<QobuzIcon className={`w-4 h-4 ${availabilityMap.get(track.spotify_id)?.qobuz ? "text-green-500" : "text-red-500"}`} />
|
||||||
|
<AmazonIcon className={`w-4 h-4 ${availabilityMap.get(track.spotify_id)?.amazon ? "text-green-500" : "text-red-500"}`} />
|
||||||
|
</div>
|
||||||
|
) : (
|
||||||
|
<p>Check Availability</p>
|
||||||
|
)}
|
||||||
|
</TooltipContent>
|
||||||
|
</Tooltip>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
))}
|
))}
|
||||||
|
|||||||
@@ -1,66 +0,0 @@
|
|||||||
import * as React from "react"
|
|
||||||
import { cva, type VariantProps } from "class-variance-authority"
|
|
||||||
|
|
||||||
import { cn } from "@/lib/utils"
|
|
||||||
|
|
||||||
const alertVariants = cva(
|
|
||||||
"relative w-full rounded-lg border px-4 py-3 text-sm grid has-[>svg]:grid-cols-[calc(var(--spacing)*4)_1fr] grid-cols-[0_1fr] has-[>svg]:gap-x-3 gap-y-0.5 items-start [&>svg]:size-4 [&>svg]:translate-y-0.5 [&>svg]:text-current",
|
|
||||||
{
|
|
||||||
variants: {
|
|
||||||
variant: {
|
|
||||||
default: "bg-card text-card-foreground",
|
|
||||||
destructive:
|
|
||||||
"text-destructive bg-card [&>svg]:text-current *:data-[slot=alert-description]:text-destructive/90",
|
|
||||||
},
|
|
||||||
},
|
|
||||||
defaultVariants: {
|
|
||||||
variant: "default",
|
|
||||||
},
|
|
||||||
}
|
|
||||||
)
|
|
||||||
|
|
||||||
function Alert({
|
|
||||||
className,
|
|
||||||
variant,
|
|
||||||
...props
|
|
||||||
}: React.ComponentProps<"div"> & VariantProps<typeof alertVariants>) {
|
|
||||||
return (
|
|
||||||
<div
|
|
||||||
data-slot="alert"
|
|
||||||
role="alert"
|
|
||||||
className={cn(alertVariants({ variant }), className)}
|
|
||||||
{...props}
|
|
||||||
/>
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
function AlertTitle({ className, ...props }: React.ComponentProps<"div">) {
|
|
||||||
return (
|
|
||||||
<div
|
|
||||||
data-slot="alert-title"
|
|
||||||
className={cn(
|
|
||||||
"col-start-2 line-clamp-1 min-h-4 font-medium tracking-tight",
|
|
||||||
className
|
|
||||||
)}
|
|
||||||
{...props}
|
|
||||||
/>
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
function AlertDescription({
|
|
||||||
className,
|
|
||||||
...props
|
|
||||||
}: React.ComponentProps<"div">) {
|
|
||||||
return (
|
|
||||||
<div
|
|
||||||
data-slot="alert-description"
|
|
||||||
className={cn(
|
|
||||||
"text-muted-foreground col-start-2 grid justify-items-start gap-1 text-sm [&_p]:leading-relaxed",
|
|
||||||
className
|
|
||||||
)}
|
|
||||||
{...props}
|
|
||||||
/>
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
export { Alert, AlertTitle, AlertDescription }
|
|
||||||
@@ -60,7 +60,7 @@ function DialogContent({
|
|||||||
<DialogPrimitive.Content
|
<DialogPrimitive.Content
|
||||||
data-slot="dialog-content"
|
data-slot="dialog-content"
|
||||||
className={cn(
|
className={cn(
|
||||||
"bg-background data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 fixed top-[50%] left-[50%] z-50 grid w-full max-w-[calc(100%-2rem)] translate-x-[-50%] translate-y-[-50%] gap-4 rounded-lg border p-6 shadow-lg duration-200 sm:max-w-lg",
|
"bg-background data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 fixed top-[50%] left-[50%] z-50 grid w-full max-w-[calc(100%-2rem)] translate-x-[-50%] translate-y-[-50%] gap-4 rounded-lg border p-6 shadow-lg duration-200",
|
||||||
className
|
className
|
||||||
)}
|
)}
|
||||||
{...props}
|
{...props}
|
||||||
|
|||||||
@@ -32,7 +32,7 @@ const InputWithContext = React.forwardRef<HTMLInputElement, InputWithContextProp
|
|||||||
setHasSelection(start !== end);
|
setHasSelection(start !== end);
|
||||||
};
|
};
|
||||||
|
|
||||||
// Check clipboard permission
|
// Check clipboard permission when user explicitly opens the context menu.
|
||||||
const checkClipboard = async () => {
|
const checkClipboard = async () => {
|
||||||
try {
|
try {
|
||||||
const text = await navigator.clipboard.readText();
|
const text = await navigator.clipboard.readText();
|
||||||
@@ -42,10 +42,6 @@ const InputWithContext = React.forwardRef<HTMLInputElement, InputWithContextProp
|
|||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
React.useEffect(() => {
|
|
||||||
checkClipboard();
|
|
||||||
}, []);
|
|
||||||
|
|
||||||
const handleCut = async () => {
|
const handleCut = async () => {
|
||||||
const input = inputRef.current;
|
const input = inputRef.current;
|
||||||
if (!input) return;
|
if (!input) return;
|
||||||
@@ -156,7 +152,13 @@ const InputWithContext = React.forwardRef<HTMLInputElement, InputWithContextProp
|
|||||||
};
|
};
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<ContextMenu onOpenChange={checkClipboard}>
|
<ContextMenu
|
||||||
|
onOpenChange={(open) => {
|
||||||
|
if (open) {
|
||||||
|
checkClipboard();
|
||||||
|
}
|
||||||
|
}}
|
||||||
|
>
|
||||||
<ContextMenuTrigger asChild>
|
<ContextMenuTrigger asChild>
|
||||||
<Input
|
<Input
|
||||||
ref={inputRef}
|
ref={inputRef}
|
||||||
|
|||||||
@@ -0,0 +1,46 @@
|
|||||||
|
import * as React from "react"
|
||||||
|
import * as ScrollAreaPrimitive from "@radix-ui/react-scroll-area"
|
||||||
|
|
||||||
|
import { cn } from "@/lib/utils"
|
||||||
|
|
||||||
|
const ScrollArea = React.forwardRef<
|
||||||
|
React.ElementRef<typeof ScrollAreaPrimitive.Root>,
|
||||||
|
React.ComponentPropsWithoutRef<typeof ScrollAreaPrimitive.Root>
|
||||||
|
>(({ className, children, ...props }, ref) => (
|
||||||
|
<ScrollAreaPrimitive.Root
|
||||||
|
ref={ref}
|
||||||
|
className={cn("relative overflow-hidden", className)}
|
||||||
|
{...props}
|
||||||
|
>
|
||||||
|
<ScrollAreaPrimitive.Viewport className="h-full w-full rounded-[inherit]">
|
||||||
|
{children}
|
||||||
|
</ScrollAreaPrimitive.Viewport>
|
||||||
|
<ScrollBar />
|
||||||
|
<ScrollAreaPrimitive.Corner />
|
||||||
|
</ScrollAreaPrimitive.Root>
|
||||||
|
))
|
||||||
|
ScrollArea.displayName = ScrollAreaPrimitive.Root.displayName
|
||||||
|
|
||||||
|
const ScrollBar = React.forwardRef<
|
||||||
|
React.ElementRef<typeof ScrollAreaPrimitive.ScrollAreaScrollbar>,
|
||||||
|
React.ComponentPropsWithoutRef<typeof ScrollAreaPrimitive.ScrollAreaScrollbar>
|
||||||
|
>(({ className, orientation = "vertical", ...props }, ref) => (
|
||||||
|
<ScrollAreaPrimitive.ScrollAreaScrollbar
|
||||||
|
ref={ref}
|
||||||
|
orientation={orientation}
|
||||||
|
className={cn(
|
||||||
|
"flex touch-none select-none transition-colors",
|
||||||
|
orientation === "vertical" &&
|
||||||
|
"h-full w-2.5 border-l border-l-transparent p-[1px]",
|
||||||
|
orientation === "horizontal" &&
|
||||||
|
"h-2.5 flex-col border-t border-t-transparent p-[1px]",
|
||||||
|
className
|
||||||
|
)}
|
||||||
|
{...props}
|
||||||
|
>
|
||||||
|
<ScrollAreaPrimitive.ScrollAreaThumb className="relative flex-1 rounded-full bg-border" />
|
||||||
|
</ScrollAreaPrimitive.ScrollAreaScrollbar>
|
||||||
|
))
|
||||||
|
ScrollBar.displayName = ScrollAreaPrimitive.ScrollAreaScrollbar.displayName
|
||||||
|
|
||||||
|
export { ScrollArea, ScrollBar }
|
||||||
@@ -36,6 +36,7 @@ const Toaster = ({ ...props }: ToasterProps) => {
|
|||||||
"--normal-text": "var(--popover-foreground)",
|
"--normal-text": "var(--popover-foreground)",
|
||||||
"--normal-border": "var(--border)",
|
"--normal-border": "var(--border)",
|
||||||
"--border-radius": "var(--radius)",
|
"--border-radius": "var(--radius)",
|
||||||
|
left: "calc(56px + 1rem)",
|
||||||
} as React.CSSProperties
|
} as React.CSSProperties
|
||||||
}
|
}
|
||||||
{...props}
|
{...props}
|
||||||
|
|||||||
@@ -0,0 +1,31 @@
|
|||||||
|
"use client"
|
||||||
|
|
||||||
|
import * as React from "react"
|
||||||
|
import * as SwitchPrimitive from "@radix-ui/react-switch"
|
||||||
|
|
||||||
|
import { cn } from "@/lib/utils"
|
||||||
|
|
||||||
|
function Switch({
|
||||||
|
className,
|
||||||
|
...props
|
||||||
|
}: React.ComponentProps<typeof SwitchPrimitive.Root>) {
|
||||||
|
return (
|
||||||
|
<SwitchPrimitive.Root
|
||||||
|
data-slot="switch"
|
||||||
|
className={cn(
|
||||||
|
"peer data-[state=checked]:bg-primary data-[state=unchecked]:bg-input focus-visible:border-ring focus-visible:ring-ring/50 inline-flex h-5 w-9 shrink-0 cursor-pointer items-center rounded-full border border-transparent shadow-xs transition-all outline-none focus-visible:ring-[3px] disabled:cursor-not-allowed disabled:opacity-50",
|
||||||
|
className
|
||||||
|
)}
|
||||||
|
{...props}
|
||||||
|
>
|
||||||
|
<SwitchPrimitive.Thumb
|
||||||
|
data-slot="switch-thumb"
|
||||||
|
className={cn(
|
||||||
|
"pointer-events-none block size-4 rounded-full shadow-lg ring-0 transition-transform data-[state=checked]:translate-x-4 data-[state=unchecked]:translate-x-0 data-[state=checked]:bg-primary-foreground data-[state=unchecked]:bg-background"
|
||||||
|
)}
|
||||||
|
/>
|
||||||
|
</SwitchPrimitive.Root>
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
export { Switch }
|
||||||
@@ -1,18 +0,0 @@
|
|||||||
import * as React from "react"
|
|
||||||
|
|
||||||
import { cn } from "@/lib/utils"
|
|
||||||
|
|
||||||
function Textarea({ className, ...props }: React.ComponentProps<"textarea">) {
|
|
||||||
return (
|
|
||||||
<textarea
|
|
||||||
data-slot="textarea"
|
|
||||||
className={cn(
|
|
||||||
"border-input placeholder:text-muted-foreground focus-visible:border-ring focus-visible:ring-ring/50 aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40 aria-invalid:border-destructive dark:bg-input/30 flex field-sizing-content min-h-16 w-full rounded-md border bg-transparent px-3 py-2 text-base shadow-xs transition-[color,box-shadow] outline-none focus-visible:ring-[3px] disabled:cursor-not-allowed disabled:opacity-50 md:text-sm",
|
|
||||||
className
|
|
||||||
)}
|
|
||||||
{...props}
|
|
||||||
/>
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
export { Textarea }
|
|
||||||
@@ -0,0 +1,60 @@
|
|||||||
|
import { useState, useCallback } from "react";
|
||||||
|
import { AnalyzeTrack } from "../../wailsjs/go/main/App";
|
||||||
|
import type { AnalysisResult } from "@/types/api";
|
||||||
|
import { logger } from "@/lib/logger";
|
||||||
|
import { toastWithSound as toast } from "@/lib/toast-with-sound";
|
||||||
|
|
||||||
|
export function useAudioAnalysis() {
|
||||||
|
const [analyzing, setAnalyzing] = useState(false);
|
||||||
|
const [result, setResult] = useState<AnalysisResult | null>(null);
|
||||||
|
const [error, setError] = useState<string | null>(null);
|
||||||
|
|
||||||
|
const analyzeFile = useCallback(async (filePath: string) => {
|
||||||
|
if (!filePath) {
|
||||||
|
setError("No file path provided");
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
setAnalyzing(true);
|
||||||
|
setError(null);
|
||||||
|
setResult(null);
|
||||||
|
|
||||||
|
try {
|
||||||
|
logger.info(`Analyzing audio file: ${filePath}`);
|
||||||
|
const startTime = Date.now();
|
||||||
|
|
||||||
|
const response = await AnalyzeTrack(filePath);
|
||||||
|
const analysisResult: AnalysisResult = JSON.parse(response);
|
||||||
|
|
||||||
|
const elapsed = ((Date.now() - startTime) / 1000).toFixed(2);
|
||||||
|
logger.success(`Audio analysis completed in ${elapsed}s`);
|
||||||
|
|
||||||
|
setResult(analysisResult);
|
||||||
|
|
||||||
|
return analysisResult;
|
||||||
|
} catch (err) {
|
||||||
|
const errorMessage = err instanceof Error ? err.message : "Failed to analyze audio file";
|
||||||
|
logger.error(`Analysis error: ${errorMessage}`);
|
||||||
|
setError(errorMessage);
|
||||||
|
toast.error("Audio Analysis Failed", {
|
||||||
|
description: errorMessage,
|
||||||
|
});
|
||||||
|
return null;
|
||||||
|
} finally {
|
||||||
|
setAnalyzing(false);
|
||||||
|
}
|
||||||
|
}, []);
|
||||||
|
|
||||||
|
const clearResult = useCallback(() => {
|
||||||
|
setResult(null);
|
||||||
|
setError(null);
|
||||||
|
}, []);
|
||||||
|
|
||||||
|
return {
|
||||||
|
analyzing,
|
||||||
|
result,
|
||||||
|
error,
|
||||||
|
analyzeFile,
|
||||||
|
clearResult,
|
||||||
|
};
|
||||||
|
}
|
||||||
@@ -0,0 +1,69 @@
|
|||||||
|
import { useState, useCallback } from "react";
|
||||||
|
import { CheckTrackAvailability } from "../../wailsjs/go/main/App";
|
||||||
|
import type { TrackAvailability } from "@/types/api";
|
||||||
|
import { logger } from "@/lib/logger";
|
||||||
|
|
||||||
|
export function useAvailability() {
|
||||||
|
const [checking, setChecking] = useState(false);
|
||||||
|
const [checkingTrackId, setCheckingTrackId] = useState<string | null>(null);
|
||||||
|
const [availabilityMap, setAvailabilityMap] = useState<Map<string, TrackAvailability>>(new Map());
|
||||||
|
const [error, setError] = useState<string | null>(null);
|
||||||
|
|
||||||
|
const checkAvailability = useCallback(async (spotifyId: string, isrc?: string) => {
|
||||||
|
if (!spotifyId) {
|
||||||
|
setError("No Spotify ID provided");
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Check if already cached
|
||||||
|
if (availabilityMap.has(spotifyId)) {
|
||||||
|
return availabilityMap.get(spotifyId)!;
|
||||||
|
}
|
||||||
|
|
||||||
|
setChecking(true);
|
||||||
|
setCheckingTrackId(spotifyId);
|
||||||
|
setError(null);
|
||||||
|
|
||||||
|
try {
|
||||||
|
logger.info(`Checking availability for track: ${spotifyId}`);
|
||||||
|
const response = await CheckTrackAvailability(spotifyId, isrc || "");
|
||||||
|
const availability: TrackAvailability = JSON.parse(response);
|
||||||
|
|
||||||
|
setAvailabilityMap((prev) => {
|
||||||
|
const newMap = new Map(prev);
|
||||||
|
newMap.set(spotifyId, availability);
|
||||||
|
return newMap;
|
||||||
|
});
|
||||||
|
|
||||||
|
logger.success(`Availability check completed for ${spotifyId}`);
|
||||||
|
return availability;
|
||||||
|
} catch (err) {
|
||||||
|
const errorMessage = err instanceof Error ? err.message : "Failed to check availability";
|
||||||
|
logger.error(`Availability check error: ${errorMessage}`);
|
||||||
|
setError(errorMessage);
|
||||||
|
return null;
|
||||||
|
} finally {
|
||||||
|
setChecking(false);
|
||||||
|
setCheckingTrackId(null);
|
||||||
|
}
|
||||||
|
}, [availabilityMap]);
|
||||||
|
|
||||||
|
const getAvailability = useCallback((spotifyId: string) => {
|
||||||
|
return availabilityMap.get(spotifyId);
|
||||||
|
}, [availabilityMap]);
|
||||||
|
|
||||||
|
const clearAvailability = useCallback(() => {
|
||||||
|
setAvailabilityMap(new Map());
|
||||||
|
setError(null);
|
||||||
|
}, []);
|
||||||
|
|
||||||
|
return {
|
||||||
|
checking,
|
||||||
|
checkingTrackId,
|
||||||
|
availabilityMap,
|
||||||
|
error,
|
||||||
|
checkAvailability,
|
||||||
|
getAvailability,
|
||||||
|
clearAvailability,
|
||||||
|
};
|
||||||
|
}
|
||||||
@@ -0,0 +1,218 @@
|
|||||||
|
import { useState, useRef } from "react";
|
||||||
|
import { downloadCover } from "@/lib/api";
|
||||||
|
import { getSettings } from "@/lib/settings";
|
||||||
|
import { toastWithSound as toast } from "@/lib/toast-with-sound";
|
||||||
|
import { joinPath, sanitizePath } from "@/lib/utils";
|
||||||
|
import { logger } from "@/lib/logger";
|
||||||
|
import type { TrackMetadata } from "@/types/api";
|
||||||
|
|
||||||
|
export function useCover() {
|
||||||
|
const [downloadingCover, setDownloadingCover] = useState(false);
|
||||||
|
const [downloadingCoverTrack, setDownloadingCoverTrack] = useState<string | null>(null);
|
||||||
|
const [downloadedCovers, setDownloadedCovers] = useState<Set<string>>(new Set());
|
||||||
|
const [failedCovers, setFailedCovers] = useState<Set<string>>(new Set());
|
||||||
|
const [skippedCovers, setSkippedCovers] = useState<Set<string>>(new Set());
|
||||||
|
const [isBulkDownloadingCovers, setIsBulkDownloadingCovers] = useState(false);
|
||||||
|
const [coverDownloadProgress, setCoverDownloadProgress] = useState(0);
|
||||||
|
const stopBulkDownloadRef = useRef(false);
|
||||||
|
|
||||||
|
const handleDownloadCover = async (
|
||||||
|
coverUrl: string,
|
||||||
|
trackName: string,
|
||||||
|
artistName: string,
|
||||||
|
albumName?: string,
|
||||||
|
playlistName?: string,
|
||||||
|
isArtistDiscography?: boolean,
|
||||||
|
position?: number,
|
||||||
|
trackId?: string
|
||||||
|
) => {
|
||||||
|
if (!coverUrl) {
|
||||||
|
toast.error("No cover URL found for this track");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
const id = trackId || `${trackName}-${artistName}`;
|
||||||
|
logger.info(`downloading cover: ${trackName} - ${artistName}`);
|
||||||
|
const settings = getSettings();
|
||||||
|
setDownloadingCover(true);
|
||||||
|
setDownloadingCoverTrack(id);
|
||||||
|
|
||||||
|
try {
|
||||||
|
const os = settings.operatingSystem;
|
||||||
|
let outputDir = settings.downloadPath;
|
||||||
|
|
||||||
|
// Build output path similar to audio download
|
||||||
|
if (playlistName) {
|
||||||
|
outputDir = joinPath(os, outputDir, sanitizePath(playlistName, os));
|
||||||
|
|
||||||
|
if (isArtistDiscography) {
|
||||||
|
if (settings.albumSubfolder && albumName) {
|
||||||
|
outputDir = joinPath(os, outputDir, sanitizePath(albumName, os));
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
if (settings.artistSubfolder && artistName) {
|
||||||
|
outputDir = joinPath(os, outputDir, sanitizePath(artistName, os));
|
||||||
|
}
|
||||||
|
if (settings.albumSubfolder && albumName) {
|
||||||
|
outputDir = joinPath(os, outputDir, sanitizePath(albumName, os));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
const response = await downloadCover({
|
||||||
|
cover_url: coverUrl,
|
||||||
|
track_name: trackName,
|
||||||
|
artist_name: artistName,
|
||||||
|
output_dir: outputDir,
|
||||||
|
filename_format: settings.filenameFormat,
|
||||||
|
track_number: settings.trackNumber,
|
||||||
|
position: position || 0,
|
||||||
|
});
|
||||||
|
|
||||||
|
if (response.success) {
|
||||||
|
if (response.already_exists) {
|
||||||
|
toast.info("Cover file already exists");
|
||||||
|
setSkippedCovers((prev) => new Set(prev).add(id));
|
||||||
|
} else {
|
||||||
|
toast.success("Cover downloaded successfully");
|
||||||
|
setDownloadedCovers((prev) => new Set(prev).add(id));
|
||||||
|
}
|
||||||
|
setFailedCovers((prev) => {
|
||||||
|
const newSet = new Set(prev);
|
||||||
|
newSet.delete(id);
|
||||||
|
return newSet;
|
||||||
|
});
|
||||||
|
} else {
|
||||||
|
toast.error(response.error || "Failed to download cover");
|
||||||
|
setFailedCovers((prev) => new Set(prev).add(id));
|
||||||
|
}
|
||||||
|
} catch (err) {
|
||||||
|
toast.error(err instanceof Error ? err.message : "Failed to download cover");
|
||||||
|
setFailedCovers((prev) => new Set(prev).add(id));
|
||||||
|
} finally {
|
||||||
|
setDownloadingCover(false);
|
||||||
|
setDownloadingCoverTrack(null);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
const handleDownloadAllCovers = async (
|
||||||
|
tracks: TrackMetadata[],
|
||||||
|
playlistName?: string,
|
||||||
|
isArtistDiscography?: boolean
|
||||||
|
) => {
|
||||||
|
if (tracks.length === 0) {
|
||||||
|
toast.error("No tracks to download covers");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
const settings = getSettings();
|
||||||
|
setIsBulkDownloadingCovers(true);
|
||||||
|
setCoverDownloadProgress(0);
|
||||||
|
stopBulkDownloadRef.current = false;
|
||||||
|
|
||||||
|
let completed = 0;
|
||||||
|
let success = 0;
|
||||||
|
let skipped = 0;
|
||||||
|
let failed = 0;
|
||||||
|
|
||||||
|
for (let i = 0; i < tracks.length; i++) {
|
||||||
|
if (stopBulkDownloadRef.current) {
|
||||||
|
toast.info("Cover download stopped");
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
const track = tracks[i];
|
||||||
|
if (!track.images) {
|
||||||
|
completed++;
|
||||||
|
setCoverDownloadProgress(Math.round((completed / tracks.length) * 100));
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
const id = track.spotify_id || `${track.name}-${track.artists}`;
|
||||||
|
setDownloadingCoverTrack(id);
|
||||||
|
|
||||||
|
try {
|
||||||
|
const os = settings.operatingSystem;
|
||||||
|
let outputDir = settings.downloadPath;
|
||||||
|
|
||||||
|
if (playlistName) {
|
||||||
|
outputDir = joinPath(os, outputDir, sanitizePath(playlistName, os));
|
||||||
|
|
||||||
|
if (isArtistDiscography) {
|
||||||
|
if (settings.albumSubfolder && track.album_name) {
|
||||||
|
outputDir = joinPath(os, outputDir, sanitizePath(track.album_name, os));
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
if (settings.artistSubfolder && track.artists) {
|
||||||
|
outputDir = joinPath(os, outputDir, sanitizePath(track.artists, os));
|
||||||
|
}
|
||||||
|
if (settings.albumSubfolder && track.album_name) {
|
||||||
|
outputDir = joinPath(os, outputDir, sanitizePath(track.album_name, os));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
const response = await downloadCover({
|
||||||
|
cover_url: track.images,
|
||||||
|
track_name: track.name,
|
||||||
|
artist_name: track.artists,
|
||||||
|
output_dir: outputDir,
|
||||||
|
filename_format: settings.filenameFormat,
|
||||||
|
track_number: settings.trackNumber,
|
||||||
|
position: i + 1,
|
||||||
|
});
|
||||||
|
|
||||||
|
if (response.success) {
|
||||||
|
if (response.already_exists) {
|
||||||
|
skipped++;
|
||||||
|
setSkippedCovers((prev) => new Set(prev).add(id));
|
||||||
|
} else {
|
||||||
|
success++;
|
||||||
|
setDownloadedCovers((prev) => new Set(prev).add(id));
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
failed++;
|
||||||
|
setFailedCovers((prev) => new Set(prev).add(id));
|
||||||
|
}
|
||||||
|
} catch {
|
||||||
|
failed++;
|
||||||
|
setFailedCovers((prev) => new Set(prev).add(id));
|
||||||
|
}
|
||||||
|
|
||||||
|
completed++;
|
||||||
|
setCoverDownloadProgress(Math.round((completed / tracks.length) * 100));
|
||||||
|
}
|
||||||
|
|
||||||
|
setDownloadingCoverTrack(null);
|
||||||
|
setIsBulkDownloadingCovers(false);
|
||||||
|
setCoverDownloadProgress(0);
|
||||||
|
|
||||||
|
if (!stopBulkDownloadRef.current) {
|
||||||
|
toast.success(`Covers: ${success} downloaded, ${skipped} skipped, ${failed} failed`);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
const handleStopCoverDownload = () => {
|
||||||
|
stopBulkDownloadRef.current = true;
|
||||||
|
};
|
||||||
|
|
||||||
|
const resetCoverState = () => {
|
||||||
|
setDownloadedCovers(new Set());
|
||||||
|
setFailedCovers(new Set());
|
||||||
|
setSkippedCovers(new Set());
|
||||||
|
};
|
||||||
|
|
||||||
|
return {
|
||||||
|
downloadingCover,
|
||||||
|
downloadingCoverTrack,
|
||||||
|
downloadedCovers,
|
||||||
|
failedCovers,
|
||||||
|
skippedCovers,
|
||||||
|
isBulkDownloadingCovers,
|
||||||
|
coverDownloadProgress,
|
||||||
|
handleDownloadCover,
|
||||||
|
handleDownloadAllCovers,
|
||||||
|
handleStopCoverDownload,
|
||||||
|
resetCoverState,
|
||||||
|
};
|
||||||
|
}
|
||||||
@@ -3,6 +3,7 @@ import { downloadTrack } from "@/lib/api";
|
|||||||
import { getSettings } from "@/lib/settings";
|
import { getSettings } from "@/lib/settings";
|
||||||
import { toastWithSound as toast } from "@/lib/toast-with-sound";
|
import { toastWithSound as toast } from "@/lib/toast-with-sound";
|
||||||
import { joinPath, sanitizePath } from "@/lib/utils";
|
import { joinPath, sanitizePath } from "@/lib/utils";
|
||||||
|
import { logger } from "@/lib/logger";
|
||||||
import type { TrackMetadata } from "@/types/api";
|
import type { TrackMetadata } from "@/types/api";
|
||||||
|
|
||||||
export function useDownload() {
|
export function useDownload() {
|
||||||
@@ -12,6 +13,7 @@ export function useDownload() {
|
|||||||
const [bulkDownloadType, setBulkDownloadType] = useState<"all" | "selected" | null>(null);
|
const [bulkDownloadType, setBulkDownloadType] = useState<"all" | "selected" | null>(null);
|
||||||
const [downloadedTracks, setDownloadedTracks] = useState<Set<string>>(new Set());
|
const [downloadedTracks, setDownloadedTracks] = useState<Set<string>>(new Set());
|
||||||
const [failedTracks, setFailedTracks] = useState<Set<string>>(new Set());
|
const [failedTracks, setFailedTracks] = useState<Set<string>>(new Set());
|
||||||
|
const [skippedTracks, setSkippedTracks] = useState<Set<string>>(new Set());
|
||||||
const [currentDownloadInfo, setCurrentDownloadInfo] = useState<{
|
const [currentDownloadInfo, setCurrentDownloadInfo] = useState<{
|
||||||
name: string;
|
name: string;
|
||||||
artists: string;
|
artists: string;
|
||||||
@@ -27,7 +29,8 @@ export function useDownload() {
|
|||||||
playlistName?: string,
|
playlistName?: string,
|
||||||
isArtistDiscography?: boolean,
|
isArtistDiscography?: boolean,
|
||||||
position?: number,
|
position?: number,
|
||||||
spotifyId?: string
|
spotifyId?: string,
|
||||||
|
durationMs?: number
|
||||||
) => {
|
) => {
|
||||||
let service = settings.downloader;
|
let service = settings.downloader;
|
||||||
|
|
||||||
@@ -57,6 +60,10 @@ export function useDownload() {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Always add item to queue before downloading
|
||||||
|
const { AddToDownloadQueue } = await import("../../wailsjs/go/main/App");
|
||||||
|
const itemID = await AddToDownloadQueue(isrc, trackName || "", artistName || "", albumName || "");
|
||||||
|
|
||||||
if (service === "auto") {
|
if (service === "auto") {
|
||||||
// Get all streaming URLs once from song.link API
|
// Get all streaming URLs once from song.link API
|
||||||
let streamingURLs: any = null;
|
let streamingURLs: any = null;
|
||||||
@@ -70,6 +77,217 @@ export function useDownload() {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Convert duration from ms to seconds for backend
|
||||||
|
const durationSeconds = durationMs ? Math.round(durationMs / 1000) : undefined;
|
||||||
|
|
||||||
|
// Try Tidal first
|
||||||
|
if (streamingURLs?.tidal_url) {
|
||||||
|
try {
|
||||||
|
logger.debug(`trying tidal for: ${trackName} - ${artistName}`);
|
||||||
|
const tidalResponse = await downloadTrack({
|
||||||
|
isrc,
|
||||||
|
service: "tidal",
|
||||||
|
query,
|
||||||
|
track_name: trackName,
|
||||||
|
artist_name: artistName,
|
||||||
|
album_name: albumName,
|
||||||
|
output_dir: outputDir,
|
||||||
|
filename_format: settings.filenameFormat,
|
||||||
|
track_number: settings.trackNumber,
|
||||||
|
position,
|
||||||
|
use_album_track_number: useAlbumTrackNumber,
|
||||||
|
spotify_id: spotifyId,
|
||||||
|
service_url: streamingURLs.tidal_url,
|
||||||
|
duration: durationSeconds,
|
||||||
|
item_id: itemID, // Pass the same itemID through all attempts
|
||||||
|
});
|
||||||
|
|
||||||
|
if (tidalResponse.success) {
|
||||||
|
logger.success(`tidal: ${trackName} - ${artistName}`);
|
||||||
|
return tidalResponse;
|
||||||
|
}
|
||||||
|
logger.warning(`tidal failed, trying deezer...`);
|
||||||
|
} catch (tidalErr) {
|
||||||
|
logger.error(`tidal error: ${tidalErr}`);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Try Deezer second
|
||||||
|
if (streamingURLs?.deezer_url) {
|
||||||
|
try {
|
||||||
|
logger.debug(`trying deezer for: ${trackName} - ${artistName}`);
|
||||||
|
const deezerResponse = await downloadTrack({
|
||||||
|
isrc,
|
||||||
|
service: "deezer",
|
||||||
|
query,
|
||||||
|
track_name: trackName,
|
||||||
|
artist_name: artistName,
|
||||||
|
album_name: albumName,
|
||||||
|
output_dir: outputDir,
|
||||||
|
filename_format: settings.filenameFormat,
|
||||||
|
track_number: settings.trackNumber,
|
||||||
|
position,
|
||||||
|
use_album_track_number: useAlbumTrackNumber,
|
||||||
|
spotify_id: spotifyId,
|
||||||
|
service_url: streamingURLs.deezer_url,
|
||||||
|
item_id: itemID,
|
||||||
|
});
|
||||||
|
|
||||||
|
if (deezerResponse.success) {
|
||||||
|
logger.success(`deezer: ${trackName} - ${artistName}`);
|
||||||
|
return deezerResponse;
|
||||||
|
}
|
||||||
|
logger.warning(`deezer failed, trying amazon...`);
|
||||||
|
} catch (deezerErr) {
|
||||||
|
logger.error(`deezer error: ${deezerErr}`);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Try Amazon third
|
||||||
|
if (streamingURLs?.amazon_url) {
|
||||||
|
try {
|
||||||
|
logger.debug(`trying amazon for: ${trackName} - ${artistName}`);
|
||||||
|
const amazonResponse = await downloadTrack({
|
||||||
|
isrc,
|
||||||
|
service: "amazon",
|
||||||
|
query,
|
||||||
|
track_name: trackName,
|
||||||
|
artist_name: artistName,
|
||||||
|
album_name: albumName,
|
||||||
|
output_dir: outputDir,
|
||||||
|
filename_format: settings.filenameFormat,
|
||||||
|
track_number: settings.trackNumber,
|
||||||
|
position,
|
||||||
|
use_album_track_number: useAlbumTrackNumber,
|
||||||
|
spotify_id: spotifyId,
|
||||||
|
service_url: streamingURLs.amazon_url,
|
||||||
|
item_id: itemID,
|
||||||
|
});
|
||||||
|
|
||||||
|
if (amazonResponse.success) {
|
||||||
|
logger.success(`amazon: ${trackName} - ${artistName}`);
|
||||||
|
return amazonResponse;
|
||||||
|
}
|
||||||
|
logger.warning(`amazon failed, trying qobuz...`);
|
||||||
|
} catch (amazonErr) {
|
||||||
|
logger.error(`amazon error: ${amazonErr}`);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Try Qobuz as last fallback
|
||||||
|
logger.debug(`trying qobuz (fallback) for: ${trackName} - ${artistName}`);
|
||||||
|
const qobuzResponse = await downloadTrack({
|
||||||
|
isrc,
|
||||||
|
service: "qobuz",
|
||||||
|
query,
|
||||||
|
track_name: trackName,
|
||||||
|
artist_name: artistName,
|
||||||
|
album_name: albumName,
|
||||||
|
output_dir: outputDir,
|
||||||
|
filename_format: settings.filenameFormat,
|
||||||
|
track_number: settings.trackNumber,
|
||||||
|
position,
|
||||||
|
use_album_track_number: useAlbumTrackNumber,
|
||||||
|
spotify_id: spotifyId,
|
||||||
|
duration: durationMs ? Math.round(durationMs / 1000) : undefined,
|
||||||
|
item_id: itemID,
|
||||||
|
});
|
||||||
|
|
||||||
|
// If Qobuz also failed, mark the item as failed
|
||||||
|
if (!qobuzResponse.success) {
|
||||||
|
const { MarkDownloadItemFailed } = await import("../../wailsjs/go/main/App");
|
||||||
|
await MarkDownloadItemFailed(itemID, qobuzResponse.error || "All services failed");
|
||||||
|
}
|
||||||
|
|
||||||
|
return qobuzResponse;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Single service download (not auto-fallback)
|
||||||
|
// Convert duration from ms to seconds for backend
|
||||||
|
const durationSecondsForFallback = durationMs ? Math.round(durationMs / 1000) : undefined;
|
||||||
|
|
||||||
|
const singleServiceResponse = await downloadTrack({
|
||||||
|
isrc,
|
||||||
|
service: service as "deezer" | "tidal" | "qobuz" | "amazon",
|
||||||
|
query,
|
||||||
|
track_name: trackName,
|
||||||
|
artist_name: artistName,
|
||||||
|
album_name: albumName,
|
||||||
|
output_dir: outputDir,
|
||||||
|
filename_format: settings.filenameFormat,
|
||||||
|
track_number: settings.trackNumber,
|
||||||
|
position,
|
||||||
|
use_album_track_number: useAlbumTrackNumber,
|
||||||
|
spotify_id: spotifyId,
|
||||||
|
duration: durationSecondsForFallback,
|
||||||
|
item_id: itemID, // Pass itemID for tracking
|
||||||
|
});
|
||||||
|
|
||||||
|
// Mark as failed if download failed for single-service attempt
|
||||||
|
if (!singleServiceResponse.success) {
|
||||||
|
const { MarkDownloadItemFailed } = await import("../../wailsjs/go/main/App");
|
||||||
|
await MarkDownloadItemFailed(itemID, singleServiceResponse.error || "Download failed");
|
||||||
|
}
|
||||||
|
|
||||||
|
return singleServiceResponse;
|
||||||
|
};
|
||||||
|
|
||||||
|
const downloadWithItemID = async (
|
||||||
|
isrc: string,
|
||||||
|
settings: any,
|
||||||
|
itemID: string,
|
||||||
|
trackName?: string,
|
||||||
|
artistName?: string,
|
||||||
|
albumName?: string,
|
||||||
|
playlistName?: string,
|
||||||
|
isArtistDiscography?: boolean,
|
||||||
|
position?: number,
|
||||||
|
spotifyId?: string,
|
||||||
|
durationMs?: number
|
||||||
|
) => {
|
||||||
|
let service = settings.downloader;
|
||||||
|
|
||||||
|
const query = trackName && artistName ? `${trackName} ${artistName}` : undefined;
|
||||||
|
const os = settings.operatingSystem;
|
||||||
|
|
||||||
|
let outputDir = settings.downloadPath;
|
||||||
|
let useAlbumTrackNumber = false;
|
||||||
|
|
||||||
|
if (playlistName) {
|
||||||
|
outputDir = joinPath(os, outputDir, sanitizePath(playlistName, os));
|
||||||
|
|
||||||
|
if (isArtistDiscography) {
|
||||||
|
if (settings.albumSubfolder && albumName) {
|
||||||
|
outputDir = joinPath(os, outputDir, sanitizePath(albumName, os));
|
||||||
|
useAlbumTrackNumber = true;
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
if (settings.artistSubfolder && artistName) {
|
||||||
|
outputDir = joinPath(os, outputDir, sanitizePath(artistName, os));
|
||||||
|
}
|
||||||
|
|
||||||
|
if (settings.albumSubfolder && albumName) {
|
||||||
|
outputDir = joinPath(os, outputDir, sanitizePath(albumName, os));
|
||||||
|
useAlbumTrackNumber = true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (service === "auto") {
|
||||||
|
// Get all streaming URLs once from song.link API
|
||||||
|
let streamingURLs: any = null;
|
||||||
|
if (spotifyId) {
|
||||||
|
try {
|
||||||
|
const { GetStreamingURLs } = await import("../../wailsjs/go/main/App");
|
||||||
|
const urlsJson = await GetStreamingURLs(spotifyId);
|
||||||
|
streamingURLs = JSON.parse(urlsJson);
|
||||||
|
} catch (err) {
|
||||||
|
console.error("Failed to get streaming URLs:", err);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
const durationSeconds = durationMs ? Math.round(durationMs / 1000) : undefined;
|
||||||
|
|
||||||
// Try Tidal first
|
// Try Tidal first
|
||||||
if (streamingURLs?.tidal_url) {
|
if (streamingURLs?.tidal_url) {
|
||||||
try {
|
try {
|
||||||
@@ -87,14 +305,15 @@ export function useDownload() {
|
|||||||
use_album_track_number: useAlbumTrackNumber,
|
use_album_track_number: useAlbumTrackNumber,
|
||||||
spotify_id: spotifyId,
|
spotify_id: spotifyId,
|
||||||
service_url: streamingURLs.tidal_url,
|
service_url: streamingURLs.tidal_url,
|
||||||
|
duration: durationSeconds,
|
||||||
|
item_id: itemID,
|
||||||
});
|
});
|
||||||
|
|
||||||
if (tidalResponse.success) {
|
if (tidalResponse.success) {
|
||||||
return tidalResponse;
|
return tidalResponse;
|
||||||
}
|
}
|
||||||
console.log("Tidal failed, trying Deezer...");
|
|
||||||
} catch (tidalErr) {
|
} catch (tidalErr) {
|
||||||
console.log("Tidal error:", tidalErr);
|
console.error("Tidal error:", tidalErr);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -115,14 +334,14 @@ export function useDownload() {
|
|||||||
use_album_track_number: useAlbumTrackNumber,
|
use_album_track_number: useAlbumTrackNumber,
|
||||||
spotify_id: spotifyId,
|
spotify_id: spotifyId,
|
||||||
service_url: streamingURLs.deezer_url,
|
service_url: streamingURLs.deezer_url,
|
||||||
|
item_id: itemID,
|
||||||
});
|
});
|
||||||
|
|
||||||
if (deezerResponse.success) {
|
if (deezerResponse.success) {
|
||||||
return deezerResponse;
|
return deezerResponse;
|
||||||
}
|
}
|
||||||
console.log("Deezer failed, trying Amazon...");
|
|
||||||
} catch (deezerErr) {
|
} catch (deezerErr) {
|
||||||
console.log("Deezer error:", deezerErr);
|
console.error("Deezer error:", deezerErr);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -143,22 +362,48 @@ export function useDownload() {
|
|||||||
use_album_track_number: useAlbumTrackNumber,
|
use_album_track_number: useAlbumTrackNumber,
|
||||||
spotify_id: spotifyId,
|
spotify_id: spotifyId,
|
||||||
service_url: streamingURLs.amazon_url,
|
service_url: streamingURLs.amazon_url,
|
||||||
|
item_id: itemID,
|
||||||
});
|
});
|
||||||
|
|
||||||
if (amazonResponse.success) {
|
if (amazonResponse.success) {
|
||||||
return amazonResponse;
|
return amazonResponse;
|
||||||
}
|
}
|
||||||
console.log("Amazon failed, trying Qobuz...");
|
|
||||||
} catch (amazonErr) {
|
} catch (amazonErr) {
|
||||||
console.log("Amazon error:", amazonErr);
|
console.error("Amazon error:", amazonErr);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Try Qobuz as last fallback
|
// Try Qobuz as last fallback
|
||||||
service = "qobuz";
|
const qobuzResponse = await downloadTrack({
|
||||||
|
isrc,
|
||||||
|
service: "qobuz",
|
||||||
|
query,
|
||||||
|
track_name: trackName,
|
||||||
|
artist_name: artistName,
|
||||||
|
album_name: albumName,
|
||||||
|
output_dir: outputDir,
|
||||||
|
filename_format: settings.filenameFormat,
|
||||||
|
track_number: settings.trackNumber,
|
||||||
|
position,
|
||||||
|
use_album_track_number: useAlbumTrackNumber,
|
||||||
|
spotify_id: spotifyId,
|
||||||
|
duration: durationMs ? Math.round(durationMs / 1000) : undefined,
|
||||||
|
item_id: itemID,
|
||||||
|
});
|
||||||
|
|
||||||
|
// If Qobuz also failed, mark the item as failed
|
||||||
|
if (!qobuzResponse.success) {
|
||||||
|
const { MarkDownloadItemFailed } = await import("../../wailsjs/go/main/App");
|
||||||
|
await MarkDownloadItemFailed(itemID, qobuzResponse.error || "All services failed");
|
||||||
|
}
|
||||||
|
|
||||||
|
return qobuzResponse;
|
||||||
}
|
}
|
||||||
|
|
||||||
return await downloadTrack({
|
// Single service download
|
||||||
|
const durationSecondsForFallback = durationMs ? Math.round(durationMs / 1000) : undefined;
|
||||||
|
|
||||||
|
const singleServiceResponse = await downloadTrack({
|
||||||
isrc,
|
isrc,
|
||||||
service: service as "deezer" | "tidal" | "qobuz" | "amazon",
|
service: service as "deezer" | "tidal" | "qobuz" | "amazon",
|
||||||
query,
|
query,
|
||||||
@@ -171,7 +416,17 @@ export function useDownload() {
|
|||||||
position,
|
position,
|
||||||
use_album_track_number: useAlbumTrackNumber,
|
use_album_track_number: useAlbumTrackNumber,
|
||||||
spotify_id: spotifyId,
|
spotify_id: spotifyId,
|
||||||
|
duration: durationSecondsForFallback,
|
||||||
|
item_id: itemID,
|
||||||
});
|
});
|
||||||
|
|
||||||
|
// Mark as failed if download failed for single-service attempt
|
||||||
|
if (!singleServiceResponse.success) {
|
||||||
|
const { MarkDownloadItemFailed } = await import("../../wailsjs/go/main/App");
|
||||||
|
await MarkDownloadItemFailed(itemID, singleServiceResponse.error || "Download failed");
|
||||||
|
}
|
||||||
|
|
||||||
|
return singleServiceResponse;
|
||||||
};
|
};
|
||||||
|
|
||||||
const handleDownloadTrack = async (
|
const handleDownloadTrack = async (
|
||||||
@@ -179,42 +434,55 @@ export function useDownload() {
|
|||||||
trackName?: string,
|
trackName?: string,
|
||||||
artistName?: string,
|
artistName?: string,
|
||||||
albumName?: string,
|
albumName?: string,
|
||||||
spotifyId?: string
|
spotifyId?: string,
|
||||||
|
playlistName?: string,
|
||||||
|
isArtistDiscography?: boolean,
|
||||||
|
durationMs?: number
|
||||||
) => {
|
) => {
|
||||||
if (!isrc) {
|
if (!isrc) {
|
||||||
toast.error("No ISRC found for this track");
|
toast.error("No ISRC found for this track");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
logger.info(`starting download: ${trackName} - ${artistName}`);
|
||||||
const settings = getSettings();
|
const settings = getSettings();
|
||||||
setDownloadingTrack(isrc);
|
setDownloadingTrack(isrc);
|
||||||
|
|
||||||
try {
|
try {
|
||||||
// Single track download - no position parameter
|
// Single track download - use playlistName if provided for folder structure
|
||||||
const response = await downloadWithAutoFallback(
|
const response = await downloadWithAutoFallback(
|
||||||
isrc,
|
isrc,
|
||||||
settings,
|
settings,
|
||||||
trackName,
|
trackName,
|
||||||
artistName,
|
artistName,
|
||||||
albumName,
|
albumName,
|
||||||
undefined,
|
playlistName,
|
||||||
false,
|
isArtistDiscography,
|
||||||
undefined, // Don't pass position for single track
|
undefined, // Don't pass position for single track
|
||||||
spotifyId
|
spotifyId,
|
||||||
|
durationMs
|
||||||
);
|
);
|
||||||
|
|
||||||
if (response.success) {
|
if (response.success) {
|
||||||
if (response.already_exists) {
|
if (response.already_exists) {
|
||||||
toast.info(response.message);
|
toast.info(response.message);
|
||||||
|
setSkippedTracks((prev) => new Set(prev).add(isrc));
|
||||||
} else {
|
} else {
|
||||||
toast.success(response.message);
|
toast.success(response.message);
|
||||||
}
|
}
|
||||||
setDownloadedTracks((prev) => new Set(prev).add(isrc));
|
setDownloadedTracks((prev) => new Set(prev).add(isrc));
|
||||||
|
setFailedTracks((prev) => {
|
||||||
|
const newSet = new Set(prev);
|
||||||
|
newSet.delete(isrc);
|
||||||
|
return newSet;
|
||||||
|
});
|
||||||
} else {
|
} else {
|
||||||
toast.error(response.error || "Download failed");
|
toast.error(response.error || "Download failed");
|
||||||
|
setFailedTracks((prev) => new Set(prev).add(isrc));
|
||||||
}
|
}
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
toast.error(err instanceof Error ? err.message : "Download failed");
|
toast.error(err instanceof Error ? err.message : "Download failed");
|
||||||
|
setFailedTracks((prev) => new Set(prev).add(isrc));
|
||||||
} finally {
|
} finally {
|
||||||
setDownloadingTrack(null);
|
setDownloadingTrack(null);
|
||||||
}
|
}
|
||||||
@@ -231,11 +499,26 @@ export function useDownload() {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
logger.info(`starting batch download: ${selectedTracks.length} selected tracks`);
|
||||||
const settings = getSettings();
|
const settings = getSettings();
|
||||||
setIsDownloading(true);
|
setIsDownloading(true);
|
||||||
setBulkDownloadType("selected");
|
setBulkDownloadType("selected");
|
||||||
setDownloadProgress(0);
|
setDownloadProgress(0);
|
||||||
|
|
||||||
|
// Pre-add ALL tracks to the queue before starting downloads
|
||||||
|
const { AddToDownloadQueue } = await import("../../wailsjs/go/main/App");
|
||||||
|
const itemIDs: string[] = [];
|
||||||
|
for (const isrc of selectedTracks) {
|
||||||
|
const track = allTracks.find((t) => t.isrc === isrc);
|
||||||
|
const itemID = await AddToDownloadQueue(
|
||||||
|
isrc,
|
||||||
|
track?.name || "",
|
||||||
|
track?.artists || "",
|
||||||
|
track?.album_name || ""
|
||||||
|
);
|
||||||
|
itemIDs.push(itemID);
|
||||||
|
}
|
||||||
|
|
||||||
let successCount = 0;
|
let successCount = 0;
|
||||||
let errorCount = 0;
|
let errorCount = 0;
|
||||||
let skippedCount = 0;
|
let skippedCount = 0;
|
||||||
@@ -251,6 +534,7 @@ export function useDownload() {
|
|||||||
|
|
||||||
const isrc = selectedTracks[i];
|
const isrc = selectedTracks[i];
|
||||||
const track = allTracks.find((t) => t.isrc === isrc);
|
const track = allTracks.find((t) => t.isrc === isrc);
|
||||||
|
const itemID = itemIDs[i];
|
||||||
|
|
||||||
setDownloadingTrack(isrc);
|
setDownloadingTrack(isrc);
|
||||||
|
|
||||||
@@ -259,25 +543,29 @@ export function useDownload() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
try {
|
try {
|
||||||
// Use sequential numbering (1, 2, 3...) for selected tracks
|
// Download with pre-created itemID
|
||||||
const response = await downloadWithAutoFallback(
|
const response = await downloadWithItemID(
|
||||||
isrc,
|
isrc,
|
||||||
settings,
|
settings,
|
||||||
|
itemID,
|
||||||
track?.name,
|
track?.name,
|
||||||
track?.artists,
|
track?.artists,
|
||||||
track?.album_name,
|
track?.album_name,
|
||||||
playlistName,
|
playlistName,
|
||||||
isArtistDiscography,
|
isArtistDiscography,
|
||||||
i + 1, // Sequential position based on selection order
|
i + 1, // Sequential position based on selection order
|
||||||
track?.spotify_id
|
track?.spotify_id,
|
||||||
|
track?.duration_ms
|
||||||
);
|
);
|
||||||
|
|
||||||
if (response.success) {
|
if (response.success) {
|
||||||
if (response.already_exists) {
|
if (response.already_exists) {
|
||||||
skippedCount++;
|
skippedCount++;
|
||||||
console.log(`Skipped: ${track?.name} - ${track?.artists} (already exists)`);
|
logger.info(`skipped: ${track?.name} - ${track?.artists} (already exists)`);
|
||||||
|
setSkippedTracks((prev) => new Set(prev).add(isrc));
|
||||||
} else {
|
} else {
|
||||||
successCount++;
|
successCount++;
|
||||||
|
logger.success(`downloaded: ${track?.name} - ${track?.artists}`);
|
||||||
}
|
}
|
||||||
setDownloadedTracks((prev) => new Set(prev).add(isrc));
|
setDownloadedTracks((prev) => new Set(prev).add(isrc));
|
||||||
setFailedTracks((prev) => {
|
setFailedTracks((prev) => {
|
||||||
@@ -287,11 +575,16 @@ export function useDownload() {
|
|||||||
});
|
});
|
||||||
} else {
|
} else {
|
||||||
errorCount++;
|
errorCount++;
|
||||||
|
logger.error(`failed: ${track?.name} - ${track?.artists}`);
|
||||||
setFailedTracks((prev) => new Set(prev).add(isrc));
|
setFailedTracks((prev) => new Set(prev).add(isrc));
|
||||||
}
|
}
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
errorCount++;
|
errorCount++;
|
||||||
|
logger.error(`error: ${track?.name} - ${err}`);
|
||||||
setFailedTracks((prev) => new Set(prev).add(isrc));
|
setFailedTracks((prev) => new Set(prev).add(isrc));
|
||||||
|
// Mark item as failed in queue
|
||||||
|
const { MarkDownloadItemFailed } = await import("../../wailsjs/go/main/App");
|
||||||
|
await MarkDownloadItemFailed(itemID, err instanceof Error ? err.message : String(err));
|
||||||
}
|
}
|
||||||
|
|
||||||
setDownloadProgress(Math.round(((i + 1) / total) * 100));
|
setDownloadProgress(Math.round(((i + 1) / total) * 100));
|
||||||
@@ -303,7 +596,12 @@ export function useDownload() {
|
|||||||
setBulkDownloadType(null);
|
setBulkDownloadType(null);
|
||||||
shouldStopDownloadRef.current = false;
|
shouldStopDownloadRef.current = false;
|
||||||
|
|
||||||
|
// Cancel any remaining queued items
|
||||||
|
const { CancelAllQueuedItems } = await import("../../wailsjs/go/main/App");
|
||||||
|
await CancelAllQueuedItems();
|
||||||
|
|
||||||
// Build summary message
|
// Build summary message
|
||||||
|
logger.info(`batch complete: ${successCount} downloaded, ${skippedCount} skipped, ${errorCount} failed`);
|
||||||
if (errorCount === 0 && skippedCount === 0) {
|
if (errorCount === 0 && skippedCount === 0) {
|
||||||
toast.success(`Downloaded ${successCount} tracks successfully`);
|
toast.success(`Downloaded ${successCount} tracks successfully`);
|
||||||
} else if (errorCount === 0 && successCount === 0) {
|
} else if (errorCount === 0 && successCount === 0) {
|
||||||
@@ -334,11 +632,25 @@ export function useDownload() {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
logger.info(`starting batch download: ${tracksWithIsrc.length} tracks`);
|
||||||
const settings = getSettings();
|
const settings = getSettings();
|
||||||
setIsDownloading(true);
|
setIsDownloading(true);
|
||||||
setBulkDownloadType("all");
|
setBulkDownloadType("all");
|
||||||
setDownloadProgress(0);
|
setDownloadProgress(0);
|
||||||
|
|
||||||
|
// Pre-add ALL tracks to the queue before starting downloads
|
||||||
|
const { AddToDownloadQueue } = await import("../../wailsjs/go/main/App");
|
||||||
|
const itemIDs: string[] = [];
|
||||||
|
for (const track of tracksWithIsrc) {
|
||||||
|
const itemID = await AddToDownloadQueue(
|
||||||
|
track.isrc,
|
||||||
|
track.name,
|
||||||
|
track.artists,
|
||||||
|
track.album_name || ""
|
||||||
|
);
|
||||||
|
itemIDs.push(itemID);
|
||||||
|
}
|
||||||
|
|
||||||
let successCount = 0;
|
let successCount = 0;
|
||||||
let errorCount = 0;
|
let errorCount = 0;
|
||||||
let skippedCount = 0;
|
let skippedCount = 0;
|
||||||
@@ -353,29 +665,34 @@ export function useDownload() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
const track = tracksWithIsrc[i];
|
const track = tracksWithIsrc[i];
|
||||||
|
const itemID = itemIDs[i];
|
||||||
|
|
||||||
setDownloadingTrack(track.isrc);
|
setDownloadingTrack(track.isrc);
|
||||||
setCurrentDownloadInfo({ name: track.name, artists: track.artists });
|
setCurrentDownloadInfo({ name: track.name, artists: track.artists });
|
||||||
|
|
||||||
try {
|
try {
|
||||||
const response = await downloadWithAutoFallback(
|
const response = await downloadWithItemID(
|
||||||
track.isrc,
|
track.isrc,
|
||||||
settings,
|
settings,
|
||||||
|
itemID,
|
||||||
track.name,
|
track.name,
|
||||||
track.artists,
|
track.artists,
|
||||||
track.album_name,
|
track.album_name,
|
||||||
playlistName,
|
playlistName,
|
||||||
isArtistDiscography,
|
isArtistDiscography,
|
||||||
i + 1,
|
i + 1,
|
||||||
track.spotify_id
|
track.spotify_id,
|
||||||
|
track.duration_ms
|
||||||
);
|
);
|
||||||
|
|
||||||
if (response.success) {
|
if (response.success) {
|
||||||
if (response.already_exists) {
|
if (response.already_exists) {
|
||||||
skippedCount++;
|
skippedCount++;
|
||||||
console.log(`Skipped: ${track.name} - ${track.artists} (already exists)`);
|
logger.info(`skipped: ${track.name} - ${track.artists} (already exists)`);
|
||||||
|
setSkippedTracks((prev) => new Set(prev).add(track.isrc));
|
||||||
} else {
|
} else {
|
||||||
successCount++;
|
successCount++;
|
||||||
|
logger.success(`downloaded: ${track.name} - ${track.artists}`);
|
||||||
}
|
}
|
||||||
setDownloadedTracks((prev) => new Set(prev).add(track.isrc));
|
setDownloadedTracks((prev) => new Set(prev).add(track.isrc));
|
||||||
setFailedTracks((prev) => {
|
setFailedTracks((prev) => {
|
||||||
@@ -385,11 +702,16 @@ export function useDownload() {
|
|||||||
});
|
});
|
||||||
} else {
|
} else {
|
||||||
errorCount++;
|
errorCount++;
|
||||||
|
logger.error(`failed: ${track.name} - ${track.artists}`);
|
||||||
setFailedTracks((prev) => new Set(prev).add(track.isrc));
|
setFailedTracks((prev) => new Set(prev).add(track.isrc));
|
||||||
}
|
}
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
errorCount++;
|
errorCount++;
|
||||||
|
logger.error(`error: ${track.name} - ${err}`);
|
||||||
setFailedTracks((prev) => new Set(prev).add(track.isrc));
|
setFailedTracks((prev) => new Set(prev).add(track.isrc));
|
||||||
|
// Mark item as failed in queue
|
||||||
|
const { MarkDownloadItemFailed } = await import("../../wailsjs/go/main/App");
|
||||||
|
await MarkDownloadItemFailed(itemID, err instanceof Error ? err.message : String(err));
|
||||||
}
|
}
|
||||||
|
|
||||||
setDownloadProgress(Math.round(((i + 1) / total) * 100));
|
setDownloadProgress(Math.round(((i + 1) / total) * 100));
|
||||||
@@ -401,7 +723,12 @@ export function useDownload() {
|
|||||||
setBulkDownloadType(null);
|
setBulkDownloadType(null);
|
||||||
shouldStopDownloadRef.current = false;
|
shouldStopDownloadRef.current = false;
|
||||||
|
|
||||||
|
// Cancel any remaining queued items
|
||||||
|
const { CancelAllQueuedItems: CancelQueued } = await import("../../wailsjs/go/main/App");
|
||||||
|
await CancelQueued();
|
||||||
|
|
||||||
// Build summary message
|
// Build summary message
|
||||||
|
logger.info(`batch complete: ${successCount} downloaded, ${skippedCount} skipped, ${errorCount} failed`);
|
||||||
if (errorCount === 0 && skippedCount === 0) {
|
if (errorCount === 0 && skippedCount === 0) {
|
||||||
toast.success(`Downloaded ${successCount} tracks successfully`);
|
toast.success(`Downloaded ${successCount} tracks successfully`);
|
||||||
} else if (errorCount === 0 && successCount === 0) {
|
} else if (errorCount === 0 && successCount === 0) {
|
||||||
@@ -421,6 +748,7 @@ export function useDownload() {
|
|||||||
};
|
};
|
||||||
|
|
||||||
const handleStopDownload = () => {
|
const handleStopDownload = () => {
|
||||||
|
logger.info("download stopped by user");
|
||||||
shouldStopDownloadRef.current = true;
|
shouldStopDownloadRef.current = true;
|
||||||
toast.info("Stopping download...");
|
toast.info("Stopping download...");
|
||||||
};
|
};
|
||||||
@@ -428,6 +756,7 @@ export function useDownload() {
|
|||||||
const resetDownloadedTracks = () => {
|
const resetDownloadedTracks = () => {
|
||||||
setDownloadedTracks(new Set());
|
setDownloadedTracks(new Set());
|
||||||
setFailedTracks(new Set());
|
setFailedTracks(new Set());
|
||||||
|
setSkippedTracks(new Set());
|
||||||
};
|
};
|
||||||
|
|
||||||
return {
|
return {
|
||||||
@@ -437,6 +766,7 @@ export function useDownload() {
|
|||||||
bulkDownloadType,
|
bulkDownloadType,
|
||||||
downloadedTracks,
|
downloadedTracks,
|
||||||
failedTracks,
|
failedTracks,
|
||||||
|
skippedTracks,
|
||||||
currentDownloadInfo,
|
currentDownloadInfo,
|
||||||
handleDownloadTrack,
|
handleDownloadTrack,
|
||||||
handleDownloadSelected,
|
handleDownloadSelected,
|
||||||
|
|||||||
@@ -0,0 +1,40 @@
|
|||||||
|
import { useEffect, useState } from "react";
|
||||||
|
import { GetDownloadQueue } from "../../wailsjs/go/main/App";
|
||||||
|
import { backend } from "../../wailsjs/go/models";
|
||||||
|
|
||||||
|
export function useDownloadQueueData() {
|
||||||
|
const [queueInfo, setQueueInfo] = useState<backend.DownloadQueueInfo>(
|
||||||
|
new backend.DownloadQueueInfo({
|
||||||
|
is_downloading: false,
|
||||||
|
queue: [],
|
||||||
|
current_speed: 0,
|
||||||
|
total_downloaded: 0,
|
||||||
|
session_start_time: 0,
|
||||||
|
queued_count: 0,
|
||||||
|
completed_count: 0,
|
||||||
|
failed_count: 0,
|
||||||
|
skipped_count: 0,
|
||||||
|
})
|
||||||
|
);
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
const fetchQueue = async () => {
|
||||||
|
try {
|
||||||
|
const info = await GetDownloadQueue();
|
||||||
|
setQueueInfo(info);
|
||||||
|
} catch (error) {
|
||||||
|
console.error("Failed to get download queue:", error);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
// Initial fetch
|
||||||
|
fetchQueue();
|
||||||
|
|
||||||
|
// Poll every 200ms
|
||||||
|
const interval = setInterval(fetchQueue, 200);
|
||||||
|
|
||||||
|
return () => clearInterval(interval);
|
||||||
|
}, []);
|
||||||
|
|
||||||
|
return queueInfo;
|
||||||
|
}
|
||||||
@@ -0,0 +1,16 @@
|
|||||||
|
import { useState } from "react";
|
||||||
|
|
||||||
|
export function useDownloadQueueDialog() {
|
||||||
|
const [isOpen, setIsOpen] = useState(false);
|
||||||
|
|
||||||
|
const openQueue = () => setIsOpen(true);
|
||||||
|
const closeQueue = () => setIsOpen(false);
|
||||||
|
const toggleQueue = () => setIsOpen((prev) => !prev);
|
||||||
|
|
||||||
|
return {
|
||||||
|
isOpen,
|
||||||
|
openQueue,
|
||||||
|
closeQueue,
|
||||||
|
toggleQueue,
|
||||||
|
};
|
||||||
|
}
|
||||||
@@ -0,0 +1,104 @@
|
|||||||
|
import { useState } from "react";
|
||||||
|
import { downloadLyrics } from "@/lib/api";
|
||||||
|
import { getSettings } from "@/lib/settings";
|
||||||
|
import { toastWithSound as toast } from "@/lib/toast-with-sound";
|
||||||
|
import { joinPath, sanitizePath } from "@/lib/utils";
|
||||||
|
import { logger } from "@/lib/logger";
|
||||||
|
|
||||||
|
export function useLyrics() {
|
||||||
|
const [downloadingLyricsTrack, setDownloadingLyricsTrack] = useState<string | null>(null);
|
||||||
|
const [downloadedLyrics, setDownloadedLyrics] = useState<Set<string>>(new Set());
|
||||||
|
const [failedLyrics, setFailedLyrics] = useState<Set<string>>(new Set());
|
||||||
|
const [skippedLyrics, setSkippedLyrics] = useState<Set<string>>(new Set());
|
||||||
|
|
||||||
|
const handleDownloadLyrics = async (
|
||||||
|
spotifyId: string,
|
||||||
|
trackName: string,
|
||||||
|
artistName: string,
|
||||||
|
albumName?: string,
|
||||||
|
playlistName?: string,
|
||||||
|
isArtistDiscography?: boolean,
|
||||||
|
position?: number
|
||||||
|
) => {
|
||||||
|
if (!spotifyId) {
|
||||||
|
toast.error("No Spotify ID found for this track");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
logger.info(`downloading lyrics: ${trackName} - ${artistName}`);
|
||||||
|
const settings = getSettings();
|
||||||
|
setDownloadingLyricsTrack(spotifyId);
|
||||||
|
|
||||||
|
try {
|
||||||
|
const os = settings.operatingSystem;
|
||||||
|
let outputDir = settings.downloadPath;
|
||||||
|
|
||||||
|
// Build output path similar to audio download
|
||||||
|
if (playlistName) {
|
||||||
|
outputDir = joinPath(os, outputDir, sanitizePath(playlistName, os));
|
||||||
|
|
||||||
|
if (isArtistDiscography) {
|
||||||
|
if (settings.albumSubfolder && albumName) {
|
||||||
|
outputDir = joinPath(os, outputDir, sanitizePath(albumName, os));
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
if (settings.artistSubfolder && artistName) {
|
||||||
|
outputDir = joinPath(os, outputDir, sanitizePath(artistName, os));
|
||||||
|
}
|
||||||
|
if (settings.albumSubfolder && albumName) {
|
||||||
|
outputDir = joinPath(os, outputDir, sanitizePath(albumName, os));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
const response = await downloadLyrics({
|
||||||
|
spotify_id: spotifyId,
|
||||||
|
track_name: trackName,
|
||||||
|
artist_name: artistName,
|
||||||
|
output_dir: outputDir,
|
||||||
|
filename_format: settings.filenameFormat,
|
||||||
|
track_number: settings.trackNumber,
|
||||||
|
position: position || 0,
|
||||||
|
use_album_track_number: settings.albumSubfolder,
|
||||||
|
});
|
||||||
|
|
||||||
|
if (response.success) {
|
||||||
|
if (response.already_exists) {
|
||||||
|
toast.info("Lyrics file already exists");
|
||||||
|
setSkippedLyrics((prev) => new Set(prev).add(spotifyId));
|
||||||
|
} else {
|
||||||
|
toast.success("Lyrics downloaded successfully");
|
||||||
|
setDownloadedLyrics((prev) => new Set(prev).add(spotifyId));
|
||||||
|
}
|
||||||
|
setFailedLyrics((prev) => {
|
||||||
|
const newSet = new Set(prev);
|
||||||
|
newSet.delete(spotifyId);
|
||||||
|
return newSet;
|
||||||
|
});
|
||||||
|
} else {
|
||||||
|
toast.error(response.error || "Failed to download lyrics");
|
||||||
|
setFailedLyrics((prev) => new Set(prev).add(spotifyId));
|
||||||
|
}
|
||||||
|
} catch (err) {
|
||||||
|
toast.error(err instanceof Error ? err.message : "Failed to download lyrics");
|
||||||
|
setFailedLyrics((prev) => new Set(prev).add(spotifyId));
|
||||||
|
} finally {
|
||||||
|
setDownloadingLyricsTrack(null);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
const resetLyricsState = () => {
|
||||||
|
setDownloadedLyrics(new Set());
|
||||||
|
setFailedLyrics(new Set());
|
||||||
|
setSkippedLyrics(new Set());
|
||||||
|
};
|
||||||
|
|
||||||
|
return {
|
||||||
|
downloadingLyricsTrack,
|
||||||
|
downloadedLyrics,
|
||||||
|
failedLyrics,
|
||||||
|
skippedLyrics,
|
||||||
|
handleDownloadLyrics,
|
||||||
|
resetLyricsState,
|
||||||
|
};
|
||||||
|
}
|
||||||
@@ -1,6 +1,7 @@
|
|||||||
import { useState } from "react";
|
import { useState } from "react";
|
||||||
import { fetchSpotifyMetadata } from "@/lib/api";
|
import { fetchSpotifyMetadata } from "@/lib/api";
|
||||||
import { toastWithSound as toast } from "@/lib/toast-with-sound";
|
import { toastWithSound as toast } from "@/lib/toast-with-sound";
|
||||||
|
import { logger } from "@/lib/logger";
|
||||||
import type { SpotifyMetadataResponse } from "@/types/api";
|
import type { SpotifyMetadataResponse } from "@/types/api";
|
||||||
|
|
||||||
export function useMetadata() {
|
export function useMetadata() {
|
||||||
@@ -15,17 +16,52 @@ export function useMetadata() {
|
|||||||
name: string;
|
name: string;
|
||||||
external_urls: string;
|
external_urls: string;
|
||||||
} | null>(null);
|
} | null>(null);
|
||||||
|
const [pendingArtistName, setPendingArtistName] = useState<string | null>(null);
|
||||||
|
|
||||||
|
const getUrlType = (url: string): string => {
|
||||||
|
if (url.includes("/track/")) return "track";
|
||||||
|
if (url.includes("/album/")) return "album";
|
||||||
|
if (url.includes("/playlist/")) return "playlist";
|
||||||
|
if (url.includes("/artist/")) return "artist";
|
||||||
|
return "unknown";
|
||||||
|
};
|
||||||
|
|
||||||
const fetchMetadataDirectly = async (url: string) => {
|
const fetchMetadataDirectly = async (url: string) => {
|
||||||
|
const urlType = getUrlType(url);
|
||||||
|
logger.info(`fetching ${urlType} metadata...`);
|
||||||
|
logger.debug(`url: ${url}`);
|
||||||
|
|
||||||
setLoading(true);
|
setLoading(true);
|
||||||
setMetadata(null);
|
setMetadata(null);
|
||||||
|
|
||||||
try {
|
try {
|
||||||
|
const startTime = Date.now();
|
||||||
const data = await fetchSpotifyMetadata(url);
|
const data = await fetchSpotifyMetadata(url);
|
||||||
|
const elapsed = ((Date.now() - startTime) / 1000).toFixed(2);
|
||||||
|
|
||||||
setMetadata(data);
|
setMetadata(data);
|
||||||
|
|
||||||
|
// Log detailed info based on type
|
||||||
|
if ("track" in data) {
|
||||||
|
logger.success(`fetched track: ${data.track.name} - ${data.track.artists}`);
|
||||||
|
logger.debug(`isrc: ${data.track.isrc}, duration: ${data.track.duration_ms}ms`);
|
||||||
|
} else if ("album_info" in data) {
|
||||||
|
logger.success(`fetched album: ${data.album_info.name}`);
|
||||||
|
logger.debug(`${data.track_list.length} tracks, released: ${data.album_info.release_date}`);
|
||||||
|
} else if ("playlist_info" in data) {
|
||||||
|
logger.success(`fetched playlist: ${data.track_list.length} tracks`);
|
||||||
|
logger.debug(`by ${data.playlist_info.owner.display_name || data.playlist_info.owner.name}`);
|
||||||
|
} else if ("artist_info" in data) {
|
||||||
|
logger.success(`fetched artist: ${data.artist_info.name}`);
|
||||||
|
logger.debug(`${data.album_list.length} albums, ${data.track_list.length} tracks`);
|
||||||
|
}
|
||||||
|
|
||||||
|
logger.info(`fetch completed in ${elapsed}s`);
|
||||||
toast.success("Metadata fetched successfully");
|
toast.success("Metadata fetched successfully");
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
toast.error(err instanceof Error ? err.message : "Failed to fetch metadata");
|
const errorMsg = err instanceof Error ? err.message : "Failed to fetch metadata";
|
||||||
|
logger.error(`fetch failed: ${errorMsg}`);
|
||||||
|
toast.error(errorMsg);
|
||||||
} finally {
|
} finally {
|
||||||
setLoading(false);
|
setLoading(false);
|
||||||
}
|
}
|
||||||
@@ -33,6 +69,7 @@ export function useMetadata() {
|
|||||||
|
|
||||||
const handleFetchMetadata = async (url: string) => {
|
const handleFetchMetadata = async (url: string) => {
|
||||||
if (!url.trim()) {
|
if (!url.trim()) {
|
||||||
|
logger.warning("empty url provided");
|
||||||
toast.error("Please enter a Spotify URL");
|
toast.error("Please enter a Spotify URL");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@@ -42,10 +79,13 @@ export function useMetadata() {
|
|||||||
|
|
||||||
if (isArtistUrl && !urlToFetch.includes("/discography")) {
|
if (isArtistUrl && !urlToFetch.includes("/discography")) {
|
||||||
urlToFetch = urlToFetch.replace(/\/$/, "") + "/discography/all";
|
urlToFetch = urlToFetch.replace(/\/$/, "") + "/discography/all";
|
||||||
|
logger.debug("converted to discography url");
|
||||||
}
|
}
|
||||||
|
|
||||||
if (isArtistUrl) {
|
if (isArtistUrl) {
|
||||||
|
logger.info("artist url detected, showing timeout dialog");
|
||||||
setPendingUrl(urlToFetch);
|
setPendingUrl(urlToFetch);
|
||||||
|
setPendingArtistName(null); // Clear artist name for URL input
|
||||||
setShowTimeoutDialog(true);
|
setShowTimeoutDialog(true);
|
||||||
} else {
|
} else {
|
||||||
await fetchMetadataDirectly(urlToFetch);
|
await fetchMetadataDirectly(urlToFetch);
|
||||||
@@ -56,15 +96,30 @@ export function useMetadata() {
|
|||||||
|
|
||||||
const handleConfirmFetch = async () => {
|
const handleConfirmFetch = async () => {
|
||||||
setShowTimeoutDialog(false);
|
setShowTimeoutDialog(false);
|
||||||
|
logger.info(`fetching artist discography (timeout: ${timeoutValue}s)...`);
|
||||||
|
logger.debug(`url: ${pendingUrl}`);
|
||||||
|
|
||||||
setLoading(true);
|
setLoading(true);
|
||||||
setMetadata(null);
|
setMetadata(null);
|
||||||
|
|
||||||
try {
|
try {
|
||||||
|
const startTime = Date.now();
|
||||||
const data = await fetchSpotifyMetadata(pendingUrl, true, 1.0, timeoutValue);
|
const data = await fetchSpotifyMetadata(pendingUrl, true, 1.0, timeoutValue);
|
||||||
|
const elapsed = ((Date.now() - startTime) / 1000).toFixed(2);
|
||||||
|
|
||||||
setMetadata(data);
|
setMetadata(data);
|
||||||
|
|
||||||
|
if ("artist_info" in data) {
|
||||||
|
logger.success(`fetched artist: ${data.artist_info.name}`);
|
||||||
|
logger.debug(`${data.album_list.length} albums, ${data.track_list.length} tracks`);
|
||||||
|
}
|
||||||
|
|
||||||
|
logger.info(`fetch completed in ${elapsed}s`);
|
||||||
toast.success("Metadata fetched successfully");
|
toast.success("Metadata fetched successfully");
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
toast.error(err instanceof Error ? err.message : "Failed to fetch metadata");
|
const errorMsg = err instanceof Error ? err.message : "Failed to fetch metadata";
|
||||||
|
logger.error(`fetch failed: ${errorMsg}`);
|
||||||
|
toast.error(errorMsg);
|
||||||
} finally {
|
} finally {
|
||||||
setLoading(false);
|
setLoading(false);
|
||||||
}
|
}
|
||||||
@@ -75,23 +130,54 @@ export function useMetadata() {
|
|||||||
name: string;
|
name: string;
|
||||||
external_urls: string;
|
external_urls: string;
|
||||||
}) => {
|
}) => {
|
||||||
|
logger.debug(`album clicked: ${album.name}`);
|
||||||
setSelectedAlbum(album);
|
setSelectedAlbum(album);
|
||||||
setShowAlbumDialog(true);
|
setShowAlbumDialog(true);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
const handleArtistClick = async (artist: {
|
||||||
|
id: string;
|
||||||
|
name: string;
|
||||||
|
external_urls: string;
|
||||||
|
}) => {
|
||||||
|
logger.debug(`artist clicked: ${artist.name}`);
|
||||||
|
const artistUrl = artist.external_urls.replace(/\/$/, "") + "/discography/all";
|
||||||
|
setPendingUrl(artistUrl);
|
||||||
|
setPendingArtistName(artist.name);
|
||||||
|
setShowTimeoutDialog(true);
|
||||||
|
return artistUrl;
|
||||||
|
};
|
||||||
|
|
||||||
const handleConfirmAlbumFetch = async () => {
|
const handleConfirmAlbumFetch = async () => {
|
||||||
if (!selectedAlbum) return;
|
if (!selectedAlbum) return;
|
||||||
|
|
||||||
|
const albumUrl = selectedAlbum.external_urls;
|
||||||
|
logger.info(`fetching album: ${selectedAlbum.name}...`);
|
||||||
|
logger.debug(`url: ${albumUrl}`);
|
||||||
|
|
||||||
setShowAlbumDialog(false);
|
setShowAlbumDialog(false);
|
||||||
setLoading(true);
|
setLoading(true);
|
||||||
setMetadata(null);
|
setMetadata(null);
|
||||||
|
|
||||||
try {
|
try {
|
||||||
const data = await fetchSpotifyMetadata(selectedAlbum.external_urls);
|
const startTime = Date.now();
|
||||||
|
const data = await fetchSpotifyMetadata(albumUrl);
|
||||||
|
const elapsed = ((Date.now() - startTime) / 1000).toFixed(2);
|
||||||
|
|
||||||
setMetadata(data);
|
setMetadata(data);
|
||||||
|
|
||||||
|
if ("album_info" in data) {
|
||||||
|
logger.success(`fetched album: ${data.album_info.name}`);
|
||||||
|
logger.debug(`${data.track_list.length} tracks, released: ${data.album_info.release_date}`);
|
||||||
|
}
|
||||||
|
|
||||||
|
logger.info(`fetch completed in ${elapsed}s`);
|
||||||
toast.success("Album metadata fetched successfully");
|
toast.success("Album metadata fetched successfully");
|
||||||
|
return albumUrl;
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
toast.error(err instanceof Error ? err.message : "Failed to fetch album metadata");
|
const errorMsg = err instanceof Error ? err.message : "Failed to fetch album metadata";
|
||||||
|
logger.error(`fetch failed: ${errorMsg}`);
|
||||||
|
toast.error(errorMsg);
|
||||||
} finally {
|
} finally {
|
||||||
setLoading(false);
|
setLoading(false);
|
||||||
setSelectedAlbum(null);
|
setSelectedAlbum(null);
|
||||||
@@ -108,9 +194,11 @@ export function useMetadata() {
|
|||||||
showAlbumDialog,
|
showAlbumDialog,
|
||||||
setShowAlbumDialog,
|
setShowAlbumDialog,
|
||||||
selectedAlbum,
|
selectedAlbum,
|
||||||
|
pendingArtistName,
|
||||||
handleFetchMetadata,
|
handleFetchMetadata,
|
||||||
handleConfirmFetch,
|
handleConfirmFetch,
|
||||||
handleAlbumClick,
|
handleAlbumClick,
|
||||||
handleConfirmAlbumFetch,
|
handleConfirmAlbumFetch,
|
||||||
|
handleArtistClick,
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
+53
-1
@@ -119,10 +119,14 @@
|
|||||||
font-family: "Google Sans Flex", system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, sans-serif;
|
font-family: "Google Sans Flex", system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, sans-serif;
|
||||||
}
|
}
|
||||||
code, pre, .font-mono {
|
code, pre, .font-mono {
|
||||||
font-family: "Google Sans Code", ui-monospace, SFMono-Regular, "SF Mono", Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace;
|
font-family: "Google Sans Code", ui-monospace, SFMono-Regular, "SF Mono", Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace !important;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@theme inline {
|
||||||
|
--font-mono: "Google Sans Code", ui-monospace, SFMono-Regular, "SF Mono", Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace;
|
||||||
|
}
|
||||||
|
|
||||||
/* Sonner Toast Styling */
|
/* Sonner Toast Styling */
|
||||||
[data-sonner-toast] {
|
[data-sonner-toast] {
|
||||||
@apply rounded-lg shadow-lg border;
|
@apply rounded-lg shadow-lg border;
|
||||||
@@ -192,3 +196,51 @@
|
|||||||
.dark [data-sonner-toast][data-type="info"] [data-icon] {
|
.dark [data-sonner-toast][data-type="info"] [data-icon] {
|
||||||
@apply text-blue-400;
|
@apply text-blue-400;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* Custom Scrollbar - mengikuti primary color theme */
|
||||||
|
::-webkit-scrollbar {
|
||||||
|
width: 8px;
|
||||||
|
height: 8px;
|
||||||
|
}
|
||||||
|
|
||||||
|
::-webkit-scrollbar-track {
|
||||||
|
background: var(--secondary);
|
||||||
|
border-radius: 4px;
|
||||||
|
}
|
||||||
|
|
||||||
|
::-webkit-scrollbar-thumb {
|
||||||
|
background: var(--primary);
|
||||||
|
border-radius: 4px;
|
||||||
|
opacity: 0.7;
|
||||||
|
}
|
||||||
|
|
||||||
|
::-webkit-scrollbar-thumb:hover {
|
||||||
|
background: var(--primary);
|
||||||
|
filter: brightness(1.2);
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Firefox scrollbar support */
|
||||||
|
* {
|
||||||
|
scrollbar-width: thin;
|
||||||
|
scrollbar-color: var(--primary) var(--secondary);
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Custom scrollbar class untuk komponen tertentu */
|
||||||
|
.custom-scrollbar::-webkit-scrollbar {
|
||||||
|
width: 6px;
|
||||||
|
height: 6px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.custom-scrollbar::-webkit-scrollbar-track {
|
||||||
|
background: var(--muted);
|
||||||
|
border-radius: 3px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.custom-scrollbar::-webkit-scrollbar-thumb {
|
||||||
|
background: var(--primary);
|
||||||
|
border-radius: 3px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.custom-scrollbar::-webkit-scrollbar-thumb:hover {
|
||||||
|
filter: brightness(1.2);
|
||||||
|
}
|
||||||
|
|||||||
+19
-1
@@ -3,8 +3,12 @@ import type {
|
|||||||
DownloadRequest,
|
DownloadRequest,
|
||||||
DownloadResponse,
|
DownloadResponse,
|
||||||
HealthResponse,
|
HealthResponse,
|
||||||
|
LyricsDownloadRequest,
|
||||||
|
LyricsDownloadResponse,
|
||||||
|
CoverDownloadRequest,
|
||||||
|
CoverDownloadResponse,
|
||||||
} from "@/types/api";
|
} from "@/types/api";
|
||||||
import { GetSpotifyMetadata, DownloadTrack } from "../../wailsjs/go/main/App";
|
import { GetSpotifyMetadata, DownloadTrack, DownloadLyrics, DownloadCover } from "../../wailsjs/go/main/App";
|
||||||
import { main } from "../../wailsjs/go/models";
|
import { main } from "../../wailsjs/go/models";
|
||||||
|
|
||||||
export async function fetchSpotifyMetadata(
|
export async function fetchSpotifyMetadata(
|
||||||
@@ -39,3 +43,17 @@ export async function checkHealth(): Promise<HealthResponse> {
|
|||||||
time: new Date().toISOString(),
|
time: new Date().toISOString(),
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export async function downloadLyrics(
|
||||||
|
request: LyricsDownloadRequest
|
||||||
|
): Promise<LyricsDownloadResponse> {
|
||||||
|
const req = new main.LyricsDownloadRequest(request);
|
||||||
|
return await DownloadLyrics(req);
|
||||||
|
}
|
||||||
|
|
||||||
|
export async function downloadCover(
|
||||||
|
request: CoverDownloadRequest
|
||||||
|
): Promise<CoverDownloadResponse> {
|
||||||
|
const req = new main.CoverDownloadRequest(request);
|
||||||
|
return await DownloadCover(req);
|
||||||
|
}
|
||||||
|
|||||||
@@ -0,0 +1,66 @@
|
|||||||
|
export type LogLevel = "info" | "success" | "warning" | "error" | "debug";
|
||||||
|
|
||||||
|
export interface LogEntry {
|
||||||
|
timestamp: Date;
|
||||||
|
level: LogLevel;
|
||||||
|
message: string;
|
||||||
|
}
|
||||||
|
|
||||||
|
class Logger {
|
||||||
|
private logs: LogEntry[] = [];
|
||||||
|
private maxLogs = 500;
|
||||||
|
private listeners: Set<() => void> = new Set();
|
||||||
|
|
||||||
|
private addLog(level: LogLevel, message: string) {
|
||||||
|
const entry: LogEntry = {
|
||||||
|
timestamp: new Date(),
|
||||||
|
level,
|
||||||
|
message: message.toLowerCase(),
|
||||||
|
};
|
||||||
|
this.logs.push(entry);
|
||||||
|
if (this.logs.length > this.maxLogs) {
|
||||||
|
this.logs.shift();
|
||||||
|
}
|
||||||
|
this.notifyListeners();
|
||||||
|
}
|
||||||
|
|
||||||
|
info(message: string) {
|
||||||
|
this.addLog("info", message);
|
||||||
|
}
|
||||||
|
|
||||||
|
success(message: string) {
|
||||||
|
this.addLog("success", message);
|
||||||
|
}
|
||||||
|
|
||||||
|
warning(message: string) {
|
||||||
|
this.addLog("warning", message);
|
||||||
|
}
|
||||||
|
|
||||||
|
error(message: string) {
|
||||||
|
this.addLog("error", message);
|
||||||
|
}
|
||||||
|
|
||||||
|
debug(message: string) {
|
||||||
|
this.addLog("debug", message);
|
||||||
|
}
|
||||||
|
|
||||||
|
getLogs(): LogEntry[] {
|
||||||
|
return [...this.logs];
|
||||||
|
}
|
||||||
|
|
||||||
|
clear() {
|
||||||
|
this.logs = [];
|
||||||
|
this.notifyListeners();
|
||||||
|
}
|
||||||
|
|
||||||
|
subscribe(listener: () => void) {
|
||||||
|
this.listeners.add(listener);
|
||||||
|
return () => this.listeners.delete(listener);
|
||||||
|
}
|
||||||
|
|
||||||
|
private notifyListeners() {
|
||||||
|
this.listeners.forEach((listener) => listener());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
export const logger = new Logger();
|
||||||
@@ -0,0 +1,59 @@
|
|||||||
|
/**
|
||||||
|
* Format a date to relative time string with max 2 units
|
||||||
|
* e.g., "23 hours 32 minutes ago", "1 day 14 hours ago"
|
||||||
|
*/
|
||||||
|
export function formatRelativeTime(date: Date | string | number): string {
|
||||||
|
const now = new Date();
|
||||||
|
const target = new Date(date);
|
||||||
|
const diffMs = now.getTime() - target.getTime();
|
||||||
|
|
||||||
|
if (diffMs < 0) return "just now";
|
||||||
|
|
||||||
|
const seconds = Math.floor(diffMs / 1000);
|
||||||
|
const minutes = Math.floor(seconds / 60);
|
||||||
|
const hours = Math.floor(minutes / 60);
|
||||||
|
const days = Math.floor(hours / 24);
|
||||||
|
const weeks = Math.floor(days / 7);
|
||||||
|
const months = Math.floor(days / 30);
|
||||||
|
const years = Math.floor(days / 365);
|
||||||
|
|
||||||
|
const parts: string[] = [];
|
||||||
|
|
||||||
|
if (years > 0) {
|
||||||
|
parts.push(`${years} ${years === 1 ? "year" : "years"}`);
|
||||||
|
const remainingMonths = Math.floor((days % 365) / 30);
|
||||||
|
if (remainingMonths > 0) {
|
||||||
|
parts.push(`${remainingMonths} ${remainingMonths === 1 ? "month" : "months"}`);
|
||||||
|
}
|
||||||
|
} else if (months > 0) {
|
||||||
|
parts.push(`${months} ${months === 1 ? "month" : "months"}`);
|
||||||
|
const remainingDays = days % 30;
|
||||||
|
if (remainingDays > 0) {
|
||||||
|
parts.push(`${remainingDays} ${remainingDays === 1 ? "day" : "days"}`);
|
||||||
|
}
|
||||||
|
} else if (weeks > 0) {
|
||||||
|
parts.push(`${weeks} ${weeks === 1 ? "week" : "weeks"}`);
|
||||||
|
const remainingDays = days % 7;
|
||||||
|
if (remainingDays > 0) {
|
||||||
|
parts.push(`${remainingDays} ${remainingDays === 1 ? "day" : "days"}`);
|
||||||
|
}
|
||||||
|
} else if (days > 0) {
|
||||||
|
parts.push(`${days} ${days === 1 ? "day" : "days"}`);
|
||||||
|
const remainingHours = hours % 24;
|
||||||
|
if (remainingHours > 0) {
|
||||||
|
parts.push(`${remainingHours} ${remainingHours === 1 ? "hour" : "hours"}`);
|
||||||
|
}
|
||||||
|
} else if (hours > 0) {
|
||||||
|
parts.push(`${hours} ${hours === 1 ? "hour" : "hours"}`);
|
||||||
|
const remainingMinutes = minutes % 60;
|
||||||
|
if (remainingMinutes > 0) {
|
||||||
|
parts.push(`${remainingMinutes} ${remainingMinutes === 1 ? "minute" : "minutes"}`);
|
||||||
|
}
|
||||||
|
} else if (minutes > 0) {
|
||||||
|
parts.push(`${minutes} ${minutes === 1 ? "minute" : "minutes"}`);
|
||||||
|
} else {
|
||||||
|
return "just now";
|
||||||
|
}
|
||||||
|
|
||||||
|
return "Released " + parts.slice(0, 2).join(" ") + " ago";
|
||||||
|
}
|
||||||
@@ -1,14 +1,18 @@
|
|||||||
import { GetDefaults } from "../../wailsjs/go/main/App";
|
import { GetDefaults } from "../../wailsjs/go/main/App";
|
||||||
|
|
||||||
|
export type FontFamily = "google-sans" | "inter" | "poppins" | "roboto" | "dm-sans" | "plus-jakarta-sans" | "manrope" | "space-grotesk";
|
||||||
|
|
||||||
export interface Settings {
|
export interface Settings {
|
||||||
downloadPath: string;
|
downloadPath: string;
|
||||||
downloader: "auto" | "deezer" | "tidal" | "qobuz" | "amazon";
|
downloader: "auto" | "deezer" | "tidal" | "qobuz" | "amazon";
|
||||||
theme: string;
|
theme: string;
|
||||||
themeMode: "auto" | "light" | "dark";
|
themeMode: "auto" | "light" | "dark";
|
||||||
|
fontFamily: FontFamily;
|
||||||
filenameFormat: "title-artist" | "artist-title" | "title";
|
filenameFormat: "title-artist" | "artist-title" | "title";
|
||||||
artistSubfolder: boolean;
|
artistSubfolder: boolean;
|
||||||
albumSubfolder: boolean;
|
albumSubfolder: boolean;
|
||||||
trackNumber: boolean;
|
trackNumber: boolean;
|
||||||
|
sfxEnabled: boolean;
|
||||||
operatingSystem: "Windows" | "linux/MacOS"
|
operatingSystem: "Windows" | "linux/MacOS"
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -26,13 +30,34 @@ export const DEFAULT_SETTINGS: Settings = {
|
|||||||
downloader: "auto",
|
downloader: "auto",
|
||||||
theme: "yellow",
|
theme: "yellow",
|
||||||
themeMode: "auto",
|
themeMode: "auto",
|
||||||
|
fontFamily: "google-sans",
|
||||||
filenameFormat: "title-artist",
|
filenameFormat: "title-artist",
|
||||||
artistSubfolder: false,
|
artistSubfolder: false,
|
||||||
albumSubfolder: false,
|
albumSubfolder: false,
|
||||||
trackNumber: false,
|
trackNumber: false,
|
||||||
|
sfxEnabled: true,
|
||||||
operatingSystem: detectOS()
|
operatingSystem: detectOS()
|
||||||
};
|
};
|
||||||
|
|
||||||
|
export const FONT_OPTIONS: { value: FontFamily; label: string; fontFamily: string }[] = [
|
||||||
|
{ value: "google-sans", label: "Google Sans Flex", fontFamily: '"Google Sans Flex", system-ui, sans-serif' },
|
||||||
|
{ value: "inter", label: "Inter", fontFamily: '"Inter", system-ui, sans-serif' },
|
||||||
|
{ value: "poppins", label: "Poppins", fontFamily: '"Poppins", system-ui, sans-serif' },
|
||||||
|
{ value: "roboto", label: "Roboto", fontFamily: '"Roboto", system-ui, sans-serif' },
|
||||||
|
{ value: "dm-sans", label: "DM Sans", fontFamily: '"DM Sans", system-ui, sans-serif' },
|
||||||
|
{ value: "plus-jakarta-sans", label: "Plus Jakarta Sans", fontFamily: '"Plus Jakarta Sans", system-ui, sans-serif' },
|
||||||
|
{ value: "manrope", label: "Manrope", fontFamily: '"Manrope", system-ui, sans-serif' },
|
||||||
|
{ value: "space-grotesk", label: "Space Grotesk", fontFamily: '"Space Grotesk", system-ui, sans-serif' },
|
||||||
|
];
|
||||||
|
|
||||||
|
export function applyFont(fontFamily: FontFamily): void {
|
||||||
|
const font = FONT_OPTIONS.find(f => f.value === fontFamily);
|
||||||
|
if (font) {
|
||||||
|
document.documentElement.style.setProperty('--font-sans', font.fontFamily);
|
||||||
|
document.body.style.fontFamily = font.fontFamily;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
async function fetchDefaultPath(): Promise<string> {
|
async function fetchDefaultPath(): Promise<string> {
|
||||||
try {
|
try {
|
||||||
const data = await GetDefaults();
|
const data = await GetDefaults();
|
||||||
|
|||||||
@@ -1,31 +1,55 @@
|
|||||||
import { toast } from 'sonner';
|
import { toast } from "sonner";
|
||||||
import { playSuccessSound, playErrorSound, playWarningSound, playInfoSound } from './audio';
|
import {
|
||||||
|
playSuccessSound,
|
||||||
|
playErrorSound,
|
||||||
|
playWarningSound,
|
||||||
|
playInfoSound,
|
||||||
|
} from "./audio";
|
||||||
|
import { logger } from "./logger";
|
||||||
|
import { getSettings } from "./settings";
|
||||||
|
|
||||||
|
const toastStyle = {
|
||||||
|
className: "font-mono lowercase",
|
||||||
|
};
|
||||||
|
|
||||||
|
// Helper to check if SFX is enabled
|
||||||
|
const isSfxEnabled = () => getSettings().sfxEnabled;
|
||||||
|
|
||||||
// Wrapper functions for toast with sound effects
|
// Wrapper functions for toast with sound effects
|
||||||
export const toastWithSound = {
|
export const toastWithSound = {
|
||||||
success: (message: string, data?: any) => {
|
success: (message: string, data?: any) => {
|
||||||
playSuccessSound();
|
const msg = message.toLowerCase();
|
||||||
return toast.success(message, data);
|
logger.success(msg);
|
||||||
|
if (isSfxEnabled()) playSuccessSound();
|
||||||
|
return toast.success(msg, { ...toastStyle, ...data });
|
||||||
},
|
},
|
||||||
|
|
||||||
error: (message: string, data?: any) => {
|
error: (message: string, data?: any) => {
|
||||||
playErrorSound();
|
const msg = message.toLowerCase();
|
||||||
return toast.error(message, data);
|
logger.error(msg);
|
||||||
|
if (isSfxEnabled()) playErrorSound();
|
||||||
|
return toast.error(msg, { ...toastStyle, ...data });
|
||||||
},
|
},
|
||||||
|
|
||||||
warning: (message: string, data?: any) => {
|
warning: (message: string, data?: any) => {
|
||||||
playWarningSound();
|
const msg = message.toLowerCase();
|
||||||
return toast.warning(message, data);
|
logger.warning(msg);
|
||||||
|
if (isSfxEnabled()) playWarningSound();
|
||||||
|
return toast.warning(msg, { ...toastStyle, ...data });
|
||||||
},
|
},
|
||||||
|
|
||||||
info: (message: string, data?: any) => {
|
info: (message: string, data?: any) => {
|
||||||
playInfoSound();
|
const msg = message.toLowerCase();
|
||||||
return toast.info(message, data);
|
logger.info(msg);
|
||||||
|
if (isSfxEnabled()) playInfoSound();
|
||||||
|
return toast.info(msg, { ...toastStyle, ...data });
|
||||||
},
|
},
|
||||||
|
|
||||||
// Default toast without specific type
|
// Default toast without specific type
|
||||||
message: (message: string, data?: any) => {
|
message: (message: string, data?: any) => {
|
||||||
playInfoSound();
|
const msg = message.toLowerCase();
|
||||||
return toast(message, data);
|
logger.info(msg);
|
||||||
|
if (isSfxEnabled()) playInfoSound();
|
||||||
|
return toast(msg, { ...toastStyle, ...data });
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
import { clsx, type ClassValue } from "clsx"
|
import { clsx, type ClassValue } from "clsx"
|
||||||
import { twMerge } from "tailwind-merge"
|
import { twMerge } from "tailwind-merge"
|
||||||
|
import { BrowserOpenURL } from "../../wailsjs/runtime/runtime"
|
||||||
import type { Settings } from "./settings";
|
import type { Settings } from "./settings";
|
||||||
|
|
||||||
export function cn(...inputs: ClassValue[]) {
|
export function cn(...inputs: ClassValue[]) {
|
||||||
@@ -44,4 +45,15 @@ export function buildOutputPath(settings: Settings, folder?: string) {
|
|||||||
const sanitized = folder ? sanitizePath(folder, os) : undefined;
|
const sanitized = folder ? sanitizePath(folder, os) : undefined;
|
||||||
|
|
||||||
return sanitized ? joinPath(os, base, sanitized) : base;
|
return sanitized ? joinPath(os, base, sanitized) : base;
|
||||||
|
}
|
||||||
|
|
||||||
|
export function openExternal(url: string) {
|
||||||
|
if (!url) return;
|
||||||
|
try {
|
||||||
|
BrowserOpenURL(url);
|
||||||
|
} catch (error) {
|
||||||
|
if (typeof window !== "undefined") {
|
||||||
|
window.open(url, "_blank", "noopener,noreferrer");
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
@@ -1,12 +1,12 @@
|
|||||||
import { StrictMode } from 'react'
|
import { StrictMode } from "react";
|
||||||
import { createRoot } from 'react-dom/client'
|
import { createRoot } from "react-dom/client";
|
||||||
import './index.css'
|
import "./index.css";
|
||||||
import App from './App.tsx'
|
import App from "./App.tsx";
|
||||||
import { Toaster } from '@/components/ui/sonner'
|
import { Toaster } from "@/components/ui/sonner";
|
||||||
|
|
||||||
createRoot(document.getElementById('root')!).render(
|
createRoot(document.getElementById("root")!).render(
|
||||||
<StrictMode>
|
<StrictMode>
|
||||||
<App />
|
<App />
|
||||||
<Toaster position="bottom-left" duration={1000} />
|
<Toaster position="bottom-left" duration={1000} />
|
||||||
</StrictMode>,
|
</StrictMode>
|
||||||
)
|
);
|
||||||
|
|||||||
@@ -1,3 +1,9 @@
|
|||||||
|
export interface ArtistSimple {
|
||||||
|
id: string;
|
||||||
|
name: string;
|
||||||
|
external_urls: string;
|
||||||
|
}
|
||||||
|
|
||||||
export interface TrackMetadata {
|
export interface TrackMetadata {
|
||||||
artists: string;
|
artists: string;
|
||||||
name: string;
|
name: string;
|
||||||
@@ -10,6 +16,11 @@ export interface TrackMetadata {
|
|||||||
isrc: string;
|
isrc: string;
|
||||||
album_type?: string;
|
album_type?: string;
|
||||||
spotify_id?: string;
|
spotify_id?: string;
|
||||||
|
album_id?: string;
|
||||||
|
album_url?: string;
|
||||||
|
artist_id?: string;
|
||||||
|
artist_url?: string;
|
||||||
|
artists_data?: ArtistSimple[];
|
||||||
}
|
}
|
||||||
|
|
||||||
export interface TrackResponse {
|
export interface TrackResponse {
|
||||||
@@ -113,6 +124,8 @@ export interface DownloadRequest {
|
|||||||
use_album_track_number?: boolean;
|
use_album_track_number?: boolean;
|
||||||
spotify_id?: string;
|
spotify_id?: string;
|
||||||
service_url?: string;
|
service_url?: string;
|
||||||
|
duration?: number; // Track duration in seconds for better matching
|
||||||
|
item_id?: string; // Optional queue item ID for multi-service fallback tracking
|
||||||
}
|
}
|
||||||
|
|
||||||
export interface DownloadResponse {
|
export interface DownloadResponse {
|
||||||
@@ -121,9 +134,88 @@ export interface DownloadResponse {
|
|||||||
file?: string;
|
file?: string;
|
||||||
error?: string;
|
error?: string;
|
||||||
already_exists?: boolean;
|
already_exists?: boolean;
|
||||||
|
item_id?: string; // Queue item ID for tracking
|
||||||
}
|
}
|
||||||
|
|
||||||
export interface HealthResponse {
|
export interface HealthResponse {
|
||||||
status: string;
|
status: string;
|
||||||
time: string;
|
time: string;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export interface TimeSlice {
|
||||||
|
time: number;
|
||||||
|
magnitudes: number[];
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface SpectrumData {
|
||||||
|
time_slices: TimeSlice[];
|
||||||
|
sample_rate: number;
|
||||||
|
freq_bins: number;
|
||||||
|
duration: number;
|
||||||
|
max_freq: number;
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface AnalysisResult {
|
||||||
|
file_path: string;
|
||||||
|
sample_rate: number;
|
||||||
|
channels: number;
|
||||||
|
bits_per_sample: number;
|
||||||
|
total_samples: number;
|
||||||
|
duration: number;
|
||||||
|
bit_depth: string;
|
||||||
|
dynamic_range: number;
|
||||||
|
peak_amplitude: number;
|
||||||
|
rms_level: number;
|
||||||
|
spectrum?: SpectrumData;
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface LyricsDownloadRequest {
|
||||||
|
spotify_id: string;
|
||||||
|
track_name: string;
|
||||||
|
artist_name: string;
|
||||||
|
output_dir?: string;
|
||||||
|
filename_format?: string;
|
||||||
|
track_number?: boolean;
|
||||||
|
position?: number;
|
||||||
|
use_album_track_number?: boolean;
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface LyricsDownloadResponse {
|
||||||
|
success: boolean;
|
||||||
|
message: string;
|
||||||
|
file?: string;
|
||||||
|
error?: string;
|
||||||
|
already_exists?: boolean;
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface TrackAvailability {
|
||||||
|
spotify_id: string;
|
||||||
|
tidal: boolean;
|
||||||
|
deezer: boolean;
|
||||||
|
amazon: boolean;
|
||||||
|
qobuz: boolean;
|
||||||
|
tidal_url?: string;
|
||||||
|
deezer_url?: string;
|
||||||
|
amazon_url?: string;
|
||||||
|
qobuz_url?: string;
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface CoverDownloadRequest {
|
||||||
|
cover_url: string;
|
||||||
|
track_name: string;
|
||||||
|
artist_name: string;
|
||||||
|
output_dir?: string;
|
||||||
|
filename_format?: string;
|
||||||
|
track_number?: boolean;
|
||||||
|
position?: number;
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface CoverDownloadResponse {
|
||||||
|
success: boolean;
|
||||||
|
message: string;
|
||||||
|
file?: string;
|
||||||
|
error?: string;
|
||||||
|
already_exists?: boolean;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -6,6 +6,7 @@ require (
|
|||||||
github.com/go-flac/flacpicture v0.3.0
|
github.com/go-flac/flacpicture v0.3.0
|
||||||
github.com/go-flac/flacvorbis v0.2.0
|
github.com/go-flac/flacvorbis v0.2.0
|
||||||
github.com/go-flac/go-flac v1.0.0
|
github.com/go-flac/go-flac v1.0.0
|
||||||
|
github.com/mewkiz/flac v1.0.13
|
||||||
github.com/wailsapp/wails/v2 v2.11.0
|
github.com/wailsapp/wails/v2 v2.11.0
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -15,6 +16,7 @@ require (
|
|||||||
github.com/godbus/dbus/v5 v5.2.0 // indirect
|
github.com/godbus/dbus/v5 v5.2.0 // indirect
|
||||||
github.com/google/uuid v1.6.0 // indirect
|
github.com/google/uuid v1.6.0 // indirect
|
||||||
github.com/gorilla/websocket v1.5.3 // indirect
|
github.com/gorilla/websocket v1.5.3 // indirect
|
||||||
|
github.com/icza/bitio v1.1.0 // indirect
|
||||||
github.com/jchv/go-winloader v0.0.0-20250406163304-c1995be93bd1 // indirect
|
github.com/jchv/go-winloader v0.0.0-20250406163304-c1995be93bd1 // indirect
|
||||||
github.com/labstack/echo/v4 v4.13.4 // indirect
|
github.com/labstack/echo/v4 v4.13.4 // indirect
|
||||||
github.com/labstack/gommon v0.4.2 // indirect
|
github.com/labstack/gommon v0.4.2 // indirect
|
||||||
@@ -24,6 +26,8 @@ require (
|
|||||||
github.com/leaanthony/u v1.1.1 // indirect
|
github.com/leaanthony/u v1.1.1 // indirect
|
||||||
github.com/mattn/go-colorable v0.1.14 // indirect
|
github.com/mattn/go-colorable v0.1.14 // indirect
|
||||||
github.com/mattn/go-isatty v0.0.20 // indirect
|
github.com/mattn/go-isatty v0.0.20 // indirect
|
||||||
|
github.com/mewkiz/pkg v0.0.0-20250417130911-3f050ff8c56d // indirect
|
||||||
|
github.com/mewpkg/term v0.0.0-20241026122259-37a80af23985 // indirect
|
||||||
github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c // indirect
|
github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c // indirect
|
||||||
github.com/pkg/errors v0.9.1 // indirect
|
github.com/pkg/errors v0.9.1 // indirect
|
||||||
github.com/rivo/uniseg v0.4.7 // indirect
|
github.com/rivo/uniseg v0.4.7 // indirect
|
||||||
|
|||||||
@@ -16,6 +16,10 @@ github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
|
|||||||
github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
|
github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
|
||||||
github.com/gorilla/websocket v1.5.3 h1:saDtZ6Pbx/0u+bgYQ3q96pZgCzfhKXGPqt7kZ72aNNg=
|
github.com/gorilla/websocket v1.5.3 h1:saDtZ6Pbx/0u+bgYQ3q96pZgCzfhKXGPqt7kZ72aNNg=
|
||||||
github.com/gorilla/websocket v1.5.3/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
|
github.com/gorilla/websocket v1.5.3/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
|
||||||
|
github.com/icza/bitio v1.1.0 h1:ysX4vtldjdi3Ygai5m1cWy4oLkhWTAi+SyO6HC8L9T0=
|
||||||
|
github.com/icza/bitio v1.1.0/go.mod h1:0jGnlLAx8MKMr9VGnn/4YrvZiprkvBelsVIbA9Jjr9A=
|
||||||
|
github.com/icza/mighty v0.0.0-20180919140131-cfd07d671de6 h1:8UsGZ2rr2ksmEru6lToqnXgA8Mz1DP11X4zSJ159C3k=
|
||||||
|
github.com/icza/mighty v0.0.0-20180919140131-cfd07d671de6/go.mod h1:xQig96I1VNBDIWGCdTt54nHt6EeI639SmHycLYL7FkA=
|
||||||
github.com/jchv/go-winloader v0.0.0-20250406163304-c1995be93bd1 h1:njuLRcjAuMKr7kI3D85AXWkw6/+v9PwtV6M6o11sWHQ=
|
github.com/jchv/go-winloader v0.0.0-20250406163304-c1995be93bd1 h1:njuLRcjAuMKr7kI3D85AXWkw6/+v9PwtV6M6o11sWHQ=
|
||||||
github.com/jchv/go-winloader v0.0.0-20250406163304-c1995be93bd1/go.mod h1:alcuEEnZsY1WQsagKhZDsoPCRoOijYqhZvPwLG0kzVs=
|
github.com/jchv/go-winloader v0.0.0-20250406163304-c1995be93bd1/go.mod h1:alcuEEnZsY1WQsagKhZDsoPCRoOijYqhZvPwLG0kzVs=
|
||||||
github.com/labstack/echo/v4 v4.13.4 h1:oTZZW+T3s9gAu5L8vmzihV7/lkXGZuITzTQkTEhcXEA=
|
github.com/labstack/echo/v4 v4.13.4 h1:oTZZW+T3s9gAu5L8vmzihV7/lkXGZuITzTQkTEhcXEA=
|
||||||
@@ -39,6 +43,12 @@ github.com/mattn/go-colorable v0.1.14 h1:9A9LHSqF/7dyVVX6g0U9cwm9pG3kP9gSzcuIPHP
|
|||||||
github.com/mattn/go-colorable v0.1.14/go.mod h1:6LmQG8QLFO4G5z1gPvYEzlUgJ2wF+stgPZH1UqBm1s8=
|
github.com/mattn/go-colorable v0.1.14/go.mod h1:6LmQG8QLFO4G5z1gPvYEzlUgJ2wF+stgPZH1UqBm1s8=
|
||||||
github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY=
|
github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY=
|
||||||
github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
|
github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
|
||||||
|
github.com/mewkiz/flac v1.0.13 h1:6wF8rRQKBFW159Daqx6Ro7K5ZnlVhHUKfS5aTsC4oXs=
|
||||||
|
github.com/mewkiz/flac v1.0.13/go.mod h1:HfPYDA+oxjyuqMu2V+cyKcxF51KM6incpw5eZXmfA6k=
|
||||||
|
github.com/mewkiz/pkg v0.0.0-20250417130911-3f050ff8c56d h1:IL2tii4jXLdhCeQN69HNzYYW1kl0meSG0wt5+sLwszU=
|
||||||
|
github.com/mewkiz/pkg v0.0.0-20250417130911-3f050ff8c56d/go.mod h1:SIpumAnUWSy0q9RzKD3pyH3g1t5vdawUAPcW5tQrUtI=
|
||||||
|
github.com/mewpkg/term v0.0.0-20241026122259-37a80af23985 h1:h8O1byDZ1uk6RUXMhj1QJU3VXFKXHDZxr4TXRPGeBa8=
|
||||||
|
github.com/mewpkg/term v0.0.0-20241026122259-37a80af23985/go.mod h1:uiPmbdUbdt1NkGApKl7htQjZ8S7XaGUAVulJUJ9v6q4=
|
||||||
github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c h1:+mdjkGKdHQG3305AYmdv1U2eRNDiU2ErMBj1gwrq8eQ=
|
github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c h1:+mdjkGKdHQG3305AYmdv1U2eRNDiU2ErMBj1gwrq8eQ=
|
||||||
github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c/go.mod h1:7rwL4CYBLnjLxUqIJNnCWiEdr3bn6IUYi15bNlnbCCU=
|
github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c/go.mod h1:7rwL4CYBLnjLxUqIJNnCWiEdr3bn6IUYi15bNlnbCCU=
|
||||||
github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
|
github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
|
||||||
|
|||||||
@@ -30,6 +30,12 @@ func main() {
|
|||||||
},
|
},
|
||||||
BackgroundColour: &options.RGBA{R: 0, G: 0, B: 0, A: 255},
|
BackgroundColour: &options.RGBA{R: 0, G: 0, B: 0, A: 255},
|
||||||
OnStartup: app.startup,
|
OnStartup: app.startup,
|
||||||
|
DragAndDrop: &options.DragAndDrop{
|
||||||
|
EnableFileDrop: true,
|
||||||
|
DisableWebViewDrop: false,
|
||||||
|
CSSDropProperty: "--wails-drop-target",
|
||||||
|
CSSDropValue: "drop",
|
||||||
|
},
|
||||||
Bind: []interface{}{
|
Bind: []interface{}{
|
||||||
app,
|
app,
|
||||||
},
|
},
|
||||||
|
|||||||
+1
-1
@@ -1,3 +1,3 @@
|
|||||||
{
|
{
|
||||||
"version": "6.0"
|
"version": "6.6"
|
||||||
}
|
}
|
||||||
|
|||||||
+3
-2
@@ -2,7 +2,8 @@
|
|||||||
"$schema": "https://wails.io/schemas/config.v2.json",
|
"$schema": "https://wails.io/schemas/config.v2.json",
|
||||||
"name": "SpotiFLAC",
|
"name": "SpotiFLAC",
|
||||||
"outputfilename": "SpotiFLAC",
|
"outputfilename": "SpotiFLAC",
|
||||||
"frontend:install": "pnpm install && pnpm run generate-icon",
|
"frontend:install": "pnpm install",
|
||||||
|
"frontend:dev:install": "pnpm install",
|
||||||
"frontend:build": "pnpm run build",
|
"frontend:build": "pnpm run build",
|
||||||
"frontend:dev:watcher": "pnpm run dev",
|
"frontend:dev:watcher": "pnpm run dev",
|
||||||
"frontend:dev:serverUrl": "auto",
|
"frontend:dev:serverUrl": "auto",
|
||||||
@@ -11,7 +12,7 @@
|
|||||||
},
|
},
|
||||||
"info": {
|
"info": {
|
||||||
"productName": "SpotiFLAC",
|
"productName": "SpotiFLAC",
|
||||||
"productVersion": "6.1"
|
"productVersion": "6.6"
|
||||||
},
|
},
|
||||||
"wailsjsdir": "./frontend",
|
"wailsjsdir": "./frontend",
|
||||||
"assetdir": "./frontend/dist",
|
"assetdir": "./frontend/dist",
|
||||||
|
|||||||
Reference in New Issue
Block a user