Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Implement Navidrome sharing #575

Merged
merged 9 commits into from
Apr 22, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions src/i18n/locales/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,7 @@
"setting": "setting",
"setting_one": "setting",
"setting_other": "settings",
"share": "share",
"size": "size",
"sortOrder": "order",
"title": "title",
Expand Down Expand Up @@ -257,6 +258,14 @@
"input_optionMatchAll": "match all",
"input_optionMatchAny": "match any"
},
"shareItem": {
"allowDownloading": "allow downloading",
"description": "description",
"setExpiration": "set expiration",
"success": "share link copied to clipboard (or click here to open)",
"expireInvalid": "expiration must be in the future",
"createFailed": "failed to create share (is sharing enabled?)"
},
"updateServer": {
"success": "server updated successfully",
"title": "update server"
Expand Down Expand Up @@ -315,6 +324,7 @@
"removeFromPlaylist": "$t(action.removeFromPlaylist)",
"removeFromQueue": "$t(action.removeFromQueue)",
"setRating": "$t(action.setRating)",
"shareItem": "share item",
"showDetails": "get info"
},
"fullscreenPlayer": {
Expand Down
16 changes: 16 additions & 0 deletions src/renderer/api/controller.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import type {
AlbumArtistDetailArgs,
AlbumArtistListArgs,
SetRatingArgs,
ShareItemArgs,
GenreListArgs,
CreatePlaylistArgs,
DeletePlaylistArgs,
Expand Down Expand Up @@ -55,6 +56,7 @@ import type {
SimilarSongsArgs,
Song,
ServerType,
ShareItemResponse,
} from '/@/renderer/api/types';
import { DeletePlaylistResponse, RandomSongListArgs } from './types';
import { ndController } from '/@/renderer/api/navidrome/navidrome-controller';
Expand Down Expand Up @@ -102,6 +104,7 @@ export type ControllerEndpoint = Partial<{
scrobble: (args: ScrobbleArgs) => Promise<ScrobbleResponse>;
search: (args: SearchArgs) => Promise<SearchResponse>;
setRating: (args: SetRatingArgs) => Promise<RatingResponse>;
shareItem: (args: ShareItemArgs) => Promise<ShareItemResponse>;
updatePlaylist: (args: UpdatePlaylistArgs) => Promise<UpdatePlaylistResponse>;
}>;

Expand Down Expand Up @@ -149,6 +152,7 @@ const endpoints: ApiController = {
scrobble: jfController.scrobble,
search: jfController.search,
setRating: undefined,
shareItem: undefined,
updatePlaylist: jfController.updatePlaylist,
},
navidrome: {
Expand Down Expand Up @@ -188,6 +192,7 @@ const endpoints: ApiController = {
scrobble: ssController.scrobble,
search: ssController.search3,
setRating: ssController.setRating,
shareItem: ndController.shareItem,
updatePlaylist: ndController.updatePlaylist,
},
subsonic: {
Expand Down Expand Up @@ -223,6 +228,7 @@ const endpoints: ApiController = {
scrobble: ssController.scrobble,
search: ssController.search3,
setRating: undefined,
shareItem: undefined,
updatePlaylist: undefined,
},
};
Expand Down Expand Up @@ -457,6 +463,15 @@ const updateRating = async (args: SetRatingArgs) => {
)?.(args);
};

const shareItem = async (args: ShareItemArgs) => {
return (
apiController(
'shareItem',
args.apiClientProps.server?.type,
) as ControllerEndpoint['shareItem']
)?.(args);
};

const getTopSongList = async (args: TopSongListArgs) => {
return (
apiController(
Expand Down Expand Up @@ -555,6 +570,7 @@ export const controller = {
removeFromPlaylist,
scrobble,
search,
shareItem,
updatePlaylist,
updateRating,
};
1 change: 1 addition & 0 deletions src/renderer/api/features-types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ export enum ServerFeature {
LYRICS_MULTIPLE_STRUCTURED = 'lyricsMultipleStructured',
LYRICS_SINGLE_STRUCTURED = 'lyricsSingleStructured',
PLAYLISTS_SMART = 'playlistsSmart',
SHARING_ALBUM_SONG = 'sharingAlbumSong',
}

export type ServerFeatures = Partial<Record<ServerFeature, boolean>>;
10 changes: 10 additions & 0 deletions src/renderer/api/navidrome/navidrome-api.ts
Original file line number Diff line number Diff line change
Expand Up @@ -157,6 +157,16 @@ export const contract = c.router({
500: resultWithHeaders(ndType._response.error),
},
},
shareItem: {
body: ndType._parameters.shareItem,
method: 'POST',
path: 'share',
responses: {
200: resultWithHeaders(ndType._response.shareItem),
404: resultWithHeaders(ndType._response.error),
500: resultWithHeaders(ndType._response.error),
},
},
updatePlaylist: {
body: ndType._parameters.updatePlaylist,
method: 'PUT',
Expand Down
29 changes: 29 additions & 0 deletions src/renderer/api/navidrome/navidrome-controller.ts
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,8 @@ import {
genreListSortMap,
ServerInfo,
ServerInfoArgs,
ShareItemArgs,
ShareItemResponse,
SimilarSongsArgs,
Song,
} from '../types';
Expand Down Expand Up @@ -484,7 +486,10 @@ const removeFromPlaylist = async (
return null;
};

// The order should be in decreasing version, as the highest version match
// will automatically consider all lower versions matched
const VERSION_INFO: Array<[string, Record<string, number[]>]> = [
['0.49.3', { [ServerFeature.SHARING_ALBUM_SONG]: [1] }],
['0.48.0', { [ServerFeature.PLAYLISTS_SMART]: [1] }],
];

Expand Down Expand Up @@ -544,11 +549,34 @@ const getServerInfo = async (args: ServerInfoArgs): Promise<ServerInfo> => {
const features: ServerFeatures = {
lyricsMultipleStructured: !!navidromeFeatures[SubsonicExtensions.SONG_LYRICS],
playlistsSmart: !!navidromeFeatures[ServerFeature.PLAYLISTS_SMART],
sharingAlbumSong: !!navidromeFeatures[ServerFeature.SHARING_ALBUM_SONG],
};

return { features, id: apiClientProps.server?.id, version: ping.body.serverVersion! };
};

const shareItem = async (args: ShareItemArgs): Promise<ShareItemResponse> => {
const { body, apiClientProps } = args;

const res = await ndApiClient(apiClientProps).shareItem({
body: {
description: body.description,
downloadable: body.downloadable,
expires: body.expires,
resourceIds: body.resourceIds,
resourceType: body.resourceType,
},
});

if (res.status !== 200) {
throw new Error('Failed to share item');
}

return {
id: res.body.data.id,
};
};

const getSimilarSongs = async (args: SimilarSongsArgs): Promise<Song[]> => {
const { apiClientProps, query } = args;

Expand Down Expand Up @@ -620,5 +648,6 @@ export const ndController = {
getSongList,
getUserList,
removeFromPlaylist,
shareItem,
updatePlaylist,
};
14 changes: 14 additions & 0 deletions src/renderer/api/navidrome/navidrome-types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -343,6 +343,18 @@ const removeFromPlaylistParameters = z.object({
id: z.array(z.string()),
});

const shareItem = z.object({
id: z.string(),
});

const shareItemParameters = z.object({
description: z.string(),
downloadable: z.boolean(),
expires: z.number(),
resourceIds: z.string(),
resourceType: z.string(),
});

export const ndType = {
_enum: {
albumArtistList: ndAlbumArtistListSort,
Expand All @@ -361,6 +373,7 @@ export const ndType = {
genreList: genreListParameters,
playlistList: playlistListParameters,
removeFromPlaylist: removeFromPlaylistParameters,
shareItem: shareItemParameters,
songList: songListParameters,
updatePlaylist: updatePlaylistParameters,
userList: userListParameters,
Expand All @@ -382,6 +395,7 @@ export const ndType = {
playlistSong,
playlistSongList,
removeFromPlaylist,
shareItem,
song,
songList,
updatePlaylist,
Expand Down
13 changes: 13 additions & 0 deletions src/renderer/api/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -766,6 +766,19 @@ export type RatingQuery = {

export type SetRatingArgs = { query: RatingQuery; serverId?: string } & BaseEndpointArgs;

// Sharing
export type ShareItemResponse = { id: string } | undefined;

export type ShareItemBody = {
description: string;
downloadable: boolean;
expires: number;
resourceIds: string;
resourceType: string;
};

export type ShareItemArgs = { body: ShareItemBody; serverId?: string } & BaseEndpointArgs;

// Add to playlist
export type AddToPlaylistResponse = null | undefined;

Expand Down
6 changes: 4 additions & 2 deletions src/renderer/features/context-menu/context-menu-items.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,8 @@ export const SONG_CONTEXT_MENU_ITEMS: SetContextMenuItems = [
{ divider: true, id: 'addToPlaylist' },
{ id: 'addToFavorites' },
{ divider: true, id: 'removeFromFavorites' },
{ children: true, disabled: false, id: 'setRating' },
{ children: true, disabled: false, divider: true, id: 'setRating' },
{ divider: true, id: 'shareItem' },
{ divider: true, id: 'showDetails' },
];

Expand Down Expand Up @@ -53,7 +54,8 @@ export const ALBUM_CONTEXT_MENU_ITEMS: SetContextMenuItems = [
{ divider: true, id: 'addToPlaylist' },
{ id: 'addToFavorites' },
{ id: 'removeFromFavorites' },
{ children: true, disabled: false, id: 'setRating' },
{ children: true, disabled: false, divider: true, id: 'setRating' },
{ divider: true, id: 'shareItem' },
{ divider: true, id: 'showDetails' },
];

Expand Down
30 changes: 29 additions & 1 deletion src/renderer/features/context-menu/context-menu-provider.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ import {
import { closeAllModals, openContextModal, openModal } from '@mantine/modals';
import { AnimatePresence } from 'framer-motion';
import isElectron from 'is-electron';
import { ServerFeature } from '/@/renderer/api/features-types';
import { hasFeature } from '/@/renderer/api/utils';
import { useTranslation } from 'react-i18next';
import {
RiAddBoxFill,
Expand All @@ -25,6 +27,7 @@ import {
RiPlayListAddFill,
RiStarFill,
RiCloseCircleLine,
RiShareForwardFill,
RiInformationFill,
} from 'react-icons/ri';
import { AnyLibraryItems, LibraryItem, ServerType, AnyLibraryItem } from '/@/renderer/api/types';
Expand Down Expand Up @@ -78,7 +81,7 @@ const ContextMenuContext = createContext<ContextMenuContextProps>({
},
});

const JELLYFIN_IGNORED_MENU_ITEMS: ContextMenuItemType[] = ['setRating'];
const JELLYFIN_IGNORED_MENU_ITEMS: ContextMenuItemType[] = ['setRating', 'shareItem'];
// const NAVIDROME_IGNORED_MENU_ITEMS: ContextMenuItemType[] = [];
// const SUBSONIC_IGNORED_MENU_ITEMS: ContextMenuItemType[] = [];

Expand Down Expand Up @@ -602,6 +605,22 @@ export const ContextMenuProvider = ({ children }: ContextMenuProviderProps) => {
}
}, [ctx.dataNodes, moveToTopOfQueue, playbackType]);

const handleShareItem = useCallback(() => {
if (!ctx.dataNodes && !ctx.data) return;

const uniqueIds = ctx.data.map((node) => node.id);

openContextModal({
innerProps: {
itemIds: uniqueIds,
resourceType: ctx.data[0].itemType,
},
modal: 'shareItem',
size: 'md',
title: t('page.contextMenu.shareItem', { postProcess: 'sentenceCase' }),
});
}, [ctx.data, ctx.dataNodes, t]);

const handleRemoveSelected = useCallback(() => {
const uniqueIds = ctx.dataNodes?.map((row) => row.data.uniqueId);
if (!uniqueIds?.length) return;
Expand Down Expand Up @@ -787,6 +806,13 @@ export const ContextMenuProvider = ({ children }: ContextMenuProviderProps) => {
onClick: () => {},
rightIcon: <RiArrowRightSFill size="1.2rem" />,
},
shareItem: {
disabled: !hasFeature(server, ServerFeature.SHARING_ALBUM_SONG),
id: 'shareItem',
label: t('page.contextMenu.shareItem', { postProcess: 'sentenceCase' }),
leftIcon: <RiShareForwardFill size="1.1rem" />,
onClick: handleShareItem,
},
showDetails: {
disabled: ctx.data?.length !== 1 || !ctx.data[0].itemType,
id: 'showDetails',
Expand All @@ -810,6 +836,8 @@ export const ContextMenuProvider = ({ children }: ContextMenuProviderProps) => {
handleOpenItemDetails,
handlePlay,
handleUpdateRating,
handleShareItem,
server,
]);

const mergedRef = useMergedRef(ref, clickOutsideRef);
Expand Down
1 change: 1 addition & 0 deletions src/renderer/features/context-menu/events.ts
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ export type ContextMenuItemType =
| 'addToFavorites'
| 'removeFromFavorites'
| 'setRating'
| 'shareItem'
| 'deletePlaylist'
| 'createPlaylist'
| 'moveToBottomOfQueue'
Expand Down
Loading
Loading