diff --git a/packages/main/cache.ts b/packages/main/cache.ts index c2b5e33..365fd23 100644 --- a/packages/main/cache.ts +++ b/packages/main/cache.ts @@ -80,7 +80,7 @@ export function getCache( break } case 'user/playlist': { - if (!query.uid) return + if (isNaN(Number(query.uid))) return const userPlaylists = db.get( ModelNames.USER_PLAYLISTS, Number(query?.uid) @@ -90,7 +90,16 @@ export function getCache( } case 'song/detail': { const ids: string[] = query?.ids.split(',') + if (ids.length === 0) return + + let isIDsValid = true + ids.forEach(id => { + if (id === '' || isNaN(Number(id))) isIDsValid = false + }) + if (!isIDsValid) return + const idsQuery = ids.map(id => `id = ${id}`).join(' OR ') + console.log(idsQuery) const tracksRaw = realm .objects(ModelNames.TRACK) .filtered(`(${idsQuery})`) @@ -109,28 +118,28 @@ export function getCache( } } case 'album': { - if (!query?.id) return + if (isNaN(Number(query?.id))) return const album = db.get(ModelNames.ALBUM, Number(query?.id)) as any if (checkIsExpired && isCacheExpired(album?.updateAt, 24 * 60)) return if (album?.json) return JSON.parse(album.json) break } case 'playlist/detail': { - if (!query?.id) return + if (isNaN(Number(query?.id))) return const playlist = db.get(ModelNames.PLAYLIST, Number(query?.id)) as any if (checkIsExpired && isCacheExpired(playlist?.updateAt, 10)) return if (playlist?.json) return JSON.parse(playlist.json) break } case 'artists': { - if (!query?.id) return + if (isNaN(Number(query?.id))) return const artist = db.get(ModelNames.ARTIST, Number(query?.id)) as any if (checkIsExpired && isCacheExpired(artist?.updateAt, 30)) return if (artist?.json) return JSON.parse(artist.json) break } case 'artist/album': { - if (!query?.id) return + if (isNaN(Number(query?.id))) return const artistAlbums = db.get( ModelNames.ARTIST_ALBUMS, Number(query?.id) diff --git a/packages/renderer/src/assets/icons/explicit.svg b/packages/renderer/src/assets/icons/explicit.svg new file mode 100644 index 0000000..80bf2c5 --- /dev/null +++ b/packages/renderer/src/assets/icons/explicit.svg @@ -0,0 +1,3 @@ + + + diff --git a/packages/renderer/src/components/CoverRow.tsx b/packages/renderer/src/components/CoverRow.tsx index 024aca8..3d456e6 100644 --- a/packages/renderer/src/components/CoverRow.tsx +++ b/packages/renderer/src/components/CoverRow.tsx @@ -170,6 +170,16 @@ const CoverRow = ({ className='mr-1 mb-1 inline-block h-3 w-3 text-gray-300' /> )} + + {/* Explicit icon */} + {(item as Album)?.mark === 1056768 && ( + + )} + + {/* Name */} goTo(item.id)} className='decoration-gray-600 decoration-2 hover:underline dark:text-white dark:decoration-gray-200' diff --git a/packages/renderer/src/components/Sidebar.tsx b/packages/renderer/src/components/Sidebar.tsx index c337027..52c8f7f 100644 --- a/packages/renderer/src/components/Sidebar.tsx +++ b/packages/renderer/src/components/Sidebar.tsx @@ -16,17 +16,17 @@ interface PrimaryTab extends Tab { const primaryTabs: PrimaryTab[] = [ { - name: 'Home', + name: '主页', icon: 'home', route: '/', }, { - name: 'Podcast', + name: '播客', icon: 'podcast', route: '/podcast', }, { - name: 'Library', + name: '音乐库', icon: 'music-library', route: '/library', }, diff --git a/packages/renderer/src/components/TracksAlbum.tsx b/packages/renderer/src/components/TracksAlbum.tsx index 0bc7701..9e1a12a 100644 --- a/packages/renderer/src/components/TracksAlbum.tsx +++ b/packages/renderer/src/components/TracksAlbum.tsx @@ -115,7 +115,15 @@ const Track = memo( isHighlight ? 'text-brand-500' : 'text-black dark:text-white' )} > - {track.name} + + {track.name} + {track.mark === 1318912 && ( + + )} + {subtitle && (
#
-
TITLE
+
标题
-
ARTIST
-
TIME
+
艺人
+
时长
{/* Tracks */} diff --git a/packages/renderer/src/components/TracksGrid.tsx b/packages/renderer/src/components/TracksGrid.tsx index 395be76..407d3d9 100644 --- a/packages/renderer/src/components/TracksGrid.tsx +++ b/packages/renderer/src/components/TracksGrid.tsx @@ -1,6 +1,8 @@ import ArtistInline from '@/components/ArtistsInline' import Skeleton from '@/components/Skeleton' import { resizeImage } from '@/utils/common' +import { Fragment } from 'react' +import SvgIcon from './SvgIcon' const Track = ({ track, @@ -52,11 +54,18 @@ const Track = ({ )}
- {!isSkeleton && ( - - )} - {isSkeleton && ( + {isSkeleton ? ( PLACE + ) : ( + + {track.mark === 1318912 && ( + + )} + + )}
diff --git a/packages/renderer/src/components/TracksList.tsx b/packages/renderer/src/components/TracksList.tsx index 26aefab..d859c53 100644 --- a/packages/renderer/src/components/TracksList.tsx +++ b/packages/renderer/src/components/TracksList.tsx @@ -87,7 +87,15 @@ const Track = memo( {isSkeleton ? ( PLACE ) : ( - + + {track.mark === 1318912 && ( + + )} + + )} @@ -191,10 +199,10 @@ const TracksList = memo(
-
TITLE
+
标题
-
ALBUM
-
TIME
+
专辑
+
时长
diff --git a/packages/renderer/src/pages/Album.tsx b/packages/renderer/src/pages/Album.tsx index 0bc8f12..d001e19 100644 --- a/packages/renderer/src/pages/Album.tsx +++ b/packages/renderer/src/pages/Album.tsx @@ -16,6 +16,7 @@ import { resizeImage, scrollToTop, } from '@/utils/common' +import useTracks from '@/hooks/useTracks' const PlayButton = ({ album, @@ -95,7 +96,7 @@ const Header = ({ /> )} -
+
@@ -285,6 +286,10 @@ const Album = () => { id: Number(params.id) || 0, }) + const { data: tracks } = useTracks({ + ids: album?.songs?.map(track => track.id) ?? [], + }) + const handlePlay = async (trackID: number | null = null) => { const realAlbum = album?.album if (!realAlbum) { @@ -302,7 +307,7 @@ const Album = () => { handlePlay={handlePlay} /> diff --git a/packages/renderer/src/pages/Artist.tsx b/packages/renderer/src/pages/Artist.tsx index 3ae010f..86de6fc 100644 --- a/packages/renderer/src/pages/Artist.tsx +++ b/packages/renderer/src/pages/Artist.tsx @@ -9,6 +9,7 @@ import TracksGrid from '@/components/TracksGrid' import CoverRow, { Subtitle } from '@/components/CoverRow' import Skeleton from '@/components/Skeleton' import { Fragment } from 'react' +import useTracks from '@/hooks/useTracks' const Artist = () => { const params = useParams() @@ -22,25 +23,48 @@ const Artist = () => { limit: 1000, }) + const { data: tracks, isLoading: isLoadingTracks } = useTracks({ + ids: artist?.hotSongs?.slice(0, 10)?.map(t => t.id) ?? [], + }) + const albums = useMemo(() => { if (!albumsRaw?.hotAlbums) return [] - return albumsRaw.hotAlbums.filter( - album => - album.type === '专辑' && - ['混音版', '精选集', 'Remix'].includes(album.subType) === false && - album.size > 1 - ) + const albums: Album[] = [] + albumsRaw.hotAlbums.forEach(album => { + if (album.type !== '专辑') return false + if (['混音版', '精选集', 'Remix'].includes(album.subType)) return false + + // No singles + if (album.size <= 1) return false + + // No remixes + if ( + /(\(|\[)(.*)(Remix|remix)(.*)(\)|\])/.test( + album.name.toLocaleLowerCase() + ) + ) { + return false + } + + // If have same name album only keep the Explicit version + const sameNameAlbumIndex = albums.findIndex(a => a.name === album.name) + if (sameNameAlbumIndex !== -1) { + if (album.mark === 1056768) albums[sameNameAlbumIndex] = album + return + } + + albums.push(album) + }) + return albums }, [albumsRaw?.hotAlbums]) const singles = useMemo(() => { if (!albumsRaw?.hotAlbums) return [] + const albumsIds = albums.map(album => album.id) return albumsRaw.hotAlbums.filter( - album => - album.type !== '专辑' || - ['混音版', '精选集', 'Remix'].includes(album.subType) || - album.size === 1 + album => albumsIds.includes(album.id) === false ) - }, [albumsRaw?.hotAlbums]) + }, [albums, albumsRaw?.hotAlbums]) const latestAlbum = useMemo(() => { if (!albumsRaw || !albumsRaw.hotAlbums) return @@ -89,7 +113,7 @@ const Artist = () => {
{/* Latest release */}
-
+
最新发行
@@ -110,12 +134,12 @@ const Artist = () => { {/* Popular tracks */}
-
+
热门歌曲
@@ -125,7 +149,7 @@ const Artist = () => { {/* Albums */} {albums.length !== 0 && (
-
+
专辑
{ {/* Singles/EP */}
-
+
单曲和EP
this._cacheAudio(this.trackID, audio)) + + const id = this.trackID + _howler.once('load', () => this._cacheAudio(id, audio)) if (!this._progressInterval) { this._setupProgressInterval()