From 50b850a87d45c15e0aae204e37d91fe852033444 Mon Sep 17 00:00:00 2001
From: Julien Maille <julien.maille@gmail.com>
Date: Sat, 10 Jan 2026 15:00:25 +0100
Subject: [PATCH] Improve CSV import: add retry logic for track search and show
 artist in progress UI

---
 index.html |  1 +
 js/app.js  | 47 ++++++++++++++++++++++++++++++++++++++++++-----
 2 files changed, 43 insertions(+), 5 deletions(-)

diff --git a/index.html b/index.html
index f60498a..3d63706 100644
--- a/index.html
+++ b/index.html
@@ -189,6 +189,7 @@
         </div>
         <div class="progress-content">
             <div class="current-track">Preparing import...</div>
+            <div class="current-artist" style="font-size: 0.9em; color: var(--text-secondary); margin-bottom: 0.5rem;"></div>
             <div class="progress-bar">
                 <div class="progress-fill" id="csv-progress-fill"></div>
             </div>
diff --git a/js/app.js b/js/app.js
index 5357eab..9aa5ea0 100644
--- a/js/app.js
+++ b/js/app.js
@@ -481,6 +481,7 @@ document.addEventListener('DOMContentLoaded', async () => {
                     const progressCurrent = document.getElementById('csv-progress-current');
                     const progressTotal = document.getElementById('csv-progress-total');
                     const currentTrackElement = progressElement.querySelector('.current-track');
+                    const currentArtistElement = progressElement.querySelector('.current-artist');
 
                     try {
                         // Show progress bar
@@ -488,6 +489,7 @@ document.addEventListener('DOMContentLoaded', async () => {
                         progressFill.style.width = '0%';
                         progressCurrent.textContent = '0';
                         currentTrackElement.textContent = 'Reading CSV file...';
+                        if (currentArtistElement) currentArtistElement.textContent = '';
 
                         const csvText = await file.text();
                         const lines = csvText.trim().split('\n');
@@ -499,6 +501,7 @@ document.addEventListener('DOMContentLoaded', async () => {
                             progressFill.style.width = `${Math.min(percentage, 100)}%`;
                             progressCurrent.textContent = progress.current.toString();
                             currentTrackElement.textContent = progress.currentTrack;
+                            if (currentArtistElement) currentArtistElement.textContent = progress.currentArtist || '';
                         });
 
                         tracks = result.tracks;
@@ -1056,7 +1059,8 @@ async function parseCSV(csvText, api, onProgress) {
                 onProgress({
                     current: i,
                     total: totalTracks,
-                    currentTrack: trackTitle || 'Unknown track'
+                    currentTrack: trackTitle || 'Unknown track',
+                    currentArtist: artistNames || ''
                 });
             }
 
@@ -1066,12 +1070,45 @@ async function parseCSV(csvText, api, onProgress) {
                 await new Promise(resolve => setTimeout(resolve, 300));
                 
                 try {
-                    const searchQuery = `${trackTitle} ${artistNames}`;
-                    const searchResults = await api.searchTracks(searchQuery);
+                    let foundTrack = null;
+
+                    // 1. Initial Search: Title + All Artists
+                    let searchQuery = `${trackTitle} ${artistNames}`;
+                    let searchResults = await api.searchTracks(searchQuery);
 
                     if (searchResults.items && searchResults.items.length > 0) {
-                        // Use the first result
-                        const foundTrack = searchResults.items[0];
+                        foundTrack = searchResults.items[0];
+                    }
+
+                    // 2. Retry with Main Artist only
+                    if (!foundTrack) {
+                        const mainArtist = artistNames.split(',')[0].trim();
+                        // Only retry if mainArtist is actually different from artistNames (e.g. multiple artists)
+                        if (mainArtist && mainArtist !== artistNames) {
+                            searchQuery = `${trackTitle} ${mainArtist}`;
+                            console.log(`Retry 1 (Main Artist): ${searchQuery}`);
+                            searchResults = await api.searchTracks(searchQuery);
+                            if (searchResults.items && searchResults.items.length > 0) {
+                                foundTrack = searchResults.items[0];
+                            }
+                        }
+                    }
+
+                    // 3. Retry with Cleaned Title (if " - " exists) + Main Artist
+                    if (!foundTrack && trackTitle.includes(' - ')) {
+                        const mainArtist = artistNames.split(',')[0].trim();
+                        const cleanedTitle = trackTitle.split(' - ')[0].trim();
+                        if (cleanedTitle) {
+                            searchQuery = `${cleanedTitle} ${mainArtist}`;
+                            console.log(`Retry 2 (Cleaned Title): ${searchQuery}`);
+                            searchResults = await api.searchTracks(searchQuery);
+                            if (searchResults.items && searchResults.items.length > 0) {
+                                foundTrack = searchResults.items[0];
+                            }
+                        }
+                    }
+
+                    if (foundTrack) {
                         tracks.push(foundTrack);
                         console.log(`Found track: "${trackTitle}" by ${artistNames}`);
                     } else {