Fix blocks for emby/jellyfin, support enable/disable

This commit is contained in:
shamoon 2023-03-12 16:50:28 -07:00
parent 29c7a51b04
commit eaf7ba608b
3 changed files with 101 additions and 86 deletions

View File

@ -72,7 +72,11 @@
"playing": "Playing", "playing": "Playing",
"transcoding": "Transcoding", "transcoding": "Transcoding",
"bitrate": "Bitrate", "bitrate": "Bitrate",
"no_active": "No Active Streams" "no_active": "No Active Streams",
"movies": "Movies",
"series": "Series",
"episodes": "Episodes",
"songs": "Songs"
}, },
"flood": { "flood": {
"download": "Download", "download": "Download",

View File

@ -247,7 +247,9 @@ export function cleanServiceGroups(groups) {
namespace, // kubernetes widget namespace, // kubernetes widget
app, app,
podSelector, podSelector,
wan // opnsense widget wan, // opnsense widget,
enableBlocks, // emby/jellyfin
enableNowPlaying
} = cleanedService.widget; } = cleanedService.widget;
const fieldsList = typeof fields === 'string' ? JSON.parse(fields) : fields; const fieldsList = typeof fields === 'string' ? JSON.parse(fields) : fields;
@ -278,6 +280,10 @@ export function cleanServiceGroups(groups) {
if (type === "opnsense") { if (type === "opnsense") {
if (wan) cleanedService.widget.wan = wan; if (wan) cleanedService.widget.wan = wan;
} }
if (type === "emby" || type === "jellyfin") {
if (enableBlocks) cleanedService.widget.enableBlocks = enableBlocks === 'true';
if (enableNowPlaying) cleanedService.widget.enableNowPlaying = enableNowPlaying === 'true';
}
} }
return cleanedService; return cleanedService;

View File

@ -149,6 +149,33 @@ function SessionEntry({ playCommand, session }) {
); );
} }
function CountBlocks({ service, countData }) {
const { t } = useTranslation();
// allows filtering
// eslint-disable-next-line no-param-reassign
if (service.widget?.type === 'jellyfin') service.widget.type = 'emby'
if (!countData) {
return (
<Container service={service}>
<Block label="emby.movies" />
<Block label="emby.series" />
<Block label="emby.episodes" />
<Block label="emby.songs" />
</Container>
)
}
return (
<Container service={service}>
<Block label="emby.movies" value={t("common.number", { value: countData.MovieCount })} />
<Block label="emby.series" value={t("common.number", { value: countData.SeriesCount })} />
<Block label="emby.episodes" value={t("common.number", { value: countData.EpisodeCount })} />
<Block label="emby.songs" value={t("common.number", { value: countData.SongCount })} />
</Container>
)
}
export default function Component({ service }) { export default function Component({ service }) {
const { t } = useTranslation(); const { t } = useTranslation();
@ -179,43 +206,29 @@ export default function Component({ service }) {
} }
if (sessionsError || countError) { if (sessionsError || countError) {
return <Container error={sessionsError || countError} />; return <Container error={sessionsError ?? countError} />;
} }
if (!sessionsData && countData) { const enableBlocks = service.widget?.enableBlocks
const enableNowPlaying = service.widget?.enableNowPlaying ?? true
if (!sessionsData || !countData) {
return ( return (
<> <>
<Container> {enableBlocks && <CountBlocks service={service} countData={null} />}
<Block label="Movies" value={t("common.number", { value: countData.MovieCount })} /> {enableNowPlaying && <div className="flex flex-col pb-1">
<Block label="Series" value={t("common.number", { value: countData.SeriesCount })} />
<Block label="Episodes" value={t("common.number", { value: countData.EpisodeCount })} />
<Block label="Songs" value={t("common.number", { value: countData.SongCount })} />
</Container>
<div className="flex flex-col pb-1">
<div className="text-theme-700 dark:text-theme-200 text-xs relative h-5 w-full rounded-md bg-theme-200/50 dark:bg-theme-900/20 mt-1"> <div className="text-theme-700 dark:text-theme-200 text-xs relative h-5 w-full rounded-md bg-theme-200/50 dark:bg-theme-900/20 mt-1">
<span className="absolute left-2 text-xs mt-[2px]">-</span> <span className="absolute left-2 text-xs mt-[2px]">-</span>
</div> </div>
<div className="text-theme-700 dark:text-theme-200 text-xs relative h-5 w-full rounded-md bg-theme-200/50 dark:bg-theme-900/20 mt-1"> <div className="text-theme-700 dark:text-theme-200 text-xs relative h-5 w-full rounded-md bg-theme-200/50 dark:bg-theme-900/20 mt-1">
<span className="absolute left-2 text-xs mt-[2px]">-</span> <span className="absolute left-2 text-xs mt-[2px]">-</span>
</div> </div>
</div> </div>}
</> </>
); );
} }
if (!sessionsData) { if (enableNowPlaying) {
return (
<div className="flex flex-col pb-1">
<div className="text-theme-700 dark:text-theme-200 text-xs relative h-5 w-full rounded-md bg-theme-200/50 dark:bg-theme-900/20 mt-1">
<span className="absolute left-2 text-xs mt-[2px]">-</span>
</div>
<div className="text-theme-700 dark:text-theme-200 text-xs relative h-5 w-full rounded-md bg-theme-200/50 dark:bg-theme-900/20 mt-1">
<span className="absolute left-2 text-xs mt-[2px]">-</span>
</div>
</div>
);
}
const playing = sessionsData const playing = sessionsData
.filter((session) => session?.NowPlayingItem) .filter((session) => session?.NowPlayingItem)
.sort((a, b) => { .sort((a, b) => {
@ -228,15 +241,10 @@ export default function Component({ service }) {
return 0; return 0;
}); });
if (playing.length === 0 && countData) { if (playing.length === 0) {
return ( return (
<> <>
<Container> {enableBlocks && <CountBlocks service={service} countData={countData} />}
<Block label="Movies" value={t("common.number", { value: countData.MovieCount })} />
<Block label="Series" value={t("common.number", { value: countData.SeriesCount })} />
<Block label="Episodes" value={t("common.number", { value: countData.EpisodeCount })} />
<Block label="Songs" value={t("common.number", { value: countData.SongCount })} />
</Container>
<div className="flex flex-col pb-1 mx-1"> <div className="flex flex-col pb-1 mx-1">
<div className="text-theme-700 dark:text-theme-200 text-xs relative h-5 w-full rounded-md bg-theme-200/50 dark:bg-theme-900/20 mt-1"> <div className="text-theme-700 dark:text-theme-200 text-xs relative h-5 w-full rounded-md bg-theme-200/50 dark:bg-theme-900/20 mt-1">
<span className="absolute left-2 text-xs mt-[2px]">{t("emby.no_active")}</span> <span className="absolute left-2 text-xs mt-[2px]">{t("emby.no_active")}</span>
@ -249,16 +257,11 @@ export default function Component({ service }) {
); );
} }
if (playing.length === 1 && countData) { if (playing.length === 1) {
const session = playing[0]; const session = playing[0];
return ( return (
<> <>
<Container> {enableBlocks && <CountBlocks service={service} countData={countData} />}
<Block label="Movies" value={t("common.number", { value: countData.MovieCount })} />
<Block label="Series" value={t("common.number", { value: countData.SeriesCount })} />
<Block label="Episodes" value={t("common.number", { value: countData.EpisodeCount })} />
<Block label="Songs" value={t("common.number", { value: countData.SongCount })} />
</Container>
<div className="flex flex-col pb-1 mx-1"> <div className="flex flex-col pb-1 mx-1">
<SingleSessionEntry <SingleSessionEntry
playCommand={(currentSession, command) => handlePlayCommand(currentSession, command)} playCommand={(currentSession, command) => handlePlayCommand(currentSession, command)}
@ -269,15 +272,10 @@ export default function Component({ service }) {
); );
} }
if (countData && playing.length === -1) if (playing.length === -1)
return ( return (
<> <>
<Container> {enableBlocks && <CountBlocks service={service} countData={countData} />}
<Block label="Movies" value={t("common.number", { value: countData.MovieCount })} />
<Block label="Series" value={t("common.number", { value: countData.SeriesCount })} />
<Block label="Episodes" value={t("common.number", { value: countData.EpisodeCount })} />
<Block label="Songs" value={t("common.number", { value: countData.SongCount })} />
</Container>
<div className="flex flex-col pb-1 mx-1"> <div className="flex flex-col pb-1 mx-1">
{playing.map((session) => ( {playing.map((session) => (
<SessionEntry <SessionEntry
@ -290,3 +288,10 @@ export default function Component({ service }) {
</> </>
); );
} }
if (enableBlocks) {
return (
<CountBlocks service={service} countData={countData} />
)
}
}