mirror of
https://github.com/streamyfin/streamyfin.git
synced 2026-05-13 10:26:32 +01:00
Compare commits
1 Commits
fix/maxEpi
...
renovate/c
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
91f9af5152 |
2
.github/workflows/crowdin.yml
vendored
2
.github/workflows/crowdin.yml
vendored
@@ -28,7 +28,7 @@ jobs:
|
|||||||
fetch-depth: 0
|
fetch-depth: 0
|
||||||
|
|
||||||
- name: 🌐 Sync Translations with Crowdin
|
- name: 🌐 Sync Translations with Crowdin
|
||||||
uses: crowdin/github-action@5587c43063e52090026857d386174d2599ad323b # v2.14.1
|
uses: crowdin/github-action@8868a33591d21088edfc398968173a3b98d51706 # v2.16.2
|
||||||
with:
|
with:
|
||||||
upload_sources: true
|
upload_sources: true
|
||||||
upload_translations: true
|
upload_translations: true
|
||||||
|
|||||||
@@ -204,10 +204,7 @@ export const OtherSettings: React.FC = () => {
|
|||||||
}
|
}
|
||||||
/>
|
/>
|
||||||
</ListItem>
|
</ListItem>
|
||||||
<ListItem
|
<ListItem title={t("home.settings.other.max_auto_play_episode_count")}>
|
||||||
title={t("home.settings.other.max_auto_play_episode_count")}
|
|
||||||
disabled={pluginSettings?.maxAutoPlayEpisodeCount?.locked}
|
|
||||||
>
|
|
||||||
<PlatformDropdown
|
<PlatformDropdown
|
||||||
groups={autoPlayEpisodeOptions}
|
groups={autoPlayEpisodeOptions}
|
||||||
trigger={
|
trigger={
|
||||||
|
|||||||
@@ -229,10 +229,7 @@ export const PlaybackControlsSettings: React.FC = () => {
|
|||||||
|
|
||||||
<ListItem
|
<ListItem
|
||||||
title={t("home.settings.other.max_auto_play_episode_count")}
|
title={t("home.settings.other.max_auto_play_episode_count")}
|
||||||
disabled={
|
disabled={!settings.autoPlayNextEpisode}
|
||||||
!settings.autoPlayNextEpisode ||
|
|
||||||
pluginSettings?.maxAutoPlayEpisodeCount?.locked
|
|
||||||
}
|
|
||||||
>
|
>
|
||||||
<PlatformDropdown
|
<PlatformDropdown
|
||||||
groups={autoPlayEpisodeOptions}
|
groups={autoPlayEpisodeOptions}
|
||||||
|
|||||||
@@ -6,7 +6,6 @@ import {
|
|||||||
type SortOrder,
|
type SortOrder,
|
||||||
SubtitlePlaybackMode,
|
SubtitlePlaybackMode,
|
||||||
} from "@jellyfin/sdk/lib/generated-client";
|
} from "@jellyfin/sdk/lib/generated-client";
|
||||||
import { t } from "i18next";
|
|
||||||
import { atom, useAtom, useAtomValue } from "jotai";
|
import { atom, useAtom, useAtomValue } from "jotai";
|
||||||
import { useCallback, useEffect, useMemo } from "react";
|
import { useCallback, useEffect, useMemo } from "react";
|
||||||
import { BITRATES, type Bitrate } from "@/components/BitrateSelector";
|
import { BITRATES, type Bitrate } from "@/components/BitrateSelector";
|
||||||
@@ -122,46 +121,6 @@ export interface MaxAutoPlayEpisodeCount {
|
|||||||
value: number;
|
value: number;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* The plugin may send object-typed settings as plain primitives.
|
|
||||||
* Resolve to the proper option object from the available choices.
|
|
||||||
*/
|
|
||||||
const normalizePluginValue = (
|
|
||||||
settingsKey: keyof Settings,
|
|
||||||
value: unknown,
|
|
||||||
): unknown => {
|
|
||||||
if (typeof value !== "object" || value === null) {
|
|
||||||
const defaultVal = defaultValues[settingsKey];
|
|
||||||
if (
|
|
||||||
typeof defaultVal === "object" &&
|
|
||||||
defaultVal !== null &&
|
|
||||||
"key" in defaultVal &&
|
|
||||||
"value" in defaultVal
|
|
||||||
) {
|
|
||||||
// defaultBitrate needs a lookup because its keys are human-readable
|
|
||||||
// (e.g. "8 Mb/s") that can't be derived from the raw value (e.g. 8000000).
|
|
||||||
// Other { key, value } settings like maxAutoPlayEpisodeCount work with
|
|
||||||
// the fallback because their keys are just String(value) (e.g. "5").
|
|
||||||
if (settingsKey === "defaultBitrate") {
|
|
||||||
const match = BITRATES.find(
|
|
||||||
(b) => b.key === value || b.value === value,
|
|
||||||
);
|
|
||||||
if (match) return match;
|
|
||||||
}
|
|
||||||
// maxAutoPlayEpisodeCount: 0 is invalid (breaks autoplay), clamp to -1
|
|
||||||
// -1 key must match the translated dropdown label so the UI shows "Disabled"
|
|
||||||
if (
|
|
||||||
settingsKey === "maxAutoPlayEpisodeCount" &&
|
|
||||||
(value === 0 || value === -1)
|
|
||||||
) {
|
|
||||||
return { key: t("home.settings.other.disabled"), value: -1 };
|
|
||||||
}
|
|
||||||
return { key: String(value), value };
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return value;
|
|
||||||
};
|
|
||||||
|
|
||||||
export type HomeSectionLatestResolver = {
|
export type HomeSectionLatestResolver = {
|
||||||
parentId?: string;
|
parentId?: string;
|
||||||
limit?: number;
|
limit?: number;
|
||||||
@@ -403,7 +362,7 @@ export const useSettings = () => {
|
|||||||
);
|
);
|
||||||
|
|
||||||
const refreshStreamyfinPluginSettings = useCallback(
|
const refreshStreamyfinPluginSettings = useCallback(
|
||||||
async (_forceOverride = false) => {
|
async (forceOverride = false) => {
|
||||||
if (!api) {
|
if (!api) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@@ -416,17 +375,20 @@ export const useSettings = () => {
|
|||||||
);
|
);
|
||||||
setPluginSettings(newPluginSettings);
|
setPluginSettings(newPluginSettings);
|
||||||
|
|
||||||
// Apply locked plugin values to settings (unlocked values are handled
|
// Apply plugin values to settings
|
||||||
// by the settings memo, which respects user customizations)
|
|
||||||
if (newPluginSettings && _settings) {
|
if (newPluginSettings && _settings) {
|
||||||
const updates: Partial<Settings> = {};
|
const updates: Partial<Settings> = {};
|
||||||
for (const [key, setting] of Object.entries(newPluginSettings)) {
|
for (const [key, setting] of Object.entries(newPluginSettings)) {
|
||||||
if (setting?.locked) {
|
if (setting && !setting.locked && setting.value !== undefined) {
|
||||||
const settingsKey = key as keyof Settings;
|
const settingsKey = key as keyof Settings;
|
||||||
(updates as any)[settingsKey] = normalizePluginValue(
|
// Apply if forceOverride is true, or if user hasn't explicitly set this value
|
||||||
settingsKey,
|
if (
|
||||||
setting.value,
|
forceOverride ||
|
||||||
);
|
_settings[settingsKey] === undefined ||
|
||||||
|
_settings[settingsKey] === ""
|
||||||
|
) {
|
||||||
|
(updates as any)[settingsKey] = setting.value;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -478,31 +440,26 @@ export const useSettings = () => {
|
|||||||
// If admin sets locked to false but provides a value,
|
// If admin sets locked to false but provides a value,
|
||||||
// use user settings first and fallback on admin setting if required.
|
// use user settings first and fallback on admin setting if required.
|
||||||
const settings: Settings = useMemo(() => {
|
const settings: Settings = useMemo(() => {
|
||||||
const _unlockedPluginDefaults: Partial<Settings> = {};
|
const unlockedPluginDefaults: Partial<Settings> = {};
|
||||||
const overrideSettings = Object.entries(pluginSettings ?? {}).reduce<
|
const overrideSettings = Object.entries(pluginSettings ?? {}).reduce<
|
||||||
Partial<Settings>
|
Partial<Settings>
|
||||||
>((acc, [key, setting]) => {
|
>((acc, [key, setting]) => {
|
||||||
if (setting) {
|
if (setting) {
|
||||||
let { value } = setting;
|
const { value, locked } = setting;
|
||||||
const { locked } = setting;
|
|
||||||
const settingsKey = key as keyof Settings;
|
const settingsKey = key as keyof Settings;
|
||||||
|
|
||||||
// Normalize object-typed settings from plugin (plain primitive → { key, value })
|
// Make sure we override default settings with plugin settings when they are not locked.
|
||||||
value = normalizePluginValue(settingsKey, value);
|
if (
|
||||||
|
!locked &&
|
||||||
// For unlocked settings: use plugin value unless user explicitly
|
value !== undefined &&
|
||||||
// customized (their saved value differs from the default)
|
_settings?.[settingsKey] !== value
|
||||||
const userVal = _settings?.[settingsKey];
|
) {
|
||||||
const defaultVal = defaultValues[settingsKey];
|
(unlockedPluginDefaults as any)[settingsKey] = value;
|
||||||
const userCustomized =
|
}
|
||||||
userVal !== undefined &&
|
|
||||||
JSON.stringify(userVal) !== JSON.stringify(defaultVal);
|
|
||||||
|
|
||||||
(acc as any)[settingsKey] = locked
|
(acc as any)[settingsKey] = locked
|
||||||
? value
|
? value
|
||||||
: userCustomized
|
: (_settings?.[settingsKey] ?? value);
|
||||||
? userVal
|
|
||||||
: value;
|
|
||||||
}
|
}
|
||||||
return acc;
|
return acc;
|
||||||
}, {});
|
}, {});
|
||||||
|
|||||||
Reference in New Issue
Block a user