Add internet radio (#1384)

This commit is contained in:
Jeff
2025-12-13 21:26:33 -08:00
committed by GitHub
parent f61d34c340
commit 7ed847fecb
46 changed files with 2229 additions and 118 deletions
+1
View File
@@ -97,6 +97,7 @@
"format-duration": "^3.0.2", "format-duration": "^3.0.2",
"fuse.js": "^7.1.0", "fuse.js": "^7.1.0",
"i18next": "^25.6.2", "i18next": "^25.6.2",
"icecast-metadata-stats": "^0.1.12",
"idb-keyval": "^6.2.2", "idb-keyval": "^6.2.2",
"immer": "^10.2.0", "immer": "^10.2.0",
"is-electron": "^2.2.2", "is-electron": "^2.2.2",
+23
View File
@@ -116,6 +116,9 @@ importers:
i18next: i18next:
specifier: ^25.6.2 specifier: ^25.6.2
version: 25.6.2(typescript@5.8.3) version: 25.6.2(typescript@5.8.3)
icecast-metadata-stats:
specifier: ^0.1.12
version: 0.1.12
idb-keyval: idb-keyval:
specifier: ^6.2.2 specifier: ^6.2.2
version: 6.2.2 version: 6.2.2
@@ -2473,6 +2476,9 @@ packages:
react: ^18 || ^19 || ^19.0.0-rc react: ^18 || ^19 || ^19.0.0-rc
react-dom: ^18 || ^19 || ^19.0.0-rc react-dom: ^18 || ^19 || ^19.0.0-rc
codec-parser@2.5.0:
resolution: {integrity: sha512-Ru9t80fV8B0ZiixQl8xhMTLru+dzuis/KQld32/x5T/+3LwZb0/YvQdSKytX9JqCnRdiupvAvyYJINKrXieziQ==}
color-convert@2.0.1: color-convert@2.0.1:
resolution: {integrity: sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==} resolution: {integrity: sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==}
engines: {node: '>=7.0.0'} engines: {node: '>=7.0.0'}
@@ -3443,6 +3449,13 @@ packages:
typescript: typescript:
optional: true optional: true
icecast-metadata-js@1.2.9:
resolution: {integrity: sha512-8YqPrJ4AjM64O28xF9TSUUFczxnTKwXwnIPmZKRxdbaZb6hn0nP+ke1OGNA+UsIfLpNRW4acDDBkIkbynYVQig==}
icecast-metadata-stats@0.1.12:
resolution: {integrity: sha512-qywYIIvxjAmZIFNUXMVZ/IgIJh87z0W6oOmJ5htPw3SUauXcYoY6rRexvzN5Ibct8hXsqoTcB+k8m6Wa53bfJg==}
engines: {node: '>=18.0.0'}
iconv-corefoundation@1.1.7: iconv-corefoundation@1.1.7:
resolution: {integrity: sha512-T10qvkw0zz4wnm560lOEg0PovVqUXuOFhhHAkixw8/sycy7TJt7v/RrkEKEQnAw2viPSJu6iAkErxnzR0g8PpQ==} resolution: {integrity: sha512-T10qvkw0zz4wnm560lOEg0PovVqUXuOFhhHAkixw8/sycy7TJt7v/RrkEKEQnAw2viPSJu6iAkErxnzR0g8PpQ==}
engines: {node: ^8.11.2 || >=10} engines: {node: ^8.11.2 || >=10}
@@ -8274,6 +8287,8 @@ snapshots:
- '@types/react' - '@types/react'
- '@types/react-dom' - '@types/react-dom'
codec-parser@2.5.0: {}
color-convert@2.0.1: color-convert@2.0.1:
dependencies: dependencies:
color-name: 1.1.4 color-name: 1.1.4
@@ -9521,6 +9536,14 @@ snapshots:
optionalDependencies: optionalDependencies:
typescript: 5.8.3 typescript: 5.8.3
icecast-metadata-js@1.2.9:
dependencies:
codec-parser: 2.5.0
icecast-metadata-stats@0.1.12:
dependencies:
icecast-metadata-js: 1.2.9
iconv-corefoundation@1.1.7: iconv-corefoundation@1.1.7:
dependencies: dependencies:
cli-truncate: 2.1.0 cli-truncate: 2.1.0
+17
View File
@@ -4,7 +4,9 @@
"addToPlaylist": "add to $t(entity.playlist_one)", "addToPlaylist": "add to $t(entity.playlist_one)",
"clearQueue": "clear queue", "clearQueue": "clear queue",
"createPlaylist": "create $t(entity.playlist_one)", "createPlaylist": "create $t(entity.playlist_one)",
"createRadioStation": "create $t(entity.radioStation_one)",
"deletePlaylist": "delete $t(entity.playlist_one)", "deletePlaylist": "delete $t(entity.playlist_one)",
"deleteRadioStation": "delete $t(entity.radioStation_one)",
"deselectAll": "deselect all", "deselectAll": "deselect all",
"downloadStarted": "started download of {{count}} items", "downloadStarted": "started download of {{count}} items",
"editPlaylist": "edit $t(entity.playlist_one)", "editPlaylist": "edit $t(entity.playlist_one)",
@@ -158,6 +160,10 @@
"albumArtistCount_other": "{{count}} album artists", "albumArtistCount_other": "{{count}} album artists",
"albumWithCount_one": "{{count}} album", "albumWithCount_one": "{{count}} album",
"albumWithCount_other": "{{count}} albums", "albumWithCount_other": "{{count}} albums",
"radioStation_one": "radio station",
"radioStation_other": "radio stations",
"radioStationWithCount_one": "{{count}} radio station",
"radioStationWithCount_other": "{{count}} radio stations",
"artist_one": "artist", "artist_one": "artist",
"artist_other": "artists", "artist_other": "artists",
"artistWithCount_one": "{{count}} artist", "artistWithCount_one": "{{count}} artist",
@@ -316,6 +322,13 @@
"success": "$t(entity.playlist_one) created successfully", "success": "$t(entity.playlist_one) created successfully",
"title": "create $t(entity.playlist_one)" "title": "create $t(entity.playlist_one)"
}, },
"createRadioStation": {
"success": "radio station created successfully",
"title": "create radio station",
"input_homepageUrl": "homepage url",
"input_name": "name",
"input_streamUrl": "stream url"
},
"deletePlaylist": { "deletePlaylist": {
"input_confirm": "type the name of the $t(entity.playlist_one) to confirm", "input_confirm": "type the name of the $t(entity.playlist_one) to confirm",
"success": "$t(entity.playlist_one) deleted successfully", "success": "$t(entity.playlist_one) deleted successfully",
@@ -398,6 +411,9 @@
"genreAlbums": "\"{{genre}}\" $t(entity.album_other)", "genreAlbums": "\"{{genre}}\" $t(entity.album_other)",
"title": "$t(entity.album_other)" "title": "$t(entity.album_other)"
}, },
"radioList": {
"title": "radio stations"
},
"favorites": { "favorites": {
"title": "$t(entity.favorite_other)" "title": "$t(entity.favorite_other)"
}, },
@@ -546,6 +562,7 @@
"folders": "$t(entity.folder_other)", "folders": "$t(entity.folder_other)",
"genres": "$t(entity.genre_other)", "genres": "$t(entity.genre_other)",
"home": "$t(common.home)", "home": "$t(common.home)",
"radio": "$t(entity.radioStation_other)",
"myLibrary": "my library", "myLibrary": "my library",
"nowPlaying": "now playing", "nowPlaying": "now playing",
"playlists": "$t(entity.playlist_other)", "playlists": "$t(entity.playlist_other)",
+88
View File
@@ -10,6 +10,8 @@ import { getMainWindow, sendToastToRenderer } from '../../../index';
import { createLog, isWindows } from '../../../utils'; import { createLog, isWindows } from '../../../utils';
import { store } from '../settings'; import { store } from '../settings';
import { PlayerData } from '/@/shared/types/domain-types';
declare module 'node-mpv'; declare module 'node-mpv';
// function wait(timeout: number) { // function wait(timeout: number) {
@@ -21,6 +23,7 @@ declare module 'node-mpv';
// } // }
let mpvInstance: MpvAPI | null = null; let mpvInstance: MpvAPI | null = null;
let currentPlayerData: null | PlayerData = null;
const socketPath = isWindows() ? `\\\\.\\pipe\\mpvserver-${pid}` : `/tmp/node-mpv-${pid}.sock`; const socketPath = isWindows() ? `\\\\.\\pipe\\mpvserver-${pid}` : `/tmp/node-mpv-${pid}.sock`;
const NodeMpvErrorCode = { const NodeMpvErrorCode = {
@@ -437,6 +440,91 @@ ipcMain.handle('player-get-time', async (): Promise<number | undefined> => {
} }
}); });
// Updates the current player metadata (song data)
ipcMain.on('player-update-metadata', (_event, data: PlayerData) => {
currentPlayerData = data;
});
// Returns the current player metadata (song data)
ipcMain.handle('player-metadata', async (): Promise<null | PlayerData> => {
return currentPlayerData;
});
// Returns the stream metadata from mpv (for radio streams)
ipcMain.handle(
'player-stream-metadata',
async (): Promise<null | { artist: null | string; title: null | string }> => {
try {
const metadata = await getMpvInstance()?.getProperty('metadata');
if (metadata && typeof metadata === 'object') {
// Try to get separate title and artist fields first
let artist: null | string =
(metadata['artist'] as string) ||
(metadata['ARTIST'] as string) ||
(metadata['icy-artist'] as string) ||
null;
let title: null | string =
(metadata['title'] as string) || (metadata['TITLE'] as string) || null;
// If we don't have separate fields, try to parse from combined formats
if (!title && !artist) {
const combinedTitle =
(metadata['icy-title'] as string) ||
(metadata['StreamTitle'] as string) ||
(metadata['stream-title'] as string) ||
null;
if (combinedTitle && typeof combinedTitle === 'string') {
// Try to parse "Artist - Title" format
const match = combinedTitle.match(/^(.*?)\s*[-–—]\s*(.+)$/);
if (match) {
artist = match[1].trim() || null;
title = match[2].trim() || null;
} else {
// If no separator found, treat the whole thing as title
title = combinedTitle;
}
}
} else if (!title) {
// If we have artist but no title, try to get from combined format
const combinedTitle =
(metadata['icy-title'] as string) ||
(metadata['StreamTitle'] as string) ||
(metadata['stream-title'] as string) ||
null;
if (combinedTitle && typeof combinedTitle === 'string') {
title = combinedTitle;
}
} else if (!artist) {
// If we have title but no artist, try to get from combined format
const combinedTitle =
(metadata['icy-title'] as string) ||
(metadata['StreamTitle'] as string) ||
(metadata['stream-title'] as string) ||
null;
if (
combinedTitle &&
typeof combinedTitle === 'string' &&
combinedTitle !== title
) {
// Try to parse artist from combined format
const match = combinedTitle.match(/^(.*?)\s*[-–—]\s*(.+)$/);
if (match && match[2].trim() === title) {
artist = match[1].trim() || null;
}
}
}
return { artist, title };
}
return null;
} catch (err: any | NodeMpvError) {
mpvLog({ action: `Failed to get stream metadata` }, err);
return null;
}
},
);
enum MpvState { enum MpvState {
STARTED, STARTED,
IN_PROGRESS, IN_PROGRESS,
+15
View File
@@ -86,6 +86,18 @@ const getCurrentTime = async () => {
return ipcRenderer.invoke('player-get-time'); return ipcRenderer.invoke('player-get-time');
}; };
const updateMetadata = (data: PlayerData) => {
ipcRenderer.send('player-update-metadata', data);
};
const getMetadata = async () => {
return ipcRenderer.invoke('player-metadata');
};
const getStreamMetadata = async () => {
return ipcRenderer.invoke('player-stream-metadata');
};
const rendererAutoNext = (cb: (event: IpcRendererEvent, data: PlayerData) => void) => { const rendererAutoNext = (cb: (event: IpcRendererEvent, data: PlayerData) => void) => {
ipcRenderer.on('renderer-player-auto-next', cb); ipcRenderer.on('renderer-player-auto-next', cb);
}; };
@@ -163,6 +175,8 @@ export const mpvPlayer = {
cleanup, cleanup,
currentTime, currentTime,
getCurrentTime, getCurrentTime,
getMetadata,
getStreamMetadata,
initialize, initialize,
isRunning, isRunning,
mute, mute,
@@ -178,6 +192,7 @@ export const mpvPlayer = {
setQueue, setQueue,
setQueueNext, setQueueNext,
stop, stop,
updateMetadata,
volume, volume,
}; };
+55
View File
@@ -100,6 +100,20 @@ export const controller: GeneralController = {
server.type, server.type,
)?.({ ...args, apiClientProps: { ...args.apiClientProps, server } }); )?.({ ...args, apiClientProps: { ...args.apiClientProps, server } });
}, },
createInternetRadioStation(args) {
const server = getServerById(args.apiClientProps.serverId);
if (!server) {
throw new Error(
`${i18n.t('error.apiRouteError', { postProcess: 'sentenceCase' })}: createInternetRadioStation`,
);
}
return apiController(
'createInternetRadioStation',
server.type,
)?.({ ...args, apiClientProps: { ...args.apiClientProps, server } });
},
createPlaylist(args) { createPlaylist(args) {
const server = getServerById(args.apiClientProps.serverId); const server = getServerById(args.apiClientProps.serverId);
@@ -128,6 +142,20 @@ export const controller: GeneralController = {
server.type, server.type,
)?.({ ...args, apiClientProps: { ...args.apiClientProps, server } }); )?.({ ...args, apiClientProps: { ...args.apiClientProps, server } });
}, },
deleteInternetRadioStation(args) {
const server = getServerById(args.apiClientProps.serverId);
if (!server) {
throw new Error(
`${i18n.t('error.apiRouteError', { postProcess: 'sentenceCase' })}: deleteInternetRadioStation`,
);
}
return apiController(
'deleteInternetRadioStation',
server.type,
)?.({ ...args, apiClientProps: { ...args.apiClientProps, server } });
},
deletePlaylist(args) { deletePlaylist(args) {
const server = getServerById(args.apiClientProps.serverId); const server = getServerById(args.apiClientProps.serverId);
@@ -342,6 +370,19 @@ export const controller: GeneralController = {
query: mergeMusicFolderId(args.query, server), query: mergeMusicFolderId(args.query, server),
}); });
}, },
getInternetRadioStations(args) {
const server = getServerById(args.apiClientProps.serverId);
if (!server) {
throw new Error(
`${i18n.t('error.apiRouteError', { postProcess: 'sentenceCase' })}: getInternetRadioStations`,
);
}
return apiController(
'getInternetRadioStations',
server.type,
)?.({ ...args, apiClientProps: { ...args.apiClientProps, server } });
},
getLyrics(args) { getLyrics(args) {
const server = getServerById(args.apiClientProps.serverId); const server = getServerById(args.apiClientProps.serverId);
@@ -744,6 +785,20 @@ export const controller: GeneralController = {
server.type, server.type,
)?.({ ...args, apiClientProps: { ...args.apiClientProps, server } }); )?.({ ...args, apiClientProps: { ...args.apiClientProps, server } });
}, },
updateInternetRadioStation(args) {
const server = getServerById(args.apiClientProps.serverId);
if (!server) {
throw new Error(
`${i18n.t('error.apiRouteError', { postProcess: 'sentenceCase' })}: updateInternetRadioStation`,
);
}
return apiController(
'updateInternetRadioStation',
server.type,
)?.({ ...args, apiClientProps: { ...args.apiClientProps, server } });
},
updatePlaylist(args) { updatePlaylist(args) {
const server = getServerById(args.apiClientProps.serverId); const server = getServerById(args.apiClientProps.serverId);
@@ -5,6 +5,7 @@ import orderBy from 'lodash/orderBy';
import { z } from 'zod'; import { z } from 'zod';
import { jfApiClient } from '/@/renderer/api/jellyfin/jellyfin-api'; import { jfApiClient } from '/@/renderer/api/jellyfin/jellyfin-api';
import { useRadioStore } from '/@/renderer/features/radio/store/radio-store';
import { jfNormalize } from '/@/shared/api/jellyfin/jellyfin-normalize'; import { jfNormalize } from '/@/shared/api/jellyfin/jellyfin-normalize';
import { JFSongListSort, JFSortOrder, jfType } from '/@/shared/api/jellyfin/jellyfin-types'; import { JFSongListSort, JFSortOrder, jfType } from '/@/shared/api/jellyfin/jellyfin-types';
import { getFeatures, hasFeature, sortSongList, VersionInfo } from '/@/shared/api/utils'; import { getFeatures, hasFeature, sortSongList, VersionInfo } from '/@/shared/api/utils';
@@ -115,6 +116,26 @@ export const JellyfinController: InternalControllerEndpoint = {
return null; return null;
}, },
createInternetRadioStation: async (args) => {
const { apiClientProps, body } = args;
if (!apiClientProps.serverId) {
throw new Error('No serverId found');
}
const state = useRadioStore.getState();
if (!state?.actions?.createStation) {
throw new Error('Radio store not initialized');
}
state.actions.createStation(apiClientProps.serverId, {
homepageUrl: body.homepageUrl || null,
name: body.name,
streamUrl: body.streamUrl,
});
return null;
},
createPlaylist: async (args) => { createPlaylist: async (args) => {
const { apiClientProps, body } = args; const { apiClientProps, body } = args;
@@ -158,6 +179,22 @@ export const JellyfinController: InternalControllerEndpoint = {
return null; return null;
}, },
deleteInternetRadioStation: async (args) => {
const { apiClientProps, query } = args;
if (!apiClientProps.serverId) {
throw new Error('No serverId found');
}
const state = useRadioStore.getState();
if (!state?.actions?.deleteStation) {
throw new Error('Radio store not initialized');
}
state.actions.deleteStation(apiClientProps.serverId, query.id);
return null;
},
deletePlaylist: async (args) => { deletePlaylist: async (args) => {
const { apiClientProps, query } = args; const { apiClientProps, query } = args;
@@ -633,6 +670,20 @@ export const JellyfinController: InternalControllerEndpoint = {
totalRecordCount: res.body?.TotalRecordCount || 0, totalRecordCount: res.body?.TotalRecordCount || 0,
}; };
}, },
getInternetRadioStations: async (args) => {
const { apiClientProps } = args;
if (!apiClientProps.serverId) {
throw new Error('No serverId found');
}
const state = useRadioStore.getState();
if (!state?.actions?.getStations) {
throw new Error('Radio store not initialized');
}
return state.actions.getStations(apiClientProps.serverId);
},
getLyrics: async (args) => { getLyrics: async (args) => {
const { apiClientProps, query } = args; const { apiClientProps, query } = args;
@@ -1455,6 +1506,26 @@ export const JellyfinController: InternalControllerEndpoint = {
songs: songs.map((item) => jfNormalize.song(item, apiClientProps.server)), songs: songs.map((item) => jfNormalize.song(item, apiClientProps.server)),
}; };
}, },
updateInternetRadioStation: async (args) => {
const { apiClientProps, body, query } = args;
if (!apiClientProps.serverId) {
throw new Error('No serverId found');
}
const state = useRadioStore.getState();
if (!state?.actions?.updateStation) {
throw new Error('Radio store not initialized');
}
state.actions.updateStation(apiClientProps.serverId, query.id, {
homepageUrl: body.homepageUrl || null,
name: body.name,
streamUrl: body.streamUrl,
});
return null;
},
updatePlaylist: async (args) => { updatePlaylist: async (args) => {
const { apiClientProps, body, query } = args; const { apiClientProps, body, query } = args;
@@ -141,6 +141,7 @@ export const NavidromeController: InternalControllerEndpoint = {
}; };
}, },
createFavorite: SubsonicController.createFavorite, createFavorite: SubsonicController.createFavorite,
createInternetRadioStation: SubsonicController.createInternetRadioStation,
createPlaylist: async (args) => { createPlaylist: async (args) => {
const { apiClientProps, body } = args; const { apiClientProps, body } = args;
@@ -164,6 +165,7 @@ export const NavidromeController: InternalControllerEndpoint = {
}; };
}, },
deleteFavorite: SubsonicController.deleteFavorite, deleteFavorite: SubsonicController.deleteFavorite,
deleteInternetRadioStation: SubsonicController.deleteInternetRadioStation,
deletePlaylist: async (args) => { deletePlaylist: async (args) => {
const { apiClientProps, query } = args; const { apiClientProps, query } = args;
@@ -459,6 +461,7 @@ export const NavidromeController: InternalControllerEndpoint = {
totalRecordCount: Number(res.body.headers.get('x-total-count') || 0), totalRecordCount: Number(res.body.headers.get('x-total-count') || 0),
}; };
}, },
getInternetRadioStations: SubsonicController.getInternetRadioStations,
getLyrics: SubsonicController.getLyrics, getLyrics: SubsonicController.getLyrics,
getMusicFolderList: SubsonicController.getMusicFolderList, getMusicFolderList: SubsonicController.getMusicFolderList,
getPlaylistDetail: async (args) => { getPlaylistDetail: async (args) => {
@@ -931,6 +934,7 @@ export const NavidromeController: InternalControllerEndpoint = {
id: res.body.data.id, id: res.body.data.id,
}; };
}, },
updateInternetRadioStation: SubsonicController.updateInternetRadioStation,
updatePlaylist: async (args) => { updatePlaylist: async (args) => {
const { apiClientProps, body, query } = args; const { apiClientProps, body, query } = args;
+4
View File
@@ -322,6 +322,10 @@ export const queryKeys: Record<
return [serverId, 'playlists', 'songList'] as const; return [serverId, 'playlists', 'songList'] as const;
}, },
}, },
radio: {
list: (serverId: string) => [serverId, 'radio', 'list'] as const,
root: (serverId: string) => [serverId, 'radio'] as const,
},
roles: { roles: {
list: (serverId: string) => [serverId, 'roles'] as const, list: (serverId: string) => [serverId, 'roles'] as const,
}, },
+31
View File
@@ -30,6 +30,14 @@ export const contract = c.router({
200: ssType._response.createFavorite, 200: ssType._response.createFavorite,
}, },
}, },
createInternetRadioStation: {
method: 'GET',
path: 'createInternetRadioStation.view',
query: ssType._parameters.createInternetRadioStation,
responses: {
200: ssType._response.createInternetRadioStation,
},
},
createPlaylist: { createPlaylist: {
method: 'GET', method: 'GET',
path: 'createPlaylist.view', path: 'createPlaylist.view',
@@ -38,6 +46,14 @@ export const contract = c.router({
200: ssType._response.createPlaylist, 200: ssType._response.createPlaylist,
}, },
}, },
deleteInternetRadioStation: {
method: 'GET',
path: 'deleteInternetRadioStation.view',
query: ssType._parameters.deleteInternetRadioStation,
responses: {
200: ssType._response.deleteInternetRadioStation,
},
},
deletePlaylist: { deletePlaylist: {
method: 'GET', method: 'GET',
path: 'deletePlaylist.view', path: 'deletePlaylist.view',
@@ -110,6 +126,13 @@ export const contract = c.router({
200: ssType._response.getIndexes, 200: ssType._response.getIndexes,
}, },
}, },
getInternetRadioStations: {
method: 'GET',
path: 'getInternetRadioStations.view',
responses: {
200: ssType._response.getInternetRadioStations,
},
},
getMusicDirectory: { getMusicDirectory: {
method: 'GET', method: 'GET',
path: 'getMusicDirectory.view', path: 'getMusicDirectory.view',
@@ -281,6 +304,14 @@ export const contract = c.router({
200: ssType._response.setRating, 200: ssType._response.setRating,
}, },
}, },
updateInternetRadioStation: {
method: 'GET',
path: 'updateInternetRadioStation.view',
query: ssType._parameters.updateInternetRadioStation,
responses: {
200: ssType._response.updateInternetRadioStation,
},
},
updatePlaylist: { updatePlaylist: {
method: 'GET', method: 'GET',
path: 'updatePlaylist.view', path: 'updatePlaylist.view',
@@ -166,6 +166,23 @@ export const SubsonicController: InternalControllerEndpoint = {
return null; return null;
}, },
createInternetRadioStation: async (args) => {
const { apiClientProps, body } = args;
const res = await ssApiClient(apiClientProps).createInternetRadioStation({
query: {
homepageUrl: body.homepageUrl,
name: body.name,
streamUrl: body.streamUrl,
},
});
if (res.status !== 200) {
throw new Error('Failed to create internet radio station');
}
return null;
},
createPlaylist: async ({ apiClientProps, body }) => { createPlaylist: async ({ apiClientProps, body }) => {
const res = await ssApiClient(apiClientProps).createPlaylist({ const res = await ssApiClient(apiClientProps).createPlaylist({
query: { query: {
@@ -199,6 +216,21 @@ export const SubsonicController: InternalControllerEndpoint = {
return null; return null;
}, },
deleteInternetRadioStation: async (args) => {
const { apiClientProps, query } = args;
const res = await ssApiClient(apiClientProps).deleteInternetRadioStation({
query: {
id: query.id,
},
});
if (res.status !== 200) {
throw new Error('Failed to delete internet radio station');
}
return null;
},
deletePlaylist: async (args) => { deletePlaylist: async (args) => {
const { apiClientProps, query } = args; const { apiClientProps, query } = args;
@@ -789,6 +821,19 @@ export const SubsonicController: InternalControllerEndpoint = {
startIndex: query.startIndex, startIndex: query.startIndex,
}); });
}, },
getInternetRadioStations: async (args) => {
const { apiClientProps } = args;
const res = await ssApiClient(apiClientProps).getInternetRadioStations();
if (res.status !== 200) {
throw new Error('Failed to get internet radio stations');
}
const stations = res.body.internetRadioStations?.internetRadioStation || [];
return stations.map((station) => ssNormalize.internetRadioStation(station));
},
getMusicFolderList: async (args) => { getMusicFolderList: async (args) => {
const { apiClientProps } = args; const { apiClientProps } = args;
@@ -822,6 +867,7 @@ export const SubsonicController: InternalControllerEndpoint = {
return ssNormalize.playlist(res.body.playlist, apiClientProps.server); return ssNormalize.playlist(res.body.playlist, apiClientProps.server);
}, },
getPlaylistList: async ({ apiClientProps, query }) => { getPlaylistList: async ({ apiClientProps, query }) => {
const sortOrder = query.sortOrder.toLowerCase() as 'asc' | 'desc'; const sortOrder = query.sortOrder.toLowerCase() as 'asc' | 'desc';
@@ -1005,7 +1051,6 @@ export const SubsonicController: InternalControllerEndpoint = {
final.splice(0, 0, { label: 'all artists', value: '' }); final.splice(0, 0, { label: 'all artists', value: '' });
return final; return final;
}, },
getServerInfo: async (args) => { getServerInfo: async (args) => {
const { apiClientProps } = args; const { apiClientProps } = args;
@@ -1722,6 +1767,24 @@ export const SubsonicController: InternalControllerEndpoint = {
return null; return null;
}, },
updateInternetRadioStation: async (args) => {
const { apiClientProps, body, query } = args;
const res = await ssApiClient(apiClientProps).updateInternetRadioStation({
query: {
homepageUrl: body.homepageUrl,
id: query.id,
name: body.name,
streamUrl: body.streamUrl,
},
});
if (res.status !== 200) {
throw new Error('Failed to update internet radio station');
}
return null;
},
updatePlaylist: async (args) => { updatePlaylist: async (args) => {
const { apiClientProps, body, query } = args; const { apiClientProps, body, query } = args;
@@ -6,6 +6,7 @@ import { useEffect, useImperativeHandle, useRef, useState } from 'react';
import { usePlayerEvents } from '/@/renderer/features/player/audio-player/hooks/use-player-events'; import { usePlayerEvents } from '/@/renderer/features/player/audio-player/hooks/use-player-events';
import { getSongUrl } from '/@/renderer/features/player/audio-player/hooks/use-stream-url'; import { getSongUrl } from '/@/renderer/features/player/audio-player/hooks/use-stream-url';
import { AudioPlayer, PlayerOnProgressProps } from '/@/renderer/features/player/audio-player/types'; import { AudioPlayer, PlayerOnProgressProps } from '/@/renderer/features/player/audio-player/types';
import { useRadioStore } from '/@/renderer/features/radio/hooks/use-radio-player';
import { getMpvProperties } from '/@/renderer/features/settings/components/playback/mpv-settings'; import { getMpvProperties } from '/@/renderer/features/settings/components/playback/mpv-settings';
import { import {
usePlaybackSettings, usePlaybackSettings,
@@ -100,17 +101,22 @@ export const MpvPlayerEngine = (props: MpvPlayerEngineProps) => {
isInitializedRef.current = true; isInitializedRef.current = true;
// After initialization, populate the queue if currentSrc is available // After initialization, populate the queue if currentSrc is available
const playerData = usePlayerStore.getState().getPlayerData(); // Don't override queue if radio is active
const currentSongUrl = playerData.currentSong const radioState = useRadioStore.getState();
? getSongUrl(playerData.currentSong, transcode)
: undefined;
const nextSongUrl = playerData.nextSong
? getSongUrl(playerData.nextSong, transcode)
: undefined;
if (currentSongUrl && nextSongUrl && !hasPopulatedQueueRef.current && mpvPlayer) { if (!radioState.currentStreamUrl) {
mpvPlayer.setQueue(currentSongUrl, nextSongUrl, true); const playerData = usePlayerStore.getState().getPlayerData();
hasPopulatedQueueRef.current = true; const currentSongUrl = playerData.currentSong
? getSongUrl(playerData.currentSong, transcode)
: undefined;
const nextSongUrl = playerData.nextSong
? getSongUrl(playerData.nextSong, transcode)
: undefined;
if (currentSongUrl && nextSongUrl && !hasPopulatedQueueRef.current && mpvPlayer) {
mpvPlayer.setQueue(currentSongUrl, nextSongUrl, true);
hasPopulatedQueueRef.current = true;
}
} }
}; };
@@ -243,6 +249,12 @@ export const MpvPlayerEngine = (props: MpvPlayerEngineProps) => {
replaceMpvQueue(transcode); replaceMpvQueue(transcode);
}, },
onNextSongInsertion: (song) => { onNextSongInsertion: (song) => {
const radioState = useRadioStore.getState();
if (radioState.currentStreamUrl) {
return;
}
const nextSongUrl = song ? getSongUrl(song, transcode) : undefined; const nextSongUrl = song ? getSongUrl(song, transcode) : undefined;
mpvPlayer?.setQueueNext(nextSongUrl); mpvPlayer?.setQueueNext(nextSongUrl);
}, },
@@ -317,6 +329,13 @@ function replaceMpvQueue(transcode: {
enabled: boolean; enabled: boolean;
format?: string | undefined; format?: string | undefined;
}) { }) {
// Don't override queue if radio is active
const radioState = useRadioStore.getState();
if (radioState.currentStreamUrl) {
return;
}
const playerData = usePlayerStore.getState().getPlayerData(); const playerData = usePlayerStore.getState().getPlayerData();
const currentSongUrl = playerData.currentSong const currentSongUrl = playerData.currentSong
? getSongUrl(playerData.currentSong, transcode) ? getSongUrl(playerData.currentSong, transcode)
@@ -15,6 +15,11 @@ import { usePowerSaveBlocker } from '/@/renderer/features/player/hooks/use-power
import { useQueueRestoreTimestamp } from '/@/renderer/features/player/hooks/use-queue-restore'; import { useQueueRestoreTimestamp } from '/@/renderer/features/player/hooks/use-queue-restore';
import { useScrobble } from '/@/renderer/features/player/hooks/use-scrobble'; import { useScrobble } from '/@/renderer/features/player/hooks/use-scrobble';
import { useWebAudio } from '/@/renderer/features/player/hooks/use-webaudio'; import { useWebAudio } from '/@/renderer/features/player/hooks/use-webaudio';
import {
useIsRadioActive,
useRadioAudioInstance,
useRadioMetadata,
} from '/@/renderer/features/radio/hooks/use-radio-player';
import { import {
updateQueueFavorites, updateQueueFavorites,
updateQueueRatings, updateQueueRatings,
@@ -49,6 +54,9 @@ export const AudioPlayers = () => {
useAutoDJ(); useAutoDJ();
useQueueRestoreTimestamp(); useQueueRestoreTimestamp();
useRadioAudioInstance();
useRadioMetadata();
useEffect(() => { useEffect(() => {
if (webAudio && 'AudioContext' in window) { if (webAudio && 'AudioContext' in window) {
let context: AudioContext; let context: AudioContext;
@@ -124,6 +132,16 @@ export const AudioPlayers = () => {
}; };
}, [serverId]); }, [serverId]);
const isRadioActive = useIsRadioActive();
if (isRadioActive && playbackType === PlayerType.LOCAL) {
return <MpvPlayer />;
}
if (isRadioActive && playbackType === PlayerType.WEB) {
return null;
}
return ( return (
<> <>
{playbackType === PlayerType.WEB && <WebPlayer />} {playbackType === PlayerType.WEB && <WebPlayer />}
@@ -6,6 +6,12 @@ import { MainPlayButton, PlayerButton } from '/@/renderer/features/player/compon
import { PlayerbarSlider } from '/@/renderer/features/player/components/playerbar-slider'; import { PlayerbarSlider } from '/@/renderer/features/player/components/playerbar-slider';
import { openShuffleAllModal } from '/@/renderer/features/player/components/shuffle-all-modal'; import { openShuffleAllModal } from '/@/renderer/features/player/components/shuffle-all-modal';
import { usePlayer } from '/@/renderer/features/player/context/player-context'; import { usePlayer } from '/@/renderer/features/player/context/player-context';
import {
useIsPlayingRadio,
useIsRadioActive,
useRadioControls,
useRadioPlayer,
} from '/@/renderer/features/radio/hooks/use-radio-player';
import { import {
usePlayerRepeat, usePlayerRepeat,
usePlayerShuffle, usePlayerShuffle,
@@ -19,6 +25,28 @@ import { PlayerRepeat, PlayerShuffle, PlayerStatus } from '/@/shared/types/types
export const CenterControls = () => { export const CenterControls = () => {
const skip = useSettingsStore((state) => state.general.skipButtons); const skip = useSettingsStore((state) => state.general.skipButtons);
const isRadioActive = useIsRadioActive();
if (isRadioActive) {
return (
<>
<div className={styles.controlsContainer}>
<div className={styles.buttonsContainer}>
<RadioStopButton />
<ShuffleButton disabled={isRadioActive} />
<PreviousButton disabled={isRadioActive} />
{skip?.enabled && <SkipBackwardButton disabled={isRadioActive} />}
<RadioCenterPlayButton />
{skip?.enabled && <SkipForwardButton disabled={isRadioActive} />}
<NextButton disabled={isRadioActive} />
<RepeatButton disabled={isRadioActive} />
<ShuffleAllButton disabled={isRadioActive} />
</div>
</div>
</>
);
}
return ( return (
<> <>
<div className={styles.controlsContainer}> <div className={styles.controlsContainer}>
@@ -39,13 +67,49 @@ export const CenterControls = () => {
); );
}; };
const StopButton = () => { const RadioCenterPlayButton = ({ disabled }: { disabled?: boolean }) => {
const { currentStreamUrl } = useRadioPlayer();
const isPlayingRadio = useIsPlayingRadio();
const { pause, play } = useRadioControls();
const handleClick = () => {
if (isPlayingRadio) {
pause();
} else if (currentStreamUrl) {
play();
}
};
return <MainPlayButton disabled={disabled} isPaused={!isPlayingRadio} onClick={handleClick} />;
};
const RadioStopButton = ({ disabled }: { disabled?: boolean }) => {
const { t } = useTranslation();
const buttonSize = useSettingsStore((state) => state.general.buttonSize);
const { stop } = useRadioControls();
return (
<PlayerButton
disabled={disabled}
icon={<Icon fill="default" icon="mediaStop" size={buttonSize - 2} />}
onClick={stop}
tooltip={{
label: t('player.stop', { postProcess: 'sentenceCase' }),
openDelay: 0,
}}
variant="tertiary"
/>
);
};
const StopButton = ({ disabled }: { disabled?: boolean }) => {
const { t } = useTranslation(); const { t } = useTranslation();
const buttonSize = useSettingsStore((state) => state.general.buttonSize); const buttonSize = useSettingsStore((state) => state.general.buttonSize);
const { mediaStop } = usePlayer(); const { mediaStop } = usePlayer();
return ( return (
<PlayerButton <PlayerButton
disabled={disabled}
icon={<Icon fill="default" icon="mediaStop" size={buttonSize - 2} />} icon={<Icon fill="default" icon="mediaStop" size={buttonSize - 2} />}
onClick={mediaStop} onClick={mediaStop}
tooltip={{ tooltip={{
@@ -57,7 +121,7 @@ const StopButton = () => {
); );
}; };
const ShuffleButton = () => { const ShuffleButton = ({ disabled }: { disabled?: boolean }) => {
const { t } = useTranslation(); const { t } = useTranslation();
const buttonSize = useSettingsStore((state) => state.general.buttonSize); const buttonSize = useSettingsStore((state) => state.general.buttonSize);
const shuffle = usePlayerShuffle(); const shuffle = usePlayerShuffle();
@@ -65,6 +129,7 @@ const ShuffleButton = () => {
return ( return (
<PlayerButton <PlayerButton
disabled={disabled}
icon={ icon={
<Icon <Icon
fill={shuffle === PlayerShuffle.NONE ? 'default' : 'primary'} fill={shuffle === PlayerShuffle.NONE ? 'default' : 'primary'}
@@ -89,13 +154,14 @@ const ShuffleButton = () => {
); );
}; };
const PreviousButton = () => { const PreviousButton = ({ disabled }: { disabled?: boolean }) => {
const { t } = useTranslation(); const { t } = useTranslation();
const buttonSize = useSettingsStore((state) => state.general.buttonSize); const buttonSize = useSettingsStore((state) => state.general.buttonSize);
const { mediaPrevious } = usePlayer(); const { mediaPrevious } = usePlayer();
return ( return (
<PlayerButton <PlayerButton
disabled={disabled}
icon={<Icon fill="default" icon="mediaPrevious" size={buttonSize} />} icon={<Icon fill="default" icon="mediaPrevious" size={buttonSize} />}
onClick={mediaPrevious} onClick={mediaPrevious}
tooltip={{ tooltip={{
@@ -107,13 +173,14 @@ const PreviousButton = () => {
); );
}; };
const SkipBackwardButton = () => { const SkipBackwardButton = ({ disabled }: { disabled?: boolean }) => {
const { t } = useTranslation(); const { t } = useTranslation();
const buttonSize = useSettingsStore((state) => state.general.buttonSize); const buttonSize = useSettingsStore((state) => state.general.buttonSize);
const { mediaSkipBackward } = usePlayer(); const { mediaSkipBackward } = usePlayer();
return ( return (
<PlayerButton <PlayerButton
disabled={disabled}
icon={<Icon fill="default" icon="mediaStepBackward" size={buttonSize} />} icon={<Icon fill="default" icon="mediaStepBackward" size={buttonSize} />}
onClick={mediaSkipBackward} onClick={mediaSkipBackward}
tooltip={{ tooltip={{
@@ -128,27 +195,28 @@ const SkipBackwardButton = () => {
); );
}; };
const CenterPlayButton = () => { const CenterPlayButton = ({ disabled }: { disabled?: boolean }) => {
const currentSong = usePlayerSong(); const currentSong = usePlayerSong();
const status = usePlayerStatus(); const status = usePlayerStatus();
const { mediaTogglePlayPause } = usePlayer(); const { mediaTogglePlayPause } = usePlayer();
return ( return (
<MainPlayButton <MainPlayButton
disabled={currentSong?.id === undefined} disabled={disabled || currentSong?.id === undefined}
isPaused={status === PlayerStatus.PAUSED} isPaused={status === PlayerStatus.PAUSED}
onClick={mediaTogglePlayPause} onClick={mediaTogglePlayPause}
/> />
); );
}; };
const SkipForwardButton = () => { const SkipForwardButton = ({ disabled }: { disabled?: boolean }) => {
const { t } = useTranslation(); const { t } = useTranslation();
const buttonSize = useSettingsStore((state) => state.general.buttonSize); const buttonSize = useSettingsStore((state) => state.general.buttonSize);
const { mediaSkipForward } = usePlayer(); const { mediaSkipForward } = usePlayer();
return ( return (
<PlayerButton <PlayerButton
disabled={disabled}
icon={<Icon fill="default" icon="mediaStepForward" size={buttonSize} />} icon={<Icon fill="default" icon="mediaStepForward" size={buttonSize} />}
onClick={mediaSkipForward} onClick={mediaSkipForward}
tooltip={{ tooltip={{
@@ -163,13 +231,14 @@ const SkipForwardButton = () => {
); );
}; };
const NextButton = () => { const NextButton = ({ disabled }: { disabled?: boolean }) => {
const { t } = useTranslation(); const { t } = useTranslation();
const buttonSize = useSettingsStore((state) => state.general.buttonSize); const buttonSize = useSettingsStore((state) => state.general.buttonSize);
const { mediaNext } = usePlayer(); const { mediaNext } = usePlayer();
return ( return (
<PlayerButton <PlayerButton
disabled={disabled}
icon={<Icon fill="default" icon="mediaNext" size={buttonSize} />} icon={<Icon fill="default" icon="mediaNext" size={buttonSize} />}
onClick={mediaNext} onClick={mediaNext}
tooltip={{ tooltip={{
@@ -181,7 +250,7 @@ const NextButton = () => {
); );
}; };
const RepeatButton = () => { const RepeatButton = ({ disabled }: { disabled?: boolean }) => {
const { t } = useTranslation(); const { t } = useTranslation();
const buttonSize = useSettingsStore((state) => state.general.buttonSize); const buttonSize = useSettingsStore((state) => state.general.buttonSize);
const repeat = usePlayerRepeat(); const repeat = usePlayerRepeat();
@@ -189,6 +258,7 @@ const RepeatButton = () => {
return ( return (
<PlayerButton <PlayerButton
disabled={disabled}
icon={ icon={
repeat === PlayerRepeat.ONE ? ( repeat === PlayerRepeat.ONE ? (
<Icon fill="primary" icon="mediaRepeatOne" size={buttonSize} /> <Icon fill="primary" icon="mediaRepeatOne" size={buttonSize} />
@@ -226,12 +296,13 @@ const RepeatButton = () => {
); );
}; };
const ShuffleAllButton = () => { const ShuffleAllButton = ({ disabled }: { disabled?: boolean }) => {
const { t } = useTranslation(); const { t } = useTranslation();
const buttonSize = useSettingsStore((state) => state.general.buttonSize); const buttonSize = useSettingsStore((state) => state.general.buttonSize);
return ( return (
<PlayerButton <PlayerButton
disabled={disabled}
icon={<Icon fill="default" icon="mediaRandom" size={buttonSize} />} icon={<Icon fill="default" icon="mediaRandom" size={buttonSize} />}
onClick={() => openShuffleAllModal()} onClick={() => openShuffleAllModal()}
tooltip={{ tooltip={{
@@ -8,6 +8,8 @@ import { shallow } from 'zustand/shallow';
import styles from './left-controls.module.css'; import styles from './left-controls.module.css';
import { ContextMenuController } from '/@/renderer/features/context-menu/context-menu-controller'; import { ContextMenuController } from '/@/renderer/features/context-menu/context-menu-controller';
import { RadioMetadataDisplay } from '/@/renderer/features/player/components/radio-metadata-display';
import { useIsRadioActive } from '/@/renderer/features/radio/hooks/use-radio-player';
import { AppRoute } from '/@/renderer/router/routes'; import { AppRoute } from '/@/renderer/router/routes';
import { import {
useAppStore, useAppStore,
@@ -41,13 +43,15 @@ export const LeftControls = () => {
shallow, shallow,
); );
const hideImage = image && !collapsed;
const currentSong = usePlayerSong(); const currentSong = usePlayerSong();
const title = currentSong?.name; const isRadioActive = useIsRadioActive();
const artists = currentSong?.artists;
const { bindings } = useHotkeySettings(); const { bindings } = useHotkeySettings();
const isSongDefined = Boolean(currentSong?.id); const isRadioMode = isRadioActive;
const hideImage = (image && !collapsed) || isRadioMode;
const isSongDefined = Boolean(currentSong?.id) && !isRadioMode;
const title = currentSong?.name;
const artists = currentSong?.artists;
const handleToggleFullScreenPlayer = (e?: KeyboardEvent | MouseEvent<HTMLDivElement>) => { const handleToggleFullScreenPlayer = (e?: KeyboardEvent | MouseEvent<HTMLDivElement>) => {
// don't toggle if right click // don't toggle if right click
@@ -118,7 +122,7 @@ export const LeftControls = () => {
PlaybackSelectors.playerCoverArt, PlaybackSelectors.playerCoverArt,
)} )}
loading="eager" loading="eager"
src={currentSong?.imageUrl ?? ''} src={isRadioMode ? '' : (currentSong?.imageUrl ?? '')}
/> />
</Tooltip> </Tooltip>
{!collapsed && ( {!collapsed && (
@@ -148,101 +152,113 @@ export const LeftControls = () => {
)} )}
</AnimatePresence> </AnimatePresence>
<motion.div className={styles.metadataStack} layout="position"> <motion.div className={styles.metadataStack} layout="position">
<div className={styles.lineItem} onClick={stopPropagation}> {isRadioMode ? (
<Group align="center" gap="xs" wrap="nowrap"> <RadioMetadataDisplay
<Text onStopPropagation={stopPropagation}
className={PlaybackSelectors.songTitle} onToggleContextMenu={handleToggleContextMenu}
component={Link} />
fw={500} ) : (
isLink <>
onContextMenu={handleToggleContextMenu} // Ajout du clic droit <div className={styles.lineItem} onClick={stopPropagation}>
overflow="hidden" <Group align="center" gap="xs" wrap="nowrap">
to={AppRoute.NOW_PLAYING} <Text
> className={PlaybackSelectors.songTitle}
{title || '—'} component={Link}
</Text> fw={500}
{isSongDefined && ( isLink
<ActionIcon onContextMenu={handleToggleContextMenu}
icon="ellipsisVertical" overflow="hidden"
onClick={(e) => { to={AppRoute.NOW_PLAYING}
e.preventDefault(); >
e.stopPropagation(); {title || '—'}
if (currentSong) { </Text>
ContextMenuController.call({ {isSongDefined && (
cmd: { <ActionIcon
items: [currentSong], icon="ellipsisVertical"
type: LibraryItem.SONG, onClick={(e) => {
e.preventDefault();
e.stopPropagation();
if (currentSong) {
ContextMenuController.call({
cmd: {
items: [currentSong],
type: LibraryItem.SONG,
},
event: e,
});
}
}}
size="xs"
styles={{
root: {
'--ai-size-xs': '1.15rem',
}, },
event: e, }}
}); variant="subtle"
} />
}} )}
size="xs" </Group>
styles={{ </div>
root: { <div
'--ai-size-xs': '1.15rem', className={clsx(
}, styles.lineItem,
}} styles.secondary,
variant="subtle" PlaybackSelectors.songArtist,
/> )}
)} onClick={stopPropagation}
</Group> >
</div> {artists?.map((artist, index) => (
<div <React.Fragment key={`bar-${artist.id}`}>
className={clsx( {index > 0 && <Separator />}
styles.lineItem, <Text
styles.secondary, component={artist.id ? Link : undefined}
PlaybackSelectors.songArtist, fw={500}
)} isLink={artist.id !== ''}
onClick={stopPropagation} overflow="hidden"
> size="md"
{artists?.map((artist, index) => ( to={
<React.Fragment key={`bar-${artist.id}`}> artist.id
{index > 0 && <Separator />} ? generatePath(
AppRoute.LIBRARY_ALBUM_ARTISTS_DETAIL,
{
albumArtistId: artist.id,
},
)
: undefined
}
>
{artist.name || '—'}
</Text>
</React.Fragment>
))}
</div>
<div
className={clsx(
styles.lineItem,
styles.secondary,
PlaybackSelectors.songAlbum,
)}
onClick={stopPropagation}
>
<Text <Text
component={artist.id ? Link : undefined} component={Link}
fw={500} fw={500}
isLink={artist.id !== ''} isLink
overflow="hidden" overflow="hidden"
size="md" size="md"
to={ to={
artist.id currentSong?.albumId
? generatePath(AppRoute.LIBRARY_ALBUM_ARTISTS_DETAIL, { ? generatePath(AppRoute.LIBRARY_ALBUMS_DETAIL, {
albumArtistId: artist.id, albumId: currentSong.albumId,
}) })
: undefined : ''
} }
> >
{artist.name || '—'} {currentSong?.album || '—'}
</Text> </Text>
</React.Fragment> </div>
))} </>
</div> )}
<div
className={clsx(
styles.lineItem,
styles.secondary,
PlaybackSelectors.songAlbum,
)}
onClick={stopPropagation}
>
<Text
component={Link}
fw={500}
isLink
overflow="hidden"
size="md"
to={
currentSong?.albumId
? generatePath(AppRoute.LIBRARY_ALBUMS_DETAIL, {
albumId: currentSong.albumId,
})
: ''
}
>
{currentSong?.album || '—'}
</Text>
</div>
</motion.div> </motion.div>
</LayoutGroup> </LayoutGroup>
</div> </div>
@@ -0,0 +1,75 @@
import clsx from 'clsx';
import React from 'react';
import { Link } from 'react-router';
import styles from './left-controls.module.css';
import { useIsRadioActive, useRadioStore } from '/@/renderer/features/radio/hooks/use-radio-player';
import { AppRoute } from '/@/renderer/router/routes';
import { Group } from '/@/shared/components/group/group';
import { Icon } from '/@/shared/components/icon/icon';
import { Text } from '/@/shared/components/text/text';
import { PlaybackSelectors } from '/@/shared/constants/playback-selectors';
interface RadioMetadataDisplayProps {
onStopPropagation: (e?: React.MouseEvent) => void;
onToggleContextMenu: (e: React.MouseEvent<HTMLDivElement>) => void;
}
export const RadioMetadataDisplay = ({
onStopPropagation,
onToggleContextMenu,
}: RadioMetadataDisplayProps) => {
const radioMetadata = useRadioStore((state) => state.metadata);
const stationName = useRadioStore((state) => state.stationName);
const isRadioActive = useIsRadioActive();
if (!isRadioActive) {
return null;
}
return (
<>
<div className={styles.lineItem} onClick={onStopPropagation}>
<Text
className={PlaybackSelectors.songTitle}
fw={500}
isNoSelect
onContextMenu={onToggleContextMenu}
overflow="hidden"
>
{radioMetadata?.title || '—'}
</Text>
</div>
<div
className={clsx(styles.lineItem, styles.secondary, PlaybackSelectors.songArtist)}
onClick={onStopPropagation}
>
<Text isMuted isNoSelect overflow="hidden" size="md">
{radioMetadata?.artist || '—'}
</Text>
</div>
<div
className={clsx(styles.lineItem, styles.secondary, PlaybackSelectors.songAlbum)}
onClick={onStopPropagation}
>
<Group align="center" gap="xs" wrap="nowrap">
<Icon color="muted" icon="radio" size="sm" />
<Text
component={Link}
fw={500}
isLink
isMuted
isNoSelect
overflow="hidden"
size="md"
to={AppRoute.RADIO}
>
{stationName || '—'}
</Text>
</Group>
</div>
</>
);
};
@@ -0,0 +1,20 @@
import { queryOptions } from '@tanstack/react-query';
import { api } from '/@/renderer/api';
import { queryKeys } from '/@/renderer/api/query-keys';
import { QueryHookArgs } from '/@/renderer/lib/react-query';
export const radioQueries = {
list: (args: QueryHookArgs<void>) => {
return queryOptions({
gcTime: 1000 * 60 * 60,
queryFn: ({ signal }) => {
return api.controller.getInternetRadioStations({
apiClientProps: { serverId: args.serverId, signal },
});
},
queryKey: queryKeys.radio.list(args.serverId || ''),
...args.options,
});
},
};
@@ -0,0 +1,113 @@
import { t } from 'i18next';
import { MouseEvent } from 'react';
import { useTranslation } from 'react-i18next';
import { useCreateRadioStation } from '/@/renderer/features/radio/mutations/create-radio-station-mutation';
import { useCurrentServer } from '/@/renderer/store';
import { Group } from '/@/shared/components/group/group';
import { closeAllModals, openModal } from '/@/shared/components/modal/modal';
import { ModalButton } from '/@/shared/components/modal/model-shared';
import { Stack } from '/@/shared/components/stack/stack';
import { TextInput } from '/@/shared/components/text-input/text-input';
import { toast } from '/@/shared/components/toast/toast';
import { useForm } from '/@/shared/hooks/use-form';
import { CreateInternetRadioStationBody, ServerListItem } from '/@/shared/types/domain-types';
interface CreateRadioStationFormProps {
onCancel: () => void;
}
export const CreateRadioStationForm = ({ onCancel }: CreateRadioStationFormProps) => {
const { t } = useTranslation();
const mutation = useCreateRadioStation({});
const server = useCurrentServer();
const form = useForm<CreateInternetRadioStationBody>({
initialValues: {
homepageUrl: '',
name: '',
streamUrl: '',
},
});
const handleSubmit = form.onSubmit((values) => {
if (!server) return;
mutation.mutate(
{
apiClientProps: { serverId: server.id },
body: values,
},
{
onError: (error) => {
toast.error({
message: (error as Error).message,
title: t('error.genericError', {
postProcess: 'sentenceCase',
}) as string,
});
},
onSuccess: () => {
closeAllModals();
},
},
);
});
return (
<form onSubmit={handleSubmit}>
<Stack gap="md">
<TextInput
label={t('form.createRadioStation.input', {
context: 'name',
postProcess: 'titleCase',
})}
required
{...form.getInputProps('name')}
/>
<TextInput
label={t('form.createRadioStation.input', {
context: 'streamUrl',
postProcess: 'titleCase',
})}
required
{...form.getInputProps('streamUrl')}
/>
<TextInput
label={t('form.createRadioStation.input', {
context: 'homepageUrl',
postProcess: 'titleCase',
})}
{...form.getInputProps('homepageUrl')}
/>
<Group justify="flex-end">
<ModalButton onClick={onCancel} variant="subtle">
{t('common.cancel', { postProcess: 'sentenceCase' })}
</ModalButton>
<ModalButton loading={mutation.isPending} type="submit" variant="filled">
{t('common.create', { postProcess: 'sentenceCase' })}
</ModalButton>
</Group>
</Stack>
</form>
);
};
export const openCreateRadioStationModal = (
server: null | ServerListItem,
e?: MouseEvent<HTMLButtonElement>,
) => {
e?.stopPropagation();
if (!server) {
toast.error({
message: t('common.error.noServer', { postProcess: 'sentenceCase' }) as string,
});
return;
}
openModal({
children: <CreateRadioStationForm onCancel={closeAllModals} />,
title: t('action.createRadioStation', { postProcess: 'titleCase' }) as string,
});
};
@@ -0,0 +1,126 @@
import { t } from 'i18next';
import { MouseEvent } from 'react';
import { useTranslation } from 'react-i18next';
import { useUpdateRadioStation } from '/@/renderer/features/radio/mutations/update-radio-station-mutation';
import { useCurrentServer } from '/@/renderer/store';
import { logFn } from '/@/renderer/utils/logger';
import { logMsg } from '/@/renderer/utils/logger-message';
import { Group } from '/@/shared/components/group/group';
import { closeAllModals, openModal } from '/@/shared/components/modal/modal';
import { ModalButton } from '/@/shared/components/modal/model-shared';
import { Stack } from '/@/shared/components/stack/stack';
import { TextInput } from '/@/shared/components/text-input/text-input';
import { toast } from '/@/shared/components/toast/toast';
import { useForm } from '/@/shared/hooks/use-form';
import {
InternetRadioStation,
ServerListItem,
UpdateInternetRadioStationBody,
} from '/@/shared/types/domain-types';
interface EditRadioStationFormProps {
onCancel: () => void;
station: InternetRadioStation;
}
export const EditRadioStationForm = ({ onCancel, station }: EditRadioStationFormProps) => {
const { t } = useTranslation();
const mutation = useUpdateRadioStation({});
const server = useCurrentServer();
const form = useForm<UpdateInternetRadioStationBody>({
initialValues: {
homepageUrl: station.homepageUrl || '',
name: station.name,
streamUrl: station.streamUrl,
},
});
const handleSubmit = form.onSubmit((values) => {
if (!server) return;
mutation.mutate(
{
apiClientProps: { serverId: server.id },
body: values,
query: { id: station.id },
},
{
onError: (error) => {
logFn.error(logMsg.other.error, {
meta: { error: error as Error },
});
toast.error({
message: (error as Error).message,
title: t('error.genericError', {
postProcess: 'sentenceCase',
}) as string,
});
},
onSuccess: () => {
closeAllModals();
},
},
);
});
return (
<form onSubmit={handleSubmit}>
<Stack gap="md">
<TextInput
label={t('form.createRadioStation.input', {
context: 'name',
postProcess: 'titleCase',
})}
required
{...form.getInputProps('name')}
/>
<TextInput
label={t('form.createRadioStation.input', {
context: 'streamUrl',
postProcess: 'titleCase',
})}
required
{...form.getInputProps('streamUrl')}
/>
<TextInput
label={t('form.createRadioStation.input', {
context: 'homepageUrl',
postProcess: 'titleCase',
})}
{...form.getInputProps('homepageUrl')}
/>
<Group justify="flex-end">
<ModalButton onClick={onCancel} variant="subtle">
{t('common.cancel', { postProcess: 'sentenceCase' })}
</ModalButton>
<ModalButton loading={mutation.isPending} type="submit" variant="filled">
{t('common.save', { postProcess: 'sentenceCase' })}
</ModalButton>
</Group>
</Stack>
</form>
);
};
export const openEditRadioStationModal = (
station: InternetRadioStation,
server: null | ServerListItem,
e?: MouseEvent<HTMLButtonElement>,
) => {
e?.stopPropagation();
if (!server) {
toast.error({
message: t('common.error.noServer', { postProcess: 'sentenceCase' }) as string,
});
return;
}
openModal({
children: <EditRadioStationForm onCancel={closeAllModals} station={station} />,
title: t('common.edit', { postProcess: 'titleCase' }) as string,
});
};
@@ -0,0 +1,64 @@
import { useQuery } from '@tanstack/react-query';
import { Suspense, useEffect, useMemo } from 'react';
import { useListContext } from '/@/renderer/context/list-context';
import { radioQueries } from '/@/renderer/features/radio/api/radio-api';
import { RadioListItems } from '/@/renderer/features/radio/components/radio-list-items';
import { useSearchTermFilter } from '/@/renderer/features/shared/hooks/use-search-term-filter';
import { useSortByFilter } from '/@/renderer/features/shared/hooks/use-sort-by-filter';
import { useSortOrderFilter } from '/@/renderer/features/shared/hooks/use-sort-order-filter';
import { searchLibraryItems } from '/@/renderer/features/shared/utils';
import { useCurrentServer } from '/@/renderer/store';
import { sortRadioList } from '/@/shared/api/utils';
import { ScrollArea } from '/@/shared/components/scroll-area/scroll-area';
import { Spinner } from '/@/shared/components/spinner/spinner';
import { Stack } from '/@/shared/components/stack/stack';
import { LibraryItem, RadioListSort, SortOrder } from '/@/shared/types/domain-types';
import { ItemListKey } from '/@/shared/types/types';
export const RadioListContent = () => {
const server = useCurrentServer();
const { setItemCount } = useListContext();
const { searchTerm } = useSearchTermFilter();
const { sortBy } = useSortByFilter<RadioListSort>(RadioListSort.NAME, ItemListKey.RADIO);
const { sortOrder } = useSortOrderFilter(SortOrder.ASC, ItemListKey.RADIO);
const radioListQuery = useQuery({
...radioQueries.list({
query: undefined,
serverId: server?.id || '',
}),
});
const filteredAndSortedRadioStations = useMemo(() => {
let stations = radioListQuery.data || [];
if (searchTerm) {
stations = searchLibraryItems(stations, searchTerm, LibraryItem.RADIO_STATION);
}
if (sortBy && sortOrder) {
stations = sortRadioList(stations, sortBy, sortOrder);
}
return stations;
}, [radioListQuery.data, searchTerm, sortBy, sortOrder]);
useEffect(() => {
setItemCount?.(filteredAndSortedRadioStations.length || 0);
}, [filteredAndSortedRadioStations.length, setItemCount]);
if (radioListQuery.isLoading) {
return <Spinner container />;
}
return (
<Suspense fallback={<Spinner container />}>
<ScrollArea>
<Stack p="md">
<RadioListItems data={filteredAndSortedRadioStations} />
</Stack>
</ScrollArea>
</Suspense>
);
};
@@ -0,0 +1,47 @@
import { MouseEvent } from 'react';
import { useTranslation } from 'react-i18next';
import { openCreateRadioStationModal } from '/@/renderer/features/radio/components/create-radio-station-form';
import { ListSortByDropdown } from '/@/renderer/features/shared/components/list-sort-by-dropdown';
import { ListSortOrderToggleButton } from '/@/renderer/features/shared/components/list-sort-order-toggle-button';
import { useCurrentServer, usePermissions } from '/@/renderer/store';
import { Button } from '/@/shared/components/button/button';
import { Divider } from '/@/shared/components/divider/divider';
import { Flex } from '/@/shared/components/flex/flex';
import { Group } from '/@/shared/components/group/group';
import { LibraryItem, RadioListSort, SortOrder } from '/@/shared/types/domain-types';
import { ItemListKey } from '/@/shared/types/types';
export const RadioListHeaderFilters = () => {
const { t } = useTranslation();
const server = useCurrentServer();
const permissions = usePermissions();
const handleCreateRadioStationModal = (e: MouseEvent<HTMLButtonElement>) => {
openCreateRadioStationModal(server, e);
};
return (
<Flex justify="space-between">
<Group gap="sm" w="100%">
<ListSortByDropdown
defaultSortByValue={RadioListSort.NAME}
itemType={LibraryItem.RADIO_STATION}
listKey={ItemListKey.RADIO}
/>
<Divider orientation="vertical" />
<ListSortOrderToggleButton
defaultSortOrder={SortOrder.ASC}
listKey={ItemListKey.RADIO}
/>
</Group>
{permissions.radio.create && (
<Group gap="sm" wrap="nowrap">
<Button onClick={handleCreateRadioStationModal} variant="subtle">
{t('action.createRadioStation', { postProcess: 'sentenceCase' })}
</Button>
</Group>
)}
</Flex>
);
};
@@ -0,0 +1,40 @@
import { useTranslation } from 'react-i18next';
import { PageHeader } from '/@/renderer/components/page-header/page-header';
import { useListContext } from '/@/renderer/context/list-context';
import { RadioListHeaderFilters } from '/@/renderer/features/radio/components/radio-list-header-filters';
import { FilterBar } from '/@/renderer/features/shared/components/filter-bar';
import { LibraryHeaderBar } from '/@/renderer/features/shared/components/library-header-bar';
import { ListSearchInput } from '/@/renderer/features/shared/components/list-search-input';
import { Group } from '/@/shared/components/group/group';
import { Stack } from '/@/shared/components/stack/stack';
interface RadioListHeaderProps {
title?: string;
}
export const RadioListHeader = ({ title }: RadioListHeaderProps) => {
const { t } = useTranslation();
const { itemCount } = useListContext();
const pageTitle = title || t('page.radioList.title', { postProcess: 'titleCase' });
return (
<Stack gap={0}>
<PageHeader>
<LibraryHeaderBar ignoreMaxWidth>
<LibraryHeaderBar.Title>{pageTitle}</LibraryHeaderBar.Title>
<LibraryHeaderBar.Badge isLoading={itemCount === undefined}>
{itemCount}
</LibraryHeaderBar.Badge>
</LibraryHeaderBar>
<Group>
<ListSearchInput />
</Group>
</PageHeader>
<FilterBar>
<RadioListHeaderFilters />
</FilterBar>
</Stack>
);
};
@@ -0,0 +1,30 @@
.radio-item {
cursor: pointer;
border-left: 3px solid transparent;
transition: background-color 0.15s ease;
}
.radio-item:hover {
@mixin dark {
background-color: lighten(var(--theme-colors-surface), 1%);
}
@mixin light {
background-color: darken(var(--theme-colors-surface), 1%);
}
}
.radio-item-active {
border-left: 3px solid var(--theme-colors-primary);
}
.radio-item-button {
all: unset;
flex: 1;
width: 100%;
}
.radio-item-link {
color: inherit;
text-decoration: underline;
}
@@ -0,0 +1,168 @@
import clsx from 'clsx';
import { useCallback, useMemo } from 'react';
import { useTranslation } from 'react-i18next';
import styles from './radio-list-items.module.css';
import { openEditRadioStationModal } from '/@/renderer/features/radio/components/edit-radio-station-form';
import {
useRadioControls,
useRadioPlayer,
} from '/@/renderer/features/radio/hooks/use-radio-player';
import { useDeleteRadioStation } from '/@/renderer/features/radio/mutations/delete-radio-station-mutation';
import { useCurrentServer, usePermissions } from '/@/renderer/store';
import { ActionIcon } from '/@/shared/components/action-icon/action-icon';
import { Flex } from '/@/shared/components/flex/flex';
import { Group } from '/@/shared/components/group/group';
import { Icon } from '/@/shared/components/icon/icon';
import { closeAllModals, ConfirmModal, openModal } from '/@/shared/components/modal/modal';
import { Paper } from '/@/shared/components/paper/paper';
import { Stack } from '/@/shared/components/stack/stack';
import { Text } from '/@/shared/components/text/text';
import { toast } from '/@/shared/components/toast/toast';
import { InternetRadioStation } from '/@/shared/types/domain-types';
interface RadioListItemProps {
station: InternetRadioStation;
}
interface RadioListItemsProps {
data: InternetRadioStation[];
}
const RadioListItem = ({ station }: RadioListItemProps) => {
const { t } = useTranslation();
const { currentStreamUrl, isPlaying } = useRadioPlayer();
const { play, stop } = useRadioControls();
const server = useCurrentServer();
const permissions = usePermissions();
const deleteRadioStationMutation = useDeleteRadioStation({});
const isCurrentStation = currentStreamUrl === station.streamUrl;
const stationIsPlaying = isCurrentStation && isPlaying;
const handleClick = () => {
if (stationIsPlaying) {
stop();
} else {
play(station.streamUrl, station.name);
}
};
const handleEditClick = (e: React.MouseEvent<HTMLButtonElement>) => {
e.stopPropagation();
openEditRadioStationModal(station, server, e);
};
const handleDeleteClick = useCallback(
async (e: React.MouseEvent<HTMLButtonElement>) => {
e.stopPropagation();
if (!server) return;
openModal({
children: (
<ConfirmModal
labels={{
cancel: t('common.cancel', { postProcess: 'sentenceCase' }),
confirm: t('common.delete', { postProcess: 'sentenceCase' }),
}}
loading={deleteRadioStationMutation.isPending}
onConfirm={async () => {
try {
await deleteRadioStationMutation.mutateAsync({
apiClientProps: { serverId: server.id },
query: { id: station.id },
});
// Stop playback if this station is currently playing
if (isCurrentStation) {
stop();
}
} catch (err: any) {
toast.error({
message: err.message,
title: t('error.genericError', {
postProcess: 'sentenceCase',
}),
});
}
closeAllModals();
}}
>
<Text>{t('common.areYouSure', { postProcess: 'sentenceCase' })}</Text>
</ConfirmModal>
),
title: t('common.delete', { postProcess: 'titleCase' }),
});
},
[deleteRadioStationMutation, isCurrentStation, server, station.id, stop, t],
);
return (
<Paper
className={clsx(styles['radio-item'], {
[styles['radio-item-active']]: isCurrentStation,
})}
p="md"
>
<Flex align="flex-start" gap="md" justify="space-between">
<button className={styles['radio-item-button']} onClick={handleClick} role="button">
<Stack gap="xs">
<Group gap="xs">
<Icon color="muted" icon="radio" size="md" />
<Text fw={500} size="md">
{station.name}
</Text>
</Group>
<Text isMuted size="sm">
{station.streamUrl}
</Text>
{station.homepageUrl && (
<Text isMuted size="sm">
{station.homepageUrl}
</Text>
)}
</Stack>
</button>
{(permissions.radio.edit || permissions.radio.delete) && (
<Group gap="xs">
{permissions.radio.edit && (
<ActionIcon
icon="edit"
onClick={handleEditClick}
size="sm"
tooltip={{
label: t('common.edit', { postProcess: 'sentenceCase' }),
}}
variant="subtle"
/>
)}
{permissions.radio.delete && (
<ActionIcon
icon="delete"
iconProps={{ color: 'error' }}
onClick={handleDeleteClick}
size="sm"
tooltip={{
label: t('common.delete', { postProcess: 'sentenceCase' }),
}}
variant="subtle"
/>
)}
</Group>
)}
</Flex>
</Paper>
);
};
export const RadioListItems = ({ data }: RadioListItemsProps) => {
const items = useMemo(
() => data.map((station) => <RadioListItem key={station.id} station={station} />),
[data],
);
return <Stack gap="sm">{items}</Stack>;
};
@@ -0,0 +1,376 @@
import IcecastMetadataStats from 'icecast-metadata-stats';
import isElectron from 'is-electron';
import { useEffect, useRef } from 'react';
import { createWithEqualityFn } from 'zustand/traditional';
import { usePlayerEvents } from '/@/renderer/features/player/audio-player/hooks/use-player-events';
import { convertToLogVolume } from '/@/renderer/features/player/audio-player/utils/player-utils';
import {
usePlaybackType,
usePlayerMuted,
usePlayerStoreBase,
usePlayerVolume,
} from '/@/renderer/store';
import { toast } from '/@/shared/components/toast/toast';
import { PlayerStatus, PlayerType } from '/@/shared/types/types';
export interface RadioMetadata {
artist: null | string;
title: null | string;
}
interface RadioStore {
actions: {
pause: () => void;
play: (streamUrl?: string, stationName?: string) => void;
setCurrentStreamUrl: (currentStreamUrl: null | string) => void;
setIsPlaying: (isPlaying: boolean) => void;
setMetadata: (metadata: null | RadioMetadata) => void;
setStationName: (stationName: null | string) => void;
stop: () => void;
};
currentStreamUrl: null | string;
isPlaying: boolean;
metadata: null | RadioMetadata;
stationName: null | string;
}
export const useRadioStore = createWithEqualityFn<RadioStore>((set) => ({
actions: {
pause: () => {
set({ isPlaying: false });
usePlayerStoreBase.getState().mediaPause();
},
play: (streamUrl?: string, stationName?: string) => {
set((state) => {
const newStreamUrl = streamUrl ?? state.currentStreamUrl;
const newStationName = stationName ?? state.stationName;
if (!newStreamUrl) {
return state;
}
// Reset metadata when switching stations (streamUrl changes)
const isSwitchingStation = newStreamUrl !== state.currentStreamUrl;
usePlayerStoreBase.getState().mediaPlay();
return {
currentStreamUrl: newStreamUrl,
isPlaying: true,
metadata: isSwitchingStation ? null : state.metadata,
stationName: newStationName,
};
});
},
setCurrentStreamUrl: (currentStreamUrl) => set({ currentStreamUrl }),
setIsPlaying: (isPlaying) => set({ isPlaying }),
setMetadata: (metadata) => set({ metadata }),
setStationName: (stationName) => set({ stationName }),
stop: () => {
set({
currentStreamUrl: null,
isPlaying: false,
metadata: null,
stationName: null,
});
usePlayerStoreBase.getState().mediaStop();
},
},
currentStreamUrl: null,
isPlaying: false,
metadata: null,
stationName: null,
}));
export const useIsPlayingRadio = () => useRadioStore((state) => state.isPlaying);
export const useIsRadioActive = () => useRadioStore((state) => Boolean(state.currentStreamUrl));
export const useRadioPlayer = () => {
const currentStreamUrl = useRadioStore((state) => state.currentStreamUrl);
const isPlaying = useRadioStore((state) => state.isPlaying);
const metadata = useRadioStore((state) => state.metadata);
const stationName = useRadioStore((state) => state.stationName);
return {
currentStreamUrl,
isPlaying,
metadata,
stationName,
};
};
export const useRadioControls = () => {
const { pause, play, stop } = useRadioStore((state) => state.actions);
return {
pause,
play,
stop,
};
};
const mpvPlayer = isElectron() ? window.api.mpvPlayer : null;
const mpvPlayerListener = isElectron() ? window.api.mpvPlayerListener : null;
const ipc = isElectron() ? window.api.ipc : null;
export const useRadioAudioInstance = () => {
const { actions } = useRadioStore();
const { setCurrentStreamUrl, setIsPlaying, setStationName } = actions;
const currentStreamUrl = useRadioStore((state) => state.currentStreamUrl);
const isPlaying = useRadioStore((state) => state.isPlaying);
const playbackType = usePlaybackType();
const volume = usePlayerVolume();
const isMuted = usePlayerMuted();
const audioRef = useRef<HTMLAudioElement | null>(null);
const isUsingMpv = playbackType === PlayerType.LOCAL && mpvPlayer;
// Handle mpv playback
useEffect(() => {
if (!isUsingMpv || !mpvPlayer) {
return;
}
if (currentStreamUrl) {
mpvPlayer.setQueue(currentStreamUrl, undefined, !isPlaying);
} else {
mpvPlayer.setQueue(undefined, undefined, true);
}
}, [
currentStreamUrl,
isPlaying,
isUsingMpv,
setIsPlaying,
setCurrentStreamUrl,
setStationName,
]);
useEffect(() => {
if (!isUsingMpv || !mpvPlayerListener || !ipc) {
return;
}
const handleMpvPlay = () => {
setIsPlaying(true);
};
const handleMpvPause = () => {
setIsPlaying(false);
};
const handleMpvStop = () => {
setIsPlaying(false);
setCurrentStreamUrl(null);
setStationName(null);
};
mpvPlayerListener.rendererPlay(handleMpvPlay);
mpvPlayerListener.rendererPause(handleMpvPause);
mpvPlayerListener.rendererStop(handleMpvStop);
return () => {
ipc.removeAllListeners('renderer-player-play');
ipc.removeAllListeners('renderer-player-pause');
ipc.removeAllListeners('renderer-player-stop');
};
}, [isUsingMpv, setIsPlaying, setCurrentStreamUrl, setStationName]);
// Handle web playback
useEffect(() => {
if (isUsingMpv) {
if (audioRef.current) {
audioRef.current.pause();
audioRef.current.src = '';
audioRef.current = null;
}
return;
}
if (currentStreamUrl && isPlaying) {
if (audioRef.current) {
audioRef.current.pause();
audioRef.current.src = '';
}
const audio = new Audio(currentStreamUrl);
audioRef.current = audio;
const linearVolume = volume / 100;
const logVolume = convertToLogVolume(linearVolume);
audio.volume = logVolume;
audio.muted = isMuted;
audio.addEventListener('play', () => {
setIsPlaying(true);
});
audio.addEventListener('pause', () => {
setIsPlaying(false);
});
audio.addEventListener('ended', () => {
setIsPlaying(false);
setCurrentStreamUrl(null);
setStationName(null);
});
audio.addEventListener('error', (error) => {
console.error('Radio stream error:', error);
});
// Attempt to play
audio.play().catch((error) => {
console.error('Failed to play audio:', error);
setIsPlaying(false);
setCurrentStreamUrl(null);
setStationName(null);
toast.error({ message: 'Failed to play radio stream' });
});
} else if (!currentStreamUrl || !isPlaying) {
if (audioRef.current) {
audioRef.current.pause();
audioRef.current.src = '';
audioRef.current = null;
}
}
return () => {
if (audioRef.current) {
audioRef.current.pause();
audioRef.current.src = '';
audioRef.current = null;
}
};
// eslint-disable-next-line react-hooks/exhaustive-deps
}, [
currentStreamUrl,
isPlaying,
isUsingMpv,
setIsPlaying,
setCurrentStreamUrl,
setStationName,
]);
useEffect(() => {
if (isUsingMpv || !audioRef.current) {
return;
}
const linearVolume = volume / 100;
const logVolume = convertToLogVolume(linearVolume);
audioRef.current.volume = logVolume;
audioRef.current.muted = isMuted;
}, [volume, isMuted, isUsingMpv]);
usePlayerEvents(
{
onPlayerStatus: (properties, prev) => {
const radioState = useRadioStore.getState();
if (!radioState.currentStreamUrl) {
return;
}
const { status } = properties;
const { status: prevStatus } = prev;
if (status === prevStatus) {
return;
}
if (status === PlayerStatus.PLAYING && prevStatus === PlayerStatus.PAUSED) {
actions.play();
} else if (status === PlayerStatus.PAUSED && prevStatus === PlayerStatus.PLAYING) {
actions.pause();
}
},
},
[actions],
);
};
export const useRadioMetadata = () => {
const { actions, currentStreamUrl } = useRadioStore();
const { setMetadata } = actions;
const playbackType = usePlaybackType();
const isUsingMpv = playbackType === PlayerType.LOCAL && mpvPlayer;
useEffect(() => {
if (!currentStreamUrl) {
setMetadata(null);
return;
}
// If using mpv, fetch metadata from mpv periodically
if (isUsingMpv && mpvPlayer) {
let intervalId: NodeJS.Timeout | null = null;
const fetchMpvMetadata = async () => {
try {
const metadata = await mpvPlayer.getStreamMetadata();
setMetadata(metadata);
} catch {
// Ignore error
}
};
intervalId = setInterval(fetchMpvMetadata, 5000);
return () => {
if (intervalId) {
clearInterval(intervalId);
}
setMetadata(null);
};
}
// Otherwise, use IcecastMetadataStats for web player
let statsListener: IcecastMetadataStats | null = null;
try {
statsListener = new IcecastMetadataStats(currentStreamUrl, {
interval: 12,
onStats: (stats) => {
// Parse ICY metadata - typically in format "Artist - Title" or just "Title"
let streamTitle: null | string = null;
if (stats.StreamTitle) {
streamTitle = stats.StreamTitle;
} else if (stats.icy?.StreamTitle) {
streamTitle = stats.icy.StreamTitle;
}
// Parse the combined format into title and artist
let artist: null | string = null;
let title: null | string = null;
if (streamTitle) {
// Try to parse "Artist - Title" format
const match = streamTitle.match(/^(.*?)\s*[-–—]\s*(.+)$/);
if (match) {
artist = match[1].trim() || null;
title = match[2].trim() || null;
} else {
// If no separator found, treat the whole thing as title
title = streamTitle;
}
}
setMetadata(title || artist ? { artist, title } : null);
},
sources: ['icy'],
});
statsListener.start();
} catch {
setMetadata(null);
}
return () => {
if (statsListener) {
statsListener.stop();
}
setMetadata(null);
};
}, [currentStreamUrl, setMetadata, isUsingMpv]);
};
@@ -0,0 +1,36 @@
import { useMutation, useQueryClient } from '@tanstack/react-query';
import { AxiosError } from 'axios';
import { api } from '/@/renderer/api';
import { queryKeys } from '/@/renderer/api/query-keys';
import { MutationHookArgs } from '/@/renderer/lib/react-query';
import {
CreateInternetRadioStationArgs,
CreateInternetRadioStationResponse,
} from '/@/shared/types/domain-types';
export const useCreateRadioStation = (args: MutationHookArgs) => {
const { options } = args || {};
const queryClient = useQueryClient();
return useMutation<
CreateInternetRadioStationResponse,
AxiosError,
CreateInternetRadioStationArgs,
null
>({
mutationFn: (args) => {
return api.controller.createInternetRadioStation({
...args,
apiClientProps: { serverId: args.apiClientProps.serverId },
});
},
onSuccess: (_args, variables) => {
queryClient.invalidateQueries({
exact: false,
queryKey: queryKeys.radio.list(variables.apiClientProps.serverId),
});
},
...options,
});
};
@@ -0,0 +1,36 @@
import { useMutation, useQueryClient } from '@tanstack/react-query';
import { AxiosError } from 'axios';
import { api } from '/@/renderer/api';
import { queryKeys } from '/@/renderer/api/query-keys';
import { MutationHookArgs } from '/@/renderer/lib/react-query';
import {
DeleteInternetRadioStationArgs,
DeleteInternetRadioStationResponse,
} from '/@/shared/types/domain-types';
export const useDeleteRadioStation = (args: MutationHookArgs) => {
const { options } = args || {};
const queryClient = useQueryClient();
return useMutation<
DeleteInternetRadioStationResponse,
AxiosError,
DeleteInternetRadioStationArgs,
null
>({
mutationFn: (args) => {
return api.controller.deleteInternetRadioStation({
...args,
apiClientProps: { serverId: args.apiClientProps.serverId },
});
},
onSuccess: (_args, variables) => {
queryClient.invalidateQueries({
exact: false,
queryKey: queryKeys.radio.list(variables.apiClientProps.serverId),
});
},
...options,
});
};
@@ -0,0 +1,36 @@
import { useMutation, useQueryClient } from '@tanstack/react-query';
import { AxiosError } from 'axios';
import { api } from '/@/renderer/api';
import { queryKeys } from '/@/renderer/api/query-keys';
import { MutationHookArgs } from '/@/renderer/lib/react-query';
import {
UpdateInternetRadioStationArgs,
UpdateInternetRadioStationResponse,
} from '/@/shared/types/domain-types';
export const useUpdateRadioStation = (args: MutationHookArgs) => {
const { options } = args || {};
const queryClient = useQueryClient();
return useMutation<
UpdateInternetRadioStationResponse,
AxiosError,
UpdateInternetRadioStationArgs,
null
>({
mutationFn: (args) => {
return api.controller.updateInternetRadioStation({
...args,
apiClientProps: { serverId: args.apiClientProps.serverId },
});
},
onSuccess: (_args, variables) => {
queryClient.invalidateQueries({
exact: false,
queryKey: queryKeys.radio.list(variables.apiClientProps.serverId),
});
},
...options,
});
};
@@ -0,0 +1,42 @@
import { useMemo, useState } from 'react';
import { ListContext } from '/@/renderer/context/list-context';
import { RadioListContent } from '/@/renderer/features/radio/components/radio-list-content';
import { RadioListHeader } from '/@/renderer/features/radio/components/radio-list-header';
import { AnimatedPage } from '/@/renderer/features/shared/components/animated-page';
import { PageErrorBoundary } from '/@/renderer/features/shared/components/page-error-boundary';
import { ItemListKey } from '/@/shared/types/types';
const RadioListRoute = () => {
const pageKey = ItemListKey.RADIO;
const [itemCount, setItemCount] = useState<number | undefined>(undefined);
const providerValue = useMemo(() => {
return {
id: undefined,
itemCount,
pageKey,
setItemCount,
};
}, [itemCount, pageKey, setItemCount]);
return (
<AnimatedPage>
<ListContext.Provider value={providerValue}>
<RadioListHeader />
<RadioListContent />
</ListContext.Provider>
</AnimatedPage>
);
};
const RadioListRouteWithBoundary = () => {
return (
<PageErrorBoundary>
<RadioListRoute />
</PageErrorBoundary>
);
};
export default RadioListRouteWithBoundary;
@@ -0,0 +1,115 @@
import merge from 'lodash/merge';
import { nanoid } from 'nanoid/non-secure';
import { devtools, persist } from 'zustand/middleware';
import { immer } from 'zustand/middleware/immer';
import { createWithEqualityFn } from 'zustand/traditional';
import { InternetRadioStation } from '/@/shared/types/domain-types';
export interface RadioStoreSlice extends RadioStoreState {
actions: {
createStation: (
serverId: string,
station: Omit<InternetRadioStation, 'id'>,
) => InternetRadioStation;
deleteStation: (serverId: string, stationId: string) => void;
getStation: (serverId: string, stationId: string) => InternetRadioStation | null;
getStations: (serverId: string) => InternetRadioStation[];
updateStation: (
serverId: string,
stationId: string,
updates: Partial<InternetRadioStation>,
) => void;
};
}
export interface RadioStoreState {
stations: Record<string, Record<string, InternetRadioStation>>;
}
const initialState: RadioStoreState = {
stations: {},
};
export const useRadioStore = createWithEqualityFn<RadioStoreSlice>()(
persist(
devtools(
immer((set, get) => ({
...initialState,
actions: {
createStation: (serverId, station) => {
const id = nanoid();
const newStation: InternetRadioStation = {
...station,
id,
};
set((state) => {
if (!state.stations[serverId]) {
state.stations[serverId] = {};
}
state.stations[serverId][id] = newStation;
});
return newStation;
},
deleteStation: (serverId, stationId) => {
set((state) => {
if (state.stations[serverId]) {
delete state.stations[serverId][stationId];
// Clean up empty server entries
if (Object.keys(state.stations[serverId]).length === 0) {
delete state.stations[serverId];
}
}
});
},
getStation: (serverId, stationId) => {
const state = get();
return state.stations[serverId]?.[stationId] || null;
},
getStations: (serverId) => {
const state = get();
const serverStations = state.stations[serverId];
if (!serverStations) {
return [];
}
return Object.values(serverStations);
},
updateStation: (serverId, stationId, updates) => {
set((state) => {
if (state.stations[serverId]?.[stationId]) {
state.stations[serverId][stationId] = {
...state.stations[serverId][stationId],
...updates,
};
}
});
},
},
})),
{ name: 'store_radio' },
),
{
merge: (persistedState, currentState) => merge(currentState, persistedState),
name: 'store_radio',
version: 1,
},
),
);
export const useRadioStoreActions = () => useRadioStore((state) => state.actions);
export const useRadioStations = (serverId: string) => {
return useRadioStore((state) => {
const serverStations = state.stations[serverId];
if (!serverStations) {
return [];
}
return Object.values(serverStations);
});
};
export const useRadioStation = (serverId: string, stationId: string) => {
return useRadioStore((state) => state.stations[serverId]?.[stationId] || null);
};
@@ -17,6 +17,7 @@ const SIDEBAR_ITEMS: Array<[string, string]> = [
['Home', 'page.sidebar.home'], ['Home', 'page.sidebar.home'],
['Now Playing', 'page.sidebar.nowPlaying'], ['Now Playing', 'page.sidebar.nowPlaying'],
['Playlists', 'page.sidebar.playlists'], ['Playlists', 'page.sidebar.playlists'],
['Radio', 'page.sidebar.radio'],
['Search', 'page.sidebar.search'], ['Search', 'page.sidebar.search'],
['Settings', 'page.sidebar.settings'], ['Settings', 'page.sidebar.settings'],
['Tracks', 'page.sidebar.tracks'], ['Tracks', 'page.sidebar.tracks'],
@@ -12,6 +12,7 @@ import {
GenreListSort, GenreListSort,
LibraryItem, LibraryItem,
PlaylistListSort, PlaylistListSort,
RadioListSort,
ServerType, ServerType,
SongListSort, SongListSort,
SortOrder, SortOrder,
@@ -802,6 +803,47 @@ const PLAYLIST_LIST_FILTERS: Partial<
], ],
}; };
const RADIO_LIST_FILTERS: Partial<
Record<ServerType, Array<{ defaultOrder: SortOrder; name: string; value: string }>>
> = {
[ServerType.JELLYFIN]: [
{
defaultOrder: SortOrder.ASC,
name: i18n.t('filter.id', { postProcess: 'titleCase' }),
value: RadioListSort.ID,
},
{
defaultOrder: SortOrder.ASC,
name: i18n.t('filter.name', { postProcess: 'titleCase' }),
value: RadioListSort.NAME,
},
],
[ServerType.NAVIDROME]: [
{
defaultOrder: SortOrder.ASC,
name: i18n.t('filter.id', { postProcess: 'titleCase' }),
value: RadioListSort.ID,
},
{
defaultOrder: SortOrder.ASC,
name: i18n.t('filter.name', { postProcess: 'titleCase' }),
value: RadioListSort.NAME,
},
],
[ServerType.SUBSONIC]: [
{
defaultOrder: SortOrder.ASC,
name: i18n.t('filter.id', { postProcess: 'titleCase' }),
value: RadioListSort.ID,
},
{
defaultOrder: SortOrder.ASC,
name: i18n.t('filter.name', { postProcess: 'titleCase' }),
value: RadioListSort.NAME,
},
],
};
const FILTERS: Partial<Record<LibraryItem, any>> = { const FILTERS: Partial<Record<LibraryItem, any>> = {
[LibraryItem.ALBUM]: ALBUM_LIST_FILTERS, [LibraryItem.ALBUM]: ALBUM_LIST_FILTERS,
[LibraryItem.ALBUM_ARTIST]: ALBUM_ARTIST_LIST_FILTERS, [LibraryItem.ALBUM_ARTIST]: ALBUM_ARTIST_LIST_FILTERS,
@@ -810,5 +852,6 @@ const FILTERS: Partial<Record<LibraryItem, any>> = {
[LibraryItem.GENRE]: GENRE_LIST_FILTERS, [LibraryItem.GENRE]: GENRE_LIST_FILTERS,
[LibraryItem.PLAYLIST]: PLAYLIST_LIST_FILTERS, [LibraryItem.PLAYLIST]: PLAYLIST_LIST_FILTERS,
[LibraryItem.PLAYLIST_SONG]: PLAYLIST_SONG_LIST_FILTERS, [LibraryItem.PLAYLIST_SONG]: PLAYLIST_SONG_LIST_FILTERS,
[LibraryItem.RADIO_STATION]: RADIO_LIST_FILTERS,
[LibraryItem.SONG]: SONG_LIST_FILTERS, [LibraryItem.SONG]: SONG_LIST_FILTERS,
}; };
+11 -1
View File
@@ -7,6 +7,7 @@ import {
AlbumArtist, AlbumArtist,
Artist, Artist,
Genre, Genre,
InternetRadioStation,
LibraryItem, LibraryItem,
Playlist, Playlist,
QueueSong, QueueSong,
@@ -97,7 +98,15 @@ interface CreateFuseOptions {
threshold?: number; threshold?: number;
} }
type FuseSearchableItem = Album | AlbumArtist | Artist | Genre | Playlist | QueueSong | Song; type FuseSearchableItem =
| Album
| AlbumArtist
| Artist
| Genre
| InternetRadioStation
| Playlist
| QueueSong
| Song;
export const createFuseForLibraryItem = <T extends FuseSearchableItem>( export const createFuseForLibraryItem = <T extends FuseSearchableItem>(
items: T[], items: T[],
@@ -171,6 +180,7 @@ export const createFuseForLibraryItem = <T extends FuseSearchableItem>(
case LibraryItem.ARTIST: case LibraryItem.ARTIST:
case LibraryItem.GENRE: case LibraryItem.GENRE:
case LibraryItem.RADIO_STATION:
break; break;
case LibraryItem.PLAYLIST: { case LibraryItem.PLAYLIST: {
@@ -38,6 +38,7 @@ export const CollapsedSidebar = () => {
Home: t('page.sidebar.home', { postProcess: 'titleCase' }), Home: t('page.sidebar.home', { postProcess: 'titleCase' }),
'Now Playing': t('page.sidebar.nowPlaying', { postProcess: 'titleCase' }), 'Now Playing': t('page.sidebar.nowPlaying', { postProcess: 'titleCase' }),
Playlists: t('page.sidebar.playlists', { postProcess: 'titleCase' }), Playlists: t('page.sidebar.playlists', { postProcess: 'titleCase' }),
Radio: t('page.sidebar.radio', { postProcess: 'titleCase' }),
Search: t('page.sidebar.search', { postProcess: 'titleCase' }), Search: t('page.sidebar.search', { postProcess: 'titleCase' }),
Settings: t('page.sidebar.settings', { postProcess: 'titleCase' }), Settings: t('page.sidebar.settings', { postProcess: 'titleCase' }),
Tracks: t('page.sidebar.tracks', { postProcess: 'titleCase' }), Tracks: t('page.sidebar.tracks', { postProcess: 'titleCase' }),
@@ -15,6 +15,8 @@ import {
RiPlayLine, RiPlayLine,
RiPlayListFill, RiPlayListFill,
RiPlayListLine, RiPlayListLine,
RiRadioFill,
RiRadioLine,
RiSearchFill, RiSearchFill,
RiSearchLine, RiSearchLine,
RiSettings2Fill, RiSettings2Fill,
@@ -64,6 +66,9 @@ export const SidebarIcon = ({ active, route, size }: SidebarIconProps) => {
case AppRoute.PLAYLISTS: case AppRoute.PLAYLISTS:
if (isActive) return <RiPlayListFill size={size} />; if (isActive) return <RiPlayListFill size={size} />;
return <RiPlayListLine size={size} />; return <RiPlayListLine size={size} />;
case AppRoute.RADIO:
if (isActive) return <RiRadioFill size={size} />;
return <RiRadioLine size={size} />;
case AppRoute.SETTINGS: case AppRoute.SETTINGS:
if (isActive) return <RiSettings2Fill size={size} />; if (isActive) return <RiSettings2Fill size={size} />;
return <RiSettings2Line size={size} />; return <RiSettings2Line size={size} />;
@@ -6,6 +6,7 @@ import { useTranslation } from 'react-i18next';
import styles from './sidebar.module.css'; import styles from './sidebar.module.css';
import { ContextMenuController } from '/@/renderer/features/context-menu/context-menu-controller'; import { ContextMenuController } from '/@/renderer/features/context-menu/context-menu-controller';
import { useRadioStore } from '/@/renderer/features/radio/hooks/use-radio-player';
import { ActionBar } from '/@/renderer/features/sidebar/components/action-bar'; import { ActionBar } from '/@/renderer/features/sidebar/components/action-bar';
import { ServerSelector } from '/@/renderer/features/sidebar/components/server-selector'; import { ServerSelector } from '/@/renderer/features/sidebar/components/server-selector';
import { SidebarIcon } from '/@/renderer/features/sidebar/components/sidebar-icon'; import { SidebarIcon } from '/@/renderer/features/sidebar/components/sidebar-icon';
@@ -52,6 +53,7 @@ export const Sidebar = () => {
Home: t('page.sidebar.home', { postProcess: 'titleCase' }), Home: t('page.sidebar.home', { postProcess: 'titleCase' }),
'Now Playing': t('page.sidebar.nowPlaying', { postProcess: 'titleCase' }), 'Now Playing': t('page.sidebar.nowPlaying', { postProcess: 'titleCase' }),
Playlists: t('page.sidebar.playlists', { postProcess: 'titleCase' }), Playlists: t('page.sidebar.playlists', { postProcess: 'titleCase' }),
Radio: t('page.sidebar.radio', { postProcess: 'titleCase' }),
Search: t('page.sidebar.search', { postProcess: 'titleCase' }), Search: t('page.sidebar.search', { postProcess: 'titleCase' }),
Settings: t('page.sidebar.settings', { postProcess: 'titleCase' }), Settings: t('page.sidebar.settings', { postProcess: 'titleCase' }),
Tracks: t('page.sidebar.tracks', { postProcess: 'titleCase' }), Tracks: t('page.sidebar.tracks', { postProcess: 'titleCase' }),
@@ -61,7 +63,9 @@ export const Sidebar = () => {
const { sidebarItems } = useGeneralSettings(); const { sidebarItems } = useGeneralSettings();
const { windowBarStyle } = useWindowSettings(); const { windowBarStyle } = useWindowSettings();
const showImage = useAppStore((state) => state.sidebar.image); const sidebarImageEnabled = useAppStore((state) => state.sidebar.image);
const isRadioPlaying = useRadioStore((state) => state.isPlaying);
const showImage = sidebarImageEnabled && !isRadioPlaying;
const sidebarItemsWithRoute: SidebarItemType[] = useMemo(() => { const sidebarItemsWithRoute: SidebarItemType[] = useMemo(() => {
if (!sidebarItems) return []; if (!sidebarItems) return [];
+38 -2
View File
@@ -12,6 +12,7 @@ import macMinHover from './assets/min-mac-hover.png';
import macMin from './assets/min-mac.png'; import macMin from './assets/min-mac.png';
import styles from './window-bar.module.css'; import styles from './window-bar.module.css';
import { useRadioPlayer } from '/@/renderer/features/radio/hooks/use-radio-player';
import { useAppStore, usePlayerData, usePlayerStatus, useWindowSettings } from '/@/renderer/store'; import { useAppStore, usePlayerData, usePlayerStatus, useWindowSettings } from '/@/renderer/store';
import { Text } from '/@/shared/components/text/text'; import { Text } from '/@/shared/components/text/text';
import { Platform, PlayerStatus } from '/@/shared/types/types'; import { Platform, PlayerStatus } from '/@/shared/types/types';
@@ -128,6 +129,8 @@ export const WindowBar = () => {
const handleMinimize = () => minimize(); const handleMinimize = () => minimize();
const { currentSong, index, queueLength } = usePlayerData(); const { currentSong, index, queueLength } = usePlayerData();
const { isPlaying: isRadioPlaying, metadata, stationName } = useRadioPlayer();
const isRadioActive = Boolean(stationName || metadata);
const [max, setMax] = useState(localSettings?.env.START_MAXIMIZED || false); const [max, setMax] = useState(localSettings?.env.START_MAXIMIZED || false);
const handleMaximize = useCallback(() => { const handleMaximize = useCallback(() => {
@@ -142,16 +145,49 @@ export const WindowBar = () => {
const handleClose = useCallback(() => close(), []); const handleClose = useCallback(() => close(), []);
const title = useMemo(() => { const title = useMemo(() => {
const privateModeString = privateMode ? '(Private mode)' : '';
// Show radio information if radio is active
if (isRadioActive) {
const radioStatusString = !isRadioPlaying ? '(Paused) ' : '';
const radioTitle = stationName || 'Radio';
// Format metadata: show title, or combine artist and title if both available
let radioMetadata = '';
if (metadata) {
if (metadata.title && metadata.artist) {
radioMetadata = `${metadata.artist}${metadata.title}`;
} else if (metadata.title) {
radioMetadata = `${metadata.title}`;
} else if (metadata.artist) {
radioMetadata = `${metadata.artist}`;
}
}
return `${radioStatusString}${radioTitle}${radioMetadata} — Feishin${privateMode ? ` ${privateModeString}` : ''}`;
}
// Show regular song information
const statusString = playerStatus === PlayerStatus.PAUSED ? '(Paused) ' : ''; const statusString = playerStatus === PlayerStatus.PAUSED ? '(Paused) ' : '';
const queueString = queueLength ? `(${index + 1} / ${queueLength}) ` : ''; const queueString = queueLength ? `(${index + 1} / ${queueLength}) ` : '';
const privateModeString = privateMode ? '(Private mode)' : '';
const title = `${ const title = `${
queueLength queueLength
? `${statusString}${queueString}${currentSong?.name}${currentSong?.artistName ? `${currentSong?.artistName} — Feishin` : ''}` ? `${statusString}${queueString}${currentSong?.name}${currentSong?.artistName ? `${currentSong?.artistName} — Feishin` : ''}`
: 'Feishin' : 'Feishin'
}${privateMode ? ` ${privateModeString}` : ''}`; }${privateMode ? ` ${privateModeString}` : ''}`;
return title; return title;
}, [currentSong?.artistName, currentSong?.name, index, playerStatus, privateMode, queueLength]); }, [
currentSong?.artistName,
currentSong?.name,
index,
isRadioActive,
isRadioPlaying,
metadata,
playerStatus,
privateMode,
queueLength,
stationName,
]);
useEffect(() => { useEffect(() => {
document.title = title; document.title = title;
+3
View File
@@ -71,6 +71,8 @@ const GenreDetailRoute = lazy(
const FolderListRoute = lazy(() => import('/@/renderer/features/folders/routes/folder-list-route')); const FolderListRoute = lazy(() => import('/@/renderer/features/folders/routes/folder-list-route'));
const RadioListRoute = lazy(() => import('/@/renderer/features/radio/routes/radio-list-route'));
const SearchRoute = lazy(() => import('/@/renderer/features/search/routes/search-route')); const SearchRoute = lazy(() => import('/@/renderer/features/search/routes/search-route'));
const FavoritesRoute = lazy(() => import('/@/renderer/features/favorites/routes/favorites-route')); const FavoritesRoute = lazy(() => import('/@/renderer/features/favorites/routes/favorites-route'));
@@ -154,6 +156,7 @@ export const AppRouter = () => {
element={<PlaylistListRoute />} element={<PlaylistListRoute />}
path={AppRoute.PLAYLISTS} path={AppRoute.PLAYLISTS}
/> />
<Route element={<RadioListRoute />} path={AppRoute.RADIO} />
<Route <Route
element={<PlaylistDetailSongListRoute />} element={<PlaylistDetailSongListRoute />}
path={AppRoute.PLAYLISTS_DETAIL_SONGS} path={AppRoute.PLAYLISTS_DETAIL_SONGS}
+1
View File
@@ -25,6 +25,7 @@ export enum AppRoute {
PLAYING = '/playing', PLAYING = '/playing',
PLAYLISTS = '/playlists', PLAYLISTS = '/playlists',
PLAYLISTS_DETAIL_SONGS = '/playlists/:playlistId/songs', PLAYLISTS_DETAIL_SONGS = '/playlists/:playlistId/songs',
RADIO = '/radio',
SEARCH = '/search/:itemType', SEARCH = '/search/:itemType',
SERVERS = '/servers', SERVERS = '/servers',
SETTINGS = '/settings', SETTINGS = '/settings',
+5
View File
@@ -163,6 +163,11 @@ export const usePermissions = () => {
playlists: { playlists: {
editPublic: isAdmin, editPublic: isAdmin,
}, },
radio: {
create: isAdmin,
delete: isAdmin,
edit: isAdmin,
},
userId: userId, userId: userId,
}; };
}; };
+16 -1
View File
@@ -639,6 +639,12 @@ export const sidebarItems: SidebarItemType[] = [
label: i18n.t('page.sidebar.playlists'), label: i18n.t('page.sidebar.playlists'),
route: AppRoute.PLAYLISTS, route: AppRoute.PLAYLISTS,
}, },
{
disabled: false,
id: 'Radio',
label: i18n.t('page.sidebar.radio'),
route: AppRoute.RADIO,
},
{ {
disabled: true, disabled: true,
id: 'Settings', id: 'Settings',
@@ -1500,10 +1506,19 @@ export const useSettingsStore = createWithEqualityFn<SettingsSlice>()(
state.lists['sidequeue']?.table.columns.push(...columns); state.lists['sidequeue']?.table.columns.push(...columns);
} }
if (version <= 15) {
state.general.sidebarItems.push({
disabled: false,
id: 'Radio',
label: i18n.t('page.sidebar.radio'),
route: AppRoute.RADIO,
});
}
return persistedState; return persistedState;
}, },
name: 'store_settings', name: 'store_settings',
version: 15, version: 16,
}, },
), ),
); );
@@ -7,6 +7,7 @@ import {
ExplicitStatus, ExplicitStatus,
Folder, Folder,
Genre, Genre,
InternetRadioStation,
LibraryItem, LibraryItem,
Playlist, Playlist,
RelatedArtist, RelatedArtist,
@@ -391,11 +392,23 @@ const normalizeFolder = (
}; };
}; };
const normalizeInternetRadioStation = (
item: z.infer<typeof ssType._response.internetRadioStation>,
): InternetRadioStation => {
return {
homepageUrl: item.homepageUrl || null,
id: item.id,
name: item.name,
streamUrl: item.streamUrl,
};
};
export const ssNormalize = { export const ssNormalize = {
album: normalizeAlbum, album: normalizeAlbum,
albumArtist: normalizeAlbumArtist, albumArtist: normalizeAlbumArtist,
folder: normalizeFolder, folder: normalizeFolder,
genre: normalizeGenre, genre: normalizeGenre,
internetRadioStation: normalizeInternetRadioStation,
playlist: normalizePlaylist, playlist: normalizePlaylist,
song: normalizeSong, song: normalizeSong,
}; };
+46
View File
@@ -654,6 +654,44 @@ const playQueueByIndex = z.object({
}), }),
}); });
const internetRadioStation = z.object({
homepageUrl: z.string().optional(),
id: z.string(),
name: z.string(),
streamUrl: z.string(),
});
const deleteInternetRadioStationParameters = z.object({
id: z.string(),
});
const deleteInternetRadioStation = z.null();
const createInternetRadioStationParameters = z.object({
homepageUrl: z.string().optional(),
name: z.string(),
streamUrl: z.string(),
});
const createInternetRadioStation = z.null();
const updateInternetRadioStationParameters = z.object({
homepageUrl: z.string().optional(),
id: z.string(),
name: z.string(),
streamUrl: z.string(),
});
const updateInternetRadioStation = z.null();
const getInternetRadioStations = z.object({
internetRadioStations: z
.object({
internetRadioStation: z.array(internetRadioStation),
})
.optional(),
});
export const ssType = { export const ssType = {
_parameters: { _parameters: {
albumInfo: albumInfoParameters, albumInfo: albumInfoParameters,
@@ -661,7 +699,9 @@ export const ssType = {
artistInfo: artistInfoParameters, artistInfo: artistInfoParameters,
authenticate: authenticateParameters, authenticate: authenticateParameters,
createFavorite: createFavoriteParameters, createFavorite: createFavoriteParameters,
createInternetRadioStation: createInternetRadioStationParameters,
createPlaylist: createPlaylistParameters, createPlaylist: createPlaylistParameters,
deleteInternetRadioStation: deleteInternetRadioStationParameters,
deletePlaylist: deletePlaylistParameters, deletePlaylist: deletePlaylistParameters,
getAlbum: getAlbumParameters, getAlbum: getAlbumParameters,
getAlbumList2: getAlbumList2Parameters, getAlbumList2: getAlbumList2Parameters,
@@ -686,6 +726,7 @@ export const ssType = {
similarSongs: similarSongsParameters, similarSongs: similarSongsParameters,
structuredLyrics: structuredLyricsParameters, structuredLyrics: structuredLyricsParameters,
topSongsList: topSongsListParameters, topSongsList: topSongsListParameters,
updateInternetRadioStation: updateInternetRadioStationParameters,
updatePlaylist: updatePlaylistParameters, updatePlaylist: updatePlaylistParameters,
user: userParameters, user: userParameters,
}, },
@@ -701,7 +742,9 @@ export const ssType = {
authenticate, authenticate,
baseResponse, baseResponse,
createFavorite, createFavorite,
createInternetRadioStation,
createPlaylist, createPlaylist,
deleteInternetRadioStation,
directory, directory,
genre, genre,
getAlbum, getAlbum,
@@ -710,12 +753,14 @@ export const ssType = {
getArtists, getArtists,
getGenres, getGenres,
getIndexes, getIndexes,
getInternetRadioStations,
getMusicDirectory, getMusicDirectory,
getPlaylist, getPlaylist,
getPlaylists, getPlaylists,
getSong, getSong,
getSongsByGenre, getSongsByGenre,
getStarred, getStarred,
internetRadioStation,
musicFolderList, musicFolderList,
ping, ping,
playlist, playlist,
@@ -733,6 +778,7 @@ export const ssType = {
song, song,
structuredLyrics, structuredLyrics,
topSongsList, topSongsList,
updateInternetRadioStation,
user, user,
}, },
}; };
+29
View File
@@ -12,7 +12,9 @@ import {
AlbumArtistListSort, AlbumArtistListSort,
AlbumListSort, AlbumListSort,
ArtistListSort, ArtistListSort,
InternetRadioStation,
LibraryItem, LibraryItem,
RadioListSort,
ServerListItem, ServerListItem,
Song, Song,
SongListSort, SongListSort,
@@ -365,6 +367,7 @@ export const sortAlbumArtistList = (
return results; return results;
}; };
export const sortAlbumList = (albums: Album[], sortBy: AlbumListSort, sortOrder: SortOrder) => { export const sortAlbumList = (albums: Album[], sortBy: AlbumListSort, sortOrder: SortOrder) => {
let results = albums; let results = albums;
@@ -414,3 +417,29 @@ export const sortAlbumList = (albums: Album[], sortBy: AlbumListSort, sortOrder:
return results; return results;
}; };
export const sortRadioList = (
stations: InternetRadioStation[],
sortBy: RadioListSort,
sortOrder: SortOrder,
) => {
let results = stations;
const order = sortOrder === SortOrder.ASC ? 'asc' : 'desc';
switch (sortBy) {
case RadioListSort.ID:
results = [...results];
if (order === 'desc') {
results.reverse();
}
break;
case RadioListSort.NAME:
results = orderBy(results, [(v) => v.name.toLowerCase()], [order]);
break;
default:
break;
}
return results;
};
+80 -2
View File
@@ -29,6 +29,7 @@ export enum LibraryItem {
PLAYLIST = 'playlist', PLAYLIST = 'playlist',
PLAYLIST_SONG = 'playlistSong', PLAYLIST_SONG = 'playlistSong',
QUEUE_SONG = 'queueSong', QUEUE_SONG = 'queueSong',
RADIO_STATION = 'radioStation',
SONG = 'song', SONG = 'song',
} }
@@ -861,8 +862,6 @@ export const artistListSortMap: ArtistListSortMap = {
}, },
}; };
// Artist Detail
export enum PlaylistListSort { export enum PlaylistListSort {
DURATION = 'duration', DURATION = 'duration',
NAME = 'name', NAME = 'name',
@@ -872,6 +871,11 @@ export enum PlaylistListSort {
UPDATED_AT = 'updatedAt', UPDATED_AT = 'updatedAt',
} }
export enum RadioListSort {
ID = 'id',
NAME = 'name',
}
export type AddToPlaylistArgs = BaseEndpointArgs & { export type AddToPlaylistArgs = BaseEndpointArgs & {
body: AddToPlaylistBody; body: AddToPlaylistBody;
query: AddToPlaylistQuery; query: AddToPlaylistQuery;
@@ -888,6 +892,18 @@ export type AddToPlaylistQuery = {
// Add to playlist // Add to playlist
export type AddToPlaylistResponse = null | undefined; export type AddToPlaylistResponse = null | undefined;
export type CreateInternetRadioStationArgs = BaseEndpointArgs & {
body: CreateInternetRadioStationBody;
};
export type CreateInternetRadioStationBody = {
homepageUrl?: string;
name: string;
streamUrl: string;
};
export type CreateInternetRadioStationResponse = null | undefined;
export type CreatePlaylistArgs = BaseEndpointArgs & { body: CreatePlaylistBody }; export type CreatePlaylistArgs = BaseEndpointArgs & { body: CreatePlaylistBody };
export type CreatePlaylistBody = { export type CreatePlaylistBody = {
@@ -903,6 +919,16 @@ export type CreatePlaylistBody = {
// Create Playlist // Create Playlist
export type CreatePlaylistResponse = undefined | { id: string }; export type CreatePlaylistResponse = undefined | { id: string };
export type DeleteInternetRadioStationArgs = BaseEndpointArgs & {
query: DeleteInternetRadioStationQuery;
};
export type DeleteInternetRadioStationQuery = {
id: string;
};
export type DeleteInternetRadioStationResponse = null | undefined;
export type DeletePlaylistArgs = BaseEndpointArgs & { export type DeletePlaylistArgs = BaseEndpointArgs & {
query: DeletePlaylistQuery; query: DeletePlaylistQuery;
}; };
@@ -922,6 +948,17 @@ export type FavoriteQuery = {
// Favorite // Favorite
export type FavoriteResponse = null | undefined; export type FavoriteResponse = null | undefined;
export type GetInternetRadioStationsArgs = BaseEndpointArgs;
export type GetInternetRadioStationsResponse = InternetRadioStation[];
export type InternetRadioStation = {
homepageUrl?: null | string;
id: string;
name: string;
streamUrl: string;
};
export type PlaylistListArgs = BaseEndpointArgs & { query: PlaylistListQuery }; export type PlaylistListArgs = BaseEndpointArgs & { query: PlaylistListQuery };
export type PlaylistListCountArgs = BaseEndpointArgs & { query: ListCountQuery<PlaylistListQuery> }; export type PlaylistListCountArgs = BaseEndpointArgs & { query: ListCountQuery<PlaylistListQuery> };
@@ -989,6 +1026,23 @@ export type ShareItemBody = {
// Sharing // Sharing
export type ShareItemResponse = undefined | { id: string }; export type ShareItemResponse = undefined | { id: string };
export type UpdateInternetRadioStationArgs = BaseEndpointArgs & {
body: UpdateInternetRadioStationBody;
query: UpdateInternetRadioStationQuery;
};
export type UpdateInternetRadioStationBody = {
homepageUrl?: string;
name: string;
streamUrl: string;
};
export type UpdateInternetRadioStationQuery = {
id: string;
};
export type UpdateInternetRadioStationResponse = null | undefined;
export type UpdatePlaylistArgs = BaseEndpointArgs & { export type UpdatePlaylistArgs = BaseEndpointArgs & {
body: UpdatePlaylistBody; body: UpdatePlaylistBody;
query: UpdatePlaylistQuery; query: UpdatePlaylistQuery;
@@ -1265,8 +1319,14 @@ export type ControllerEndpoint = {
body: { legacy?: boolean; password: string; username: string }, body: { legacy?: boolean; password: string; username: string },
) => Promise<AuthenticationResponse>; ) => Promise<AuthenticationResponse>;
createFavorite: (args: FavoriteArgs) => Promise<FavoriteResponse>; createFavorite: (args: FavoriteArgs) => Promise<FavoriteResponse>;
createInternetRadioStation: (
args: CreateInternetRadioStationArgs,
) => Promise<CreateInternetRadioStationResponse>;
createPlaylist: (args: CreatePlaylistArgs) => Promise<CreatePlaylistResponse>; createPlaylist: (args: CreatePlaylistArgs) => Promise<CreatePlaylistResponse>;
deleteFavorite: (args: FavoriteArgs) => Promise<FavoriteResponse>; deleteFavorite: (args: FavoriteArgs) => Promise<FavoriteResponse>;
deleteInternetRadioStation: (
args: DeleteInternetRadioStationArgs,
) => Promise<DeleteInternetRadioStationResponse>;
deletePlaylist: (args: DeletePlaylistArgs) => Promise<DeletePlaylistResponse>; deletePlaylist: (args: DeletePlaylistArgs) => Promise<DeletePlaylistResponse>;
getAlbumArtistDetail: (args: AlbumArtistDetailArgs) => Promise<AlbumArtistDetailResponse>; getAlbumArtistDetail: (args: AlbumArtistDetailArgs) => Promise<AlbumArtistDetailResponse>;
getAlbumArtistList: (args: AlbumArtistListArgs) => Promise<AlbumArtistListResponse>; getAlbumArtistList: (args: AlbumArtistListArgs) => Promise<AlbumArtistListResponse>;
@@ -1280,6 +1340,9 @@ export type ControllerEndpoint = {
getDownloadUrl: (args: DownloadArgs) => string; getDownloadUrl: (args: DownloadArgs) => string;
getFolder: (args: FolderArgs) => Promise<FolderResponse>; getFolder: (args: FolderArgs) => Promise<FolderResponse>;
getGenreList: (args: GenreListArgs) => Promise<GenreListResponse>; getGenreList: (args: GenreListArgs) => Promise<GenreListResponse>;
getInternetRadioStations: (
args: GetInternetRadioStationsArgs,
) => Promise<GetInternetRadioStationsResponse>;
getLyrics?: (args: LyricsArgs) => Promise<LyricsResponse>; getLyrics?: (args: LyricsArgs) => Promise<LyricsResponse>;
getMusicFolderList: (args: MusicFolderListArgs) => Promise<MusicFolderListResponse>; getMusicFolderList: (args: MusicFolderListArgs) => Promise<MusicFolderListResponse>;
getPlaylistDetail: (args: PlaylistDetailArgs) => Promise<PlaylistDetailResponse>; getPlaylistDetail: (args: PlaylistDetailArgs) => Promise<PlaylistDetailResponse>;
@@ -1309,6 +1372,9 @@ export type ControllerEndpoint = {
search: (args: SearchArgs) => Promise<SearchResponse>; search: (args: SearchArgs) => Promise<SearchResponse>;
setRating?: (args: SetRatingArgs) => Promise<RatingResponse>; setRating?: (args: SetRatingArgs) => Promise<RatingResponse>;
shareItem?: (args: ShareItemArgs) => Promise<ShareItemResponse>; shareItem?: (args: ShareItemArgs) => Promise<ShareItemResponse>;
updateInternetRadioStation: (
args: UpdateInternetRadioStationArgs,
) => Promise<UpdateInternetRadioStationResponse>;
updatePlaylist: (args: UpdatePlaylistArgs) => Promise<UpdatePlaylistResponse>; updatePlaylist: (args: UpdatePlaylistArgs) => Promise<UpdatePlaylistResponse>;
}; };
@@ -1351,10 +1417,16 @@ export type InternalControllerEndpoint = {
body: { legacy?: boolean; password: string; username: string }, body: { legacy?: boolean; password: string; username: string },
) => Promise<AuthenticationResponse>; ) => Promise<AuthenticationResponse>;
createFavorite: (args: ReplaceApiClientProps<FavoriteArgs>) => Promise<FavoriteResponse>; createFavorite: (args: ReplaceApiClientProps<FavoriteArgs>) => Promise<FavoriteResponse>;
createInternetRadioStation: (
args: ReplaceApiClientProps<CreateInternetRadioStationArgs>,
) => Promise<CreateInternetRadioStationResponse>;
createPlaylist: ( createPlaylist: (
args: ReplaceApiClientProps<CreatePlaylistArgs>, args: ReplaceApiClientProps<CreatePlaylistArgs>,
) => Promise<CreatePlaylistResponse>; ) => Promise<CreatePlaylistResponse>;
deleteFavorite: (args: ReplaceApiClientProps<FavoriteArgs>) => Promise<FavoriteResponse>; deleteFavorite: (args: ReplaceApiClientProps<FavoriteArgs>) => Promise<FavoriteResponse>;
deleteInternetRadioStation: (
args: ReplaceApiClientProps<DeleteInternetRadioStationArgs>,
) => Promise<DeleteInternetRadioStationResponse>;
deletePlaylist: ( deletePlaylist: (
args: ReplaceApiClientProps<DeletePlaylistArgs>, args: ReplaceApiClientProps<DeletePlaylistArgs>,
) => Promise<DeletePlaylistResponse>; ) => Promise<DeletePlaylistResponse>;
@@ -1377,6 +1449,9 @@ export type InternalControllerEndpoint = {
getDownloadUrl: (args: ReplaceApiClientProps<DownloadArgs>) => string; getDownloadUrl: (args: ReplaceApiClientProps<DownloadArgs>) => string;
getFolder: (args: ReplaceApiClientProps<FolderArgs>) => Promise<FolderResponse>; getFolder: (args: ReplaceApiClientProps<FolderArgs>) => Promise<FolderResponse>;
getGenreList: (args: ReplaceApiClientProps<GenreListArgs>) => Promise<GenreListResponse>; getGenreList: (args: ReplaceApiClientProps<GenreListArgs>) => Promise<GenreListResponse>;
getInternetRadioStations: (
args: ReplaceApiClientProps<GetInternetRadioStationsArgs>,
) => Promise<GetInternetRadioStationsResponse>;
getLyrics?: (args: ReplaceApiClientProps<LyricsArgs>) => Promise<LyricsResponse>; getLyrics?: (args: ReplaceApiClientProps<LyricsArgs>) => Promise<LyricsResponse>;
getMusicFolderList: ( getMusicFolderList: (
args: ReplaceApiClientProps<MusicFolderListArgs>, args: ReplaceApiClientProps<MusicFolderListArgs>,
@@ -1423,6 +1498,9 @@ export type InternalControllerEndpoint = {
search: (args: ReplaceApiClientProps<SearchArgs>) => Promise<SearchResponse>; search: (args: ReplaceApiClientProps<SearchArgs>) => Promise<SearchResponse>;
setRating?: (args: ReplaceApiClientProps<SetRatingArgs>) => Promise<RatingResponse>; setRating?: (args: ReplaceApiClientProps<SetRatingArgs>) => Promise<RatingResponse>;
shareItem?: (args: ReplaceApiClientProps<ShareItemArgs>) => Promise<ShareItemResponse>; shareItem?: (args: ReplaceApiClientProps<ShareItemArgs>) => Promise<ShareItemResponse>;
updateInternetRadioStation: (
args: ReplaceApiClientProps<UpdateInternetRadioStationArgs>,
) => Promise<UpdateInternetRadioStationResponse>;
updatePlaylist: ( updatePlaylist: (
args: ReplaceApiClientProps<UpdatePlaylistArgs>, args: ReplaceApiClientProps<UpdatePlaylistArgs>,
) => Promise<UpdatePlaylistResponse>; ) => Promise<UpdatePlaylistResponse>;
+1
View File
@@ -28,6 +28,7 @@ export enum ItemListKey {
PLAYLIST = LibraryItem.PLAYLIST, PLAYLIST = LibraryItem.PLAYLIST,
PLAYLIST_SONG = LibraryItem.PLAYLIST_SONG, PLAYLIST_SONG = LibraryItem.PLAYLIST_SONG,
QUEUE_SONG = LibraryItem.QUEUE_SONG, QUEUE_SONG = LibraryItem.QUEUE_SONG,
RADIO = 'radio',
SIDE_QUEUE = 'sideQueue', SIDE_QUEUE = 'sideQueue',
SONG = LibraryItem.SONG, SONG = LibraryItem.SONG,
} }