From 0c1fd126d1d40244ec6edbd20cd26694eec8f79d Mon Sep 17 00:00:00 2001
From: jijirae <raeji@duck.com>
Date: Sun, 11 Jan 2026 01:41:57 +0900
Subject: [PATCH] Update CSV import instructions and enhance track search logic
 for better compatibility with Apple Music

---
 index.html |  4 +--
 js/app.js  | 71 +++++++++++++++++++++++++++++++++++++++++-------------
 2 files changed, 56 insertions(+), 19 deletions(-)

diff --git a/index.html b/index.html
index 08c6bf4..e084ede 100644
--- a/index.html
+++ b/index.html
@@ -75,10 +75,10 @@
             <input type="text" id="playlist-name-input" class="template-input" placeholder="Playlist name" style="margin: 1rem 0;">
             <div id="csv-import-section" style="display: none; margin: 1rem 0; padding: 1rem; border: 1px solid var(--border); border-radius: var(--radius); background: var(--background-secondary);">
                 <p style="margin-bottom: 0.5rem; font-size: 0.9rem;">Import from CSV</p>
-                <p style="font-size: 0.8rem; margin: 0;">Only Spotify is supported for now. Please use <a href="https://exportify.app/" style="text-decoration: underline;">Exportify</a> to export your playlist into a .csv. Make sure its headers are in English.</p>
+                <p style="font-size: 0.8rem; margin: 0;">Spotify and Apple Music are supported. (Apple Music is prone to errors.) Please use <a href="https://exportify.app/" style="text-decoration: underline;">Exportify (Spotify)</a> or <a href="https://www.tunemymusic.com/transfer/spotify-to-apple-music" style="text-decoration: underline;">TuneMyMusic (Apple Music)</a> to export your playlist into a .csv. Make sure its headers are in English.</p>
                 <br>
                 <input type="file" id="csv-file-input" class="btn-secondary" accept=".csv" style="width: 100%; margin-bottom: 0.5rem;">
-                <p style="font-size: 0.8rem; margin: 0;">This feature isn't perfect and is prone to errors! Please check your playlist after to remove any unwanted songs that were added by the system.</p>
+                <p style="font-size: 0.8rem; margin: 0;"><b>Warning:</b> This feature isn't perfect and is prone to errors! Please check your playlist after to remove any unwanted songs that were added by the system.</p>
             </div>
 
             <div class="setting-item" style="margin-bottom: 1rem; padding: 0; border: none; background: transparent;">
diff --git a/js/app.js b/js/app.js
index db37cea..b7e34bf 100644
--- a/js/app.js
+++ b/js/app.js
@@ -1038,6 +1038,8 @@ async function parseCSV(csvText, api, onProgress) {
         if (values.length >= headers.length) {
             let trackTitle = '';
             let artistNames = '';
+            let albumName = '';
+            let isrc = '';
 
             headers.forEach((header, index) => {
                 const value = values[index];
@@ -1050,10 +1052,18 @@ async function parseCSV(csvText, api, onProgress) {
                         trackTitle = value;
                         break;
                     case 'artist name(s)':
+                    case 'artist name':
                     case 'artist':
                     case 'artists':
                         artistNames = value;
                         break;
+                    case 'album':
+                    case 'album name':
+                        albumName = value;
+                        break;
+                    case 'isrc':
+                        isrc = value;
+                        break;
                 }
             });
 
@@ -1067,29 +1077,45 @@ async function parseCSV(csvText, api, onProgress) {
             }
 
             // Search for the track in hifi tidal api's catalog
-            if (trackTitle && artistNames) {
+            if (trackTitle && (artistNames || isrc)) {
                 // Add a small delay to prevent rate limiting
                 await new Promise(resolve => setTimeout(resolve, 300));
                 
                 try {
                     let foundTrack = null;
 
-                    // 1. Initial Search: Title + All Artists
-                    let searchQuery = `${trackTitle} ${artistNames}`;
-                    let searchResults = await api.searchTracks(searchQuery);
+                    // 0. If ISRC provided, try ISRC first (Apple CSVs include ISRC)
+                    if (isrc) {
+                        try {
+                            const searchResults = await api.searchTracks(isrc);
+                            if (searchResults.items && searchResults.items.length > 0) {
+                                foundTrack = searchResults.items[0];
+                                console.log(`Found by ISRC: "${trackTitle}" -> ${isrc}`);
+                            }
+                        } catch (e) {
+                            console.warn(`ISRC search failed for ${isrc}:`, e);
+                        }
+                    }
 
-                    if (searchResults.items && searchResults.items.length > 0) {
-                        foundTrack = searchResults.items[0];
+                    // 1. Initial Search: Title + All Artists (+ Album if available)
+                    if (!foundTrack) {
+                        let searchQuery = `${trackTitle} ${artistNames}`;
+                        if (albumName) searchQuery += ` ${albumName}`;
+                        let searchResults = await api.searchTracks(searchQuery);
+
+                        if (searchResults.items && searchResults.items.length > 0) {
+                            foundTrack = searchResults.items[0];
+                        }
                     }
 
                     // 2. Retry with Main Artist only
-                    if (!foundTrack) {
+                    if (!foundTrack && artistNames) {
                         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}`;
+                            let searchQuery = `${trackTitle} ${mainArtist}`;
+                            if (albumName) searchQuery += ` ${albumName}`;
                             console.log(`Retry 1 (Main Artist): ${searchQuery}`);
-                            searchResults = await api.searchTracks(searchQuery);
+                            const searchResults = await api.searchTracks(searchQuery);
                             if (searchResults.items && searchResults.items.length > 0) {
                                 foundTrack = searchResults.items[0];
                             }
@@ -1098,28 +1124,39 @@ async function parseCSV(csvText, api, onProgress) {
 
                     // 3. Retry with Cleaned Title (if " - " exists) + Main Artist
                     if (!foundTrack && trackTitle.includes(' - ')) {
-                        const mainArtist = artistNames.split(',')[0].trim();
+                        const mainArtist = (artistNames || '').split(',')[0].trim();
                         const cleanedTitle = trackTitle.split(' - ')[0].trim();
                         if (cleanedTitle) {
-                            searchQuery = `${cleanedTitle} ${mainArtist}`;
+                            let searchQuery = `${cleanedTitle} ${mainArtist}`;
+                            if (albumName) searchQuery += ` ${albumName}`;
                             console.log(`Retry 2 (Cleaned Title): ${searchQuery}`);
-                            searchResults = await api.searchTracks(searchQuery);
+                            const searchResults = await api.searchTracks(searchQuery);
                             if (searchResults.items && searchResults.items.length > 0) {
                                 foundTrack = searchResults.items[0];
                             }
                         }
                     }
 
+                    // 4. Retry with Title + Album only (useful when artist formatting is weird)
+                    if (!foundTrack && albumName) {
+                        const searchQuery = `${trackTitle} ${albumName}`;
+                        console.log(`Retry 3 (Album): ${searchQuery}`);
+                        const 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}`);
+                        console.log(`Found track: "${trackTitle}" by ${artistNames}${albumName ? ' (album: ' + albumName + ')' : ''}`);
                     } else {
-                        console.warn(`Track not found: "${trackTitle}" by ${artistNames}`);
-                        missingTracks.push(`${trackTitle} - ${artistNames}`);
+                        console.warn(`Track not found: "${trackTitle}" by ${artistNames} ${albumName ? '(album: ' + albumName + ')' : ''}`);
+                        missingTracks.push(`${trackTitle} - ${artistNames}${albumName ? ' (album: ' + albumName + ')' : ''}`);
                     }
                 } catch (error) {
                     console.error(`Error searching for track "${trackTitle}":`, error);
-                    missingTracks.push(`${trackTitle} - ${artistNames}`);
+                    missingTracks.push(`${trackTitle} - ${artistNames}${albumName ? ' (album: ' + albumName + ')' : ''}`);
                 }
             }
         }