Merge pull request #517 from kgarner7/navidrome-shared-playlists

[enhancement]: Differentiate shared and owner playlists for Navidrome
This commit is contained in:
Jeff 2024-03-04 02:41:40 -08:00 committed by GitHub
commit f7f3c5fe30
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 44 additions and 10 deletions

View file

@ -364,6 +364,7 @@
"playlists": "$t(entity.playlist_other)", "playlists": "$t(entity.playlist_other)",
"search": "$t(common.search)", "search": "$t(common.search)",
"settings": "$t(common.setting_other)", "settings": "$t(common.setting_other)",
"shared": "shared $t(entity.playlist_other)",
"tracks": "$t(entity.track_other)" "tracks": "$t(entity.track_other)"
}, },
"trackList": { "trackList": {

View file

@ -1,11 +1,11 @@
import { useCallback, useMemo, useState } from 'react'; import { useCallback, useMemo, useState } from 'react';
import { Flex, Group } from '@mantine/core'; import { Box, Flex, Group } from '@mantine/core';
import { useDebouncedValue } from '@mantine/hooks'; import { useDebouncedValue } from '@mantine/hooks';
import { useTranslation } from 'react-i18next'; import { useTranslation } from 'react-i18next';
import { RiAddBoxFill, RiAddCircleFill, RiPlayFill } from 'react-icons/ri'; import { RiAddBoxFill, RiAddCircleFill, RiPlayFill } from 'react-icons/ri';
import { generatePath } from 'react-router'; import { generatePath } from 'react-router';
import { Link } from 'react-router-dom'; import { Link } from 'react-router-dom';
import { LibraryItem } from '/@/renderer/api/types'; import { LibraryItem, Playlist } from '/@/renderer/api/types';
import { Button, Text } from '/@/renderer/components'; import { Button, Text } from '/@/renderer/components';
import { usePlayQueueAdd } from '/@/renderer/features/player'; import { usePlayQueueAdd } from '/@/renderer/features/player';
import { usePlaylistList } from '/@/renderer/features/playlists'; import { usePlaylistList } from '/@/renderer/features/playlists';
@ -14,7 +14,7 @@ import { Play } from '/@/renderer/types';
import AutoSizer from 'react-virtualized-auto-sizer'; import AutoSizer from 'react-virtualized-auto-sizer';
import { FixedSizeList, ListChildComponentProps } from 'react-window'; import { FixedSizeList, ListChildComponentProps } from 'react-window';
import { useHideScrollbar } from '/@/renderer/hooks'; import { useHideScrollbar } from '/@/renderer/hooks';
import { useGeneralSettings } from '/@/renderer/store'; import { useCurrentServer, useGeneralSettings } from '/@/renderer/store';
interface SidebarPlaylistListProps { interface SidebarPlaylistListProps {
data: ReturnType<typeof usePlaylistList>['data']; data: ReturnType<typeof usePlaylistList>['data'];
@ -22,6 +22,20 @@ interface SidebarPlaylistListProps {
const PlaylistRow = ({ index, data, style }: ListChildComponentProps) => { const PlaylistRow = ({ index, data, style }: ListChildComponentProps) => {
const { t } = useTranslation(); const { t } = useTranslation();
if (data?.items[index] === null) {
return (
<div style={{ margin: '0.5rem 0', padding: '0 1.5rem', ...style }}>
<Box
fw="600"
sx={{ fontSize: '1.2rem' }}
>
{t('page.sidebar.shared', { postProcess: 'titleCase' })}
</Box>
</div>
);
}
const path = data?.items[index].id const path = data?.items[index].id
? data.defaultFullPlaylist ? data.defaultFullPlaylist
? generatePath(AppRoute.PLAYLISTS_DETAIL_SONGS, { playlistId: data.items[index].id }) ? generatePath(AppRoute.PLAYLISTS_DETAIL_SONGS, { playlistId: data.items[index].id })
@ -125,6 +139,7 @@ export const SidebarPlaylistList = ({ data }: SidebarPlaylistListProps) => {
const { isScrollbarHidden, hideScrollbarElementProps } = useHideScrollbar(0); const { isScrollbarHidden, hideScrollbarElementProps } = useHideScrollbar(0);
const handlePlayQueueAdd = usePlayQueueAdd(); const handlePlayQueueAdd = usePlayQueueAdd();
const { defaultFullPlaylist } = useGeneralSettings(); const { defaultFullPlaylist } = useGeneralSettings();
const { type, username } = useCurrentServer() || {};
const [rect, setRect] = useState({ const [rect, setRect] = useState({
height: 0, height: 0,
@ -147,12 +162,30 @@ export const SidebarPlaylistList = ({ data }: SidebarPlaylistListProps) => {
); );
const memoizedItemData = useMemo(() => { const memoizedItemData = useMemo(() => {
return { const base = { defaultFullPlaylist, handlePlay: handlePlayPlaylist };
defaultFullPlaylist,
handlePlay: handlePlayPlaylist, if (!type || !username || !data?.items) {
items: data?.items, return { ...base, items: data?.items };
}; }
}, [data?.items, defaultFullPlaylist, handlePlayPlaylist]);
const owned: Array<Playlist | null> = [];
const shared: Playlist[] = [];
for (const playlist of data.items) {
if (playlist.owner !== username) {
shared.push(playlist);
} else {
owned.push(playlist);
}
}
if (shared.length > 0) {
// Use `null` as a separator between owned and shared playlists
owned.push(null);
}
return { ...base, items: owned.concat(shared) };
}, [data?.items, defaultFullPlaylist, handlePlayPlaylist, type, username]);
return ( return (
<Flex <Flex
@ -168,7 +201,7 @@ export const SidebarPlaylistList = ({ data }: SidebarPlaylistListProps) => {
: 'overlay-scrollbar' : 'overlay-scrollbar'
} }
height={debounced.height} height={debounced.height}
itemCount={data?.items?.length || 0} itemCount={memoizedItemData?.items?.length || 0}
itemData={memoizedItemData} itemData={memoizedItemData}
itemSize={25} itemSize={25}
overscanCount={20} overscanCount={20}