v7.0

frontend/src/hooks/useLyrics.ts

@@ -21,7 +21,10 @@ export function useLyrics() {
     artistName: string,
     albumName?: string,
     playlistName?: string,
-    position?: number
+    position?: number,
+    albumArtist?: string,
+    releaseDate?: string,
+    discNumber?: number
   ) => {
     if (!spotifyId) {
       toast.error("No Spotify ID found for this track");
@@ -71,11 +74,15 @@ export function useLyrics() {
         spotify_id: spotifyId,
         track_name: trackName,
         artist_name: artistName,
+        album_name: albumName,
+        album_artist: albumArtist,
+        release_date: releaseDate,
         output_dir: outputDir,
         filename_format: settings.filenameTemplate || "{title}",
         track_number: settings.trackNumber,
         position: position || 0,
         use_album_track_number: useAlbumTrackNumber,
+        disc_number: discNumber,
       });
 
       if (response.success) {
@@ -126,7 +133,8 @@ export function useLyrics() {
     let skipped = 0;
     const total = tracksWithSpotifyId.length;
 
-    for (const track of tracksWithSpotifyId) {
+    for (let i = 0; i < tracksWithSpotifyId.length; i++) {
+      const track = tracksWithSpotifyId[i];
       if (stopBulkDownloadRef.current) {
         toast.info("Lyrics download stopped by user");
         break;
@@ -142,12 +150,18 @@ export function useLyrics() {
 
         // Replace forward slashes in template data values to prevent them from being interpreted as path separators
         const placeholder = "__SLASH_PLACEHOLDER__";
+        
+        // Determine if we should use album track number or sequential position
+        const useAlbumTrackNumber = settings.folderTemplate?.includes("{album}") || false;
+        // Use track.track_number for album context, otherwise use sequential position (consistent with track download)
+        const trackPosition = useAlbumTrackNumber ? (track.track_number || i + 1) : (i + 1);
+        
         // Build output path using template system
         const templateData: TemplateData = {
           artist: track.artists?.replace(/\//g, placeholder),
           album: track.album_name?.replace(/\//g, placeholder),
           title: track.name?.replace(/\//g, placeholder),
-          track: track.track_number,
+          track: trackPosition,
           playlist: playlistName?.replace(/\//g, placeholder),
         };
 
@@ -169,17 +183,19 @@ export function useLyrics() {
           }
         }
 
-        const useAlbumTrackNumber = settings.folderTemplate?.includes("{album}") || false;
-
         const response = await downloadLyrics({
           spotify_id: id,
           track_name: track.name,
           artist_name: track.artists,
+          album_name: track.album_name,
+          album_artist: track.album_artist,
+          release_date: track.release_date,
           output_dir: outputDir,
           filename_format: settings.filenameTemplate || "{title}",
           track_number: settings.trackNumber,
-          position: track.track_number || 0,
+          position: trackPosition,
           use_album_track_number: useAlbumTrackNumber,
+          disc_number: track.disc_number,
         });
 
         if (response.success) {