diff --git a/src/lib/components/views/LocalLibraryView.svelte b/src/lib/components/views/LocalLibraryView.svelte index 50d9b5ee8..6c606aca4 100644 --- a/src/lib/components/views/LocalLibraryView.svelte +++ b/src/lib/components/views/LocalLibraryView.svelte @@ -123,11 +123,13 @@ let albumViewMode = $state<'grid' | 'list'>('grid'); type AlbumGroupMode = 'alpha' | 'artist'; let albumGroupMode = $state('alpha'); + let albumGroupingEnabled = $state(false); let showGroupMenu = $state(false); let artistSearch = $state(''); let trackSearch = $state(''); type TrackGroupMode = 'album' | 'artist' | 'name'; let trackGroupMode = $state('album'); + let trackGroupingEnabled = $state(false); let showTrackGroupMenu = $state(false); let trackSearchTimer: ReturnType | null = null; @@ -1466,21 +1468,32 @@ onclick={() => (showGroupMenu = !showGroupMenu)} title="Group albums" > - {albumGroupMode === 'alpha' ? 'Group: A-Z' : 'Group: Artist'} + {!albumGroupingEnabled + ? 'Group: Off' + : albumGroupMode === 'alpha' + ? 'Group: A-Z' + : 'Group: Artist'} {#if showGroupMenu} {:else} - {@const groupedAlbums = groupAlbums(filteredAlbums, albumGroupMode)} - {@const alphaGroups = albumGroupMode === 'alpha' + {@const groupedAlbums = albumGroupingEnabled ? groupAlbums(filteredAlbums, albumGroupMode) : [{ key: '', id: 'ungrouped', albums: filteredAlbums }]} + {@const alphaGroups = albumGroupingEnabled && albumGroupMode === 'alpha' ? new Set(groupedAlbums.map(group => group.key)) : new Set()} @@ -1519,10 +1532,12 @@
{#each groupedAlbums as group (group.id)}
+ {#if albumGroupingEnabled}
{group.key} {group.albums.length}
+ {/if} {#if albumViewMode === 'grid'}
{#each group.albums as album (album.id)} @@ -1575,7 +1590,7 @@ {/each}
- {#if albumGroupMode === 'alpha'} + {#if albumGroupingEnabled && albumGroupMode === 'alpha'}
{#each alphaIndexLetters as letter} {#if showTrackGroupMenu} - {@const groupedTracks = groupTracks(tracks, trackGroupMode)} - {@const trackIndexTargets = trackGroupMode === 'artist' + {@const groupedTracks = trackGroupingEnabled ? groupTracks(tracks, trackGroupMode) : [{ id: 'ungrouped', title: '', subtitle: '', tracks, key: '' }]} + {@const trackIndexTargets = trackGroupingEnabled && trackGroupMode === 'artist' ? (() => { const map = new Map(); for (const group of groupedTracks) { @@ -1731,9 +1755,9 @@ return map; })() : new Map()} - {@const trackAlphaGroups = trackGroupMode === 'name' + {@const trackAlphaGroups = trackGroupingEnabled && trackGroupMode === 'name' ? new Set(groupedTracks.map(group => group.key)) - : trackGroupMode === 'artist' + : trackGroupingEnabled && trackGroupMode === 'artist' ? new Set(trackIndexTargets.keys()) : new Set()} @@ -1741,6 +1765,7 @@
{#each groupedTracks as group (group.id)}
+ {#if trackGroupingEnabled}
{group.title}
{#if group.subtitle} @@ -1748,9 +1773,10 @@ {/if}
{group.tracks.length} tracks
+ {/if}
- {#if trackGroupMode === 'album'} + {#if trackGroupingEnabled && trackGroupMode === 'album'} {@const trackSections = buildAlbumSections(group.tracks)} {@const showTrackDiscHeaders = trackSections.length > 1} {#each trackSections as section (section.disc)} @@ -1805,7 +1831,7 @@ {/each}
- {#if trackGroupMode === 'name' || trackGroupMode === 'artist'} + {#if trackGroupingEnabled && (trackGroupMode === 'name' || trackGroupMode === 'artist')}
{#each alphaIndexLetters as letter}