mbrucedogs/singsalot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Signed-off-by: mbrucedogs <mbrucedogs@gmail.com>

Browse Source
This commit is contained in:
mbrucedogs 2025-07-21 12:47:56 -05:00
parent 7d2369252e
commit a326500100
5 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/common/SongInfo.tsx
View File

@ -37,7 +37,7 @@ const SongInfo: React.FC<SongInfoProps> = ({ isOpen, onClose, song }) => {
const isInQueue = (Object.values(queue) as QueueItem[]).some(queueItem => queueItem.song && queueItem.song.path === song.path); const isInQueue = (Object.values(queue) as QueueItem[]).some(queueItem => queueItem.song && queueItem.song.path === song.path);
const artistSongs = (Object.values(allSongs) as Song[]).filter(s => const artistSongs = (Object.values(allSongs) as Song[]).filter(s =>
s.artist.toLowerCase() === song.artist.toLowerCase() && s.path !== song.path (s.artist || '').toLowerCase() === (song.artist || '').toLowerCase() && s.path !== song.path
); );
const handleQueueSong = () => { const handleQueueSong = () => {

6
src/hooks/useArtists.ts
View File

@ -15,7 +15,7 @@ export const useArtists = () => {
const countsMap = new Map<string, number>(); const countsMap = new Map<string, number>();
allSongs.forEach(song => { allSongs.forEach(song => {
const artist = song.artist.toLowerCase(); const artist = (song.artist || '').toLowerCase();
if (!songsMap.has(artist)) { if (!songsMap.has(artist)) {
songsMap.set(artist, []); songsMap.set(artist, []);
countsMap.set(artist, 0); countsMap.set(artist, 0);
@ -34,12 +34,12 @@ export const useArtists = () => {
// Get songs by artist (now using cached data) // Get songs by artist (now using cached data)
const getSongsByArtist = useCallback((artistName: string) => { const getSongsByArtist = useCallback((artistName: string) => {
return songsByArtist.songsMap.get(artistName.toLowerCase()) || []; return songsByArtist.songsMap.get((artistName || '').toLowerCase()) || [];
}, [songsByArtist.songsMap]); }, [songsByArtist.songsMap]);
// Get song count by artist (now using cached data) // Get song count by artist (now using cached data)
const getSongCountByArtist = useCallback((artistName: string) => { const getSongCountByArtist = useCallback((artistName: string) => {
return songsByArtist.countsMap.get(artistName.toLowerCase()) || 0; return songsByArtist.countsMap.get((artistName || '').toLowerCase()) || 0;
}, [songsByArtist.countsMap]); }, [songsByArtist.countsMap]);
return { return {

4
src/hooks/usePaginatedData.ts
View File

@ -49,11 +49,11 @@ export const usePaginatedData = <T>(
// Simple search implementation - can be overridden by passing filtered items // Simple search implementation - can be overridden by passing filtered items
return allItems.filter((item: T) => { return allItems.filter((item: T) => {
if (typeof item === 'string') { if (typeof item === 'string') {
return item.toLowerCase().includes(searchTerm.toLowerCase()); return (item || '').toLowerCase().includes((searchTerm || '').toLowerCase());
} }
if (typeof item === 'object' && item !== null) { if (typeof item === 'object' && item !== null) {
return Object.values(item as Record<string, unknown>).some(value => return Object.values(item as Record<string, unknown>).some(value =>
String(value).toLowerCase().includes(searchTerm.toLowerCase()) String(value || '').toLowerCase().includes((searchTerm || '').toLowerCase())
); );
} }
return false; return false;

4
src/hooks/useSongLists.ts
View File

@ -22,8 +22,8 @@ export const useSongLists = () => {
// Search for songs by artist and title // Search for songs by artist and title
const matchingSongs = allSongs.filter(song => const matchingSongs = allSongs.filter(song =>
song.artist.toLowerCase() === songListSong.artist.toLowerCase() && (song.artist || '').toLowerCase() === (songListSong.artist || '').toLowerCase() &&
song.title.toLowerCase() === songListSong.title.toLowerCase() (song.title || '').toLowerCase() === (songListSong.title || '').toLowerCase()
); );
return matchingSongs; return matchingSongs;

6
src/utils/dataProcessing.ts
View File

@ -29,13 +29,13 @@ export const filterSongs = (songs: Song[], searchTerm: string, disabledSongPaths
if (!searchTerm.trim()) return filteredSongs; if (!searchTerm.trim()) return filteredSongs;
const terms = searchTerm.toLowerCase().split(/\s+/).filter(term => term.length > 0); const terms = (searchTerm || '').toLowerCase().split(/\s+/).filter(term => term.length > 0);
if (terms.length === 0) return filteredSongs; if (terms.length === 0) return filteredSongs;
return filteredSongs.filter(song => { return filteredSongs.filter(song => {
const songTitle = song.title.toLowerCase(); const songTitle = (song.title || '').toLowerCase();
const songArtist = song.artist.toLowerCase(); const songArtist = (song.artist || '').toLowerCase();
// If only one term, use OR logic (title OR artist) // If only one term, use OR logic (title OR artist)
if (terms.length === 1) { if (terms.length === 1) {