Fix track names

src/components/Album.tsx

@@ -1,15 +1,18 @@
 import { useEffect, useState } from 'react'
-import { getTracks } from 'utils/search'
+import { getDownloadUrl, getTracks } from 'utils/search'
 
 import type { AlbumRow, TrackRow } from 'utils/types'
+import Loader from './Loader'
 
 export default function Album(props: { album: AlbumRow; lastReqRef: React.RefObject<number> }) {
   const { album, lastReqRef } = props
   const [open, setOpen] = useState(false)
 
   return (
-    <div className='album' onClick={() => setOpen((o) => !o)}>
+    <div className='album'>
-      <h3>{album.name}</h3>
+      <div className='album-title' onClick={() => setOpen((o) => !o)}>
+        <h3>{album.name}</h3>
+      </div>
       <TrackList url={album.url} open={open} lastReqRef={lastReqRef} />
     </div>
   )
@@ -18,10 +21,16 @@ export default function Album(props: { album: AlbumRow; lastReqRef: React.RefObj
 function TrackList(props: { url: string; open: boolean; lastReqRef: React.RefObject<number> }) {
   const { url, open, lastReqRef } = props
   const [tracks, setTracks] = useState<TrackRow[] | null>(null)
+  const [loading, setLoading] = useState(false)
 
   async function fetchTracks() {
-    const tracks = await getTracks(url, lastReqRef)
+    try {
-    setTracks(tracks)
+      setLoading(true)
+      const tracks = await getTracks(url, lastReqRef)
+      setTracks(tracks)
+    } finally {
+      setLoading(false)
+    }
   }
 
   useEffect(() => {
@@ -31,23 +40,52 @@ function TrackList(props: { url: string; open: boolean; lastReqRef: React.RefObj
   if (!open) return null
 
   return (
-    <div className='trackList'>
+    <div className='album-open'>
-      {tracks
+      {loading ? (
-        ? tracks.map((t, i) => (
+        <div className='loader-container'>
-            <div className='track'>
+          <Loader show />
+        </div>
+      ) : null}
+      {tracks && open ? (
+        <div className='track-list'>
+          {tracks.map((t, i) => (
+            <div className='track' key={i}>
               <span className='track-name'>
-                <span className='track-number'>{(i + 1).toString().padStart(2, '0').slice(-2)}.</span>
+                <span className='track-number'>{(i + 1).toString().padStart(2, '0').slice(-2)}. </span>
                 <span>{t.name}</span>
               </span>
               <span className='format-tag'>FLAC/MP3</span>
-              <TrackDownload url={url} lastReqRef={lastReqRef} />
+              <TrackDownload url={t.url} lastReqRef={lastReqRef} />
             </div>
-          ))
+          ))}
-        : null}
+        </div>
+      ) : null}
     </div>
   )
 }
 
 function TrackDownload(props: { url: string; lastReqRef: React.RefObject<number> }) {
-  return <button className='download-btn'>Download</button>
+  const { url, lastReqRef } = props
+  const [downloadUrl, setDownloadUrl] = useState<string>()
+  const [loading, setLoading] = useState(false)
+
+  async function fetchUrl() {
+    try {
+      setLoading(true)
+      const dlUrl = await getDownloadUrl(url, lastReqRef)
+      setDownloadUrl(dlUrl)
+    } finally {
+      setLoading(false)
+    }
+  }
+
+  return downloadUrl ? (
+    <a className='download-btn' href={downloadUrl} target='_blank' rel='noopener noreferrer' download>
+      Download
+    </a>
+  ) : (
+    <button className='download-btn' disabled={loading} onClick={fetchUrl}>
+      {loading ? <Loader show /> : 'Download'}
+    </button>
+  )
 }

src/components/Downloader.tsx

@@ -53,8 +53,8 @@ export default function Downloader() {
         </div>
       ) : null}
       <div className='results'>
-        {results.map((r) => (
+        {results.map((r, i) => (
-          <Album album={r} lastReqRef={lastReqRef} />
+          <Album album={r} lastReqRef={lastReqRef} key={i} />
         ))}
       </div>
     </>

src/pages/index.astro

@@ -57,7 +57,7 @@ import Downloader from '../components/Downloader'
     width: 30px;
     height: 30px;
     animation: spin 1s linear infinite;
-    margin: 20px auto;
+    margin: auto;
   }
   @keyframes spin {
     0% {
@@ -81,13 +81,13 @@ import Downloader from '../components/Downloader'
     border-radius: 8px;
     box-shadow: 0 2px 4px rgba(0, 0, 0, 0.3);
   }
-  .album {
+  .album-title {
     padding: 15px;
     border-bottom: 1px solid #333;
     cursor: pointer;
     transition: background 0.2s;
   }
-  .album:hover {
+  .album-title:hover {
     background-color: #333;
   }
   .track {
@@ -117,6 +117,7 @@ import Downloader from '../components/Downloader'
     border-radius: 4px;
     cursor: pointer;
     transition: background 0.2s;
+    font-size: 13px;
   }
   .download-btn:hover {
     background-color: #218838;
@@ -136,10 +137,7 @@ import Downloader from '../components/Downloader'
     text-align: center;
     color: #858585;
   }
-  .album-title {
+  .album {
-    font-weight: 500;
-    margin-bottom: 4px;
-    color: #e0e0e0;
   }
   .album-meta {
     display: flex;
@@ -156,17 +154,30 @@ import Downloader from '../components/Downloader'
     display: flex;
     gap: 8px;
   }
+  a.download-btn {
+    text-decoration: none;
+  }
   .download-btn.flac {
     background-color: #6f42c1;
   }
   .download-btn.flac:hover {
     background-color: #563d7c;
   }
+  .download-btn .loader {
+    height: 8px;
+    width: 8px;
+    margin: 2px 8px;
+  }
   .results h3 {
-    padding: 0 15px;
+    margin: 0;
-    margin: 0 0 15px 0;
     font-size: 1.1em;
   }
+  .album-open {
+    background-color: #4a4a4a;
+  }
+  .album-open .loader-container {
+    padding: 6px;
+  }
 </style>
 
 <body>

src/utils/search.ts

@@ -67,7 +67,7 @@ export async function getTracks(url: string, lastReqRef: React.RefObject<number>
       : `https://downloads.khinsider.com${link.attr('href')}`
 
     tracks.push({
-      name: link.text().trim(),
+      name: link.first().text().trim(),
       url: trackUrl,
       format: link.attr('href')!.toLowerCase().endsWith('.flac') ? 'flac' : 'mp3'
     })
@@ -75,3 +75,31 @@ export async function getTracks(url: string, lastReqRef: React.RefObject<number>
 
   return tracks
 }
+
+export async function getDownloadUrl(trackPageUrl: string, lastReqRef: React.RefObject<number>) {
+  const trackPageHtml = await (await politeFetch(trackPageUrl, lastReqRef)).text()
+  const $ = cheerio.load(trackPageHtml)
+
+  const audioLinks: string[] = []
+
+  $('a[href$=".mp3"], a[href$=".flac"]').each((index, link) => {
+    let href = $(link).attr('href')
+    if (!href) return
+
+    href = decodeURIComponent(href)
+    if (!href.startsWith('http')) {
+      href = `https://downloads.khinsider.com${href}`
+    }
+    audioLinks.push(href)
+  })
+
+  const flacLinks = audioLinks.filter((link) => link.endsWith('.flac'))
+  if (flacLinks.length > 0) {
+    return flacLinks[0]
+  }
+
+  const mp3Links = audioLinks.filter((link) => link.endsWith('.mp3'))
+  if (mp3Links.length > 0) {
+    return mp3Links[0]
+  }
+}