diff --git a/ui.ts b/ui.ts index c636084..aa59e86 100644 --- a/ui.ts +++ b/ui.ts @@ -170,6 +170,7 @@ export const html = ` + @@ -289,10 +290,17 @@ function render(f){ var el=document.getElementById('results'); if(!songs.length){el.innerHTML='
No results
';return} el.innerHTML=songs.map((s,i)=>{ - var playable=s.videoId&&(s.resultType==='song'||s.resultType==='video'||!s.resultType); - var click=playable?'play('+i+')':s.resultType==='artist'?'viewArtist("'+s.browseId+'")':s.resultType==='album'?'viewAlbum("'+s.browseId+'")':''; + var type=s.resultType||'song'; + var playable=s.videoId&&(type==='song'||type==='video'); + var click=''; + if(playable){click='play('+i+')';} + else if(type==='artist'&&s.browseId){click='viewArtist("'+s.browseId+'")';} + else if(type==='album'&&s.browseId){click='viewAlbum("'+s.browseId+'")';} + else if(type==='playlist'&&(s.browseId||s.playlistId)){click='viewPlaylist("'+(s.playlistId||s.browseId)+'")';} + else if(s.browseId){click='viewArtist("'+s.browseId+'")';} var img=s.thumbnails?.[0]?.url||(s.videoId?'https://img.youtube.com/vi/'+s.videoId+'/mqdefault.jpg':''); - return '
'+esc(s.title||'Unknown')+'
'+esc(s.artists?.map(a=>a.name).join(', ')||s.subtitle||'')+'
'+(s.duration||'')+'
'; + var badge=type!=='song'&&type!=='video'?''+type+'':''; + return '
'+esc(s.title||s.name||'Unknown')+badge+'
'+esc(s.artists?.map(a=>a.name).join(', ')||s.subtitle||'')+'
'+(s.duration||'')+'
'; }).join(''); } @@ -311,6 +319,7 @@ function next(){if(idx