Merge branch 'develop' into fix/progress-bar-items

components/common/ProgressBar.tsx

@@ -37,11 +37,12 @@ export const ProgressBar: React.FC<ProgressBarProps> = ({ item }) => {
         }
       />
       <View
-        style={{
-          width: `${progress}%`,
-          backgroundColor: Platform.isTV ? "#ffffff" : undefined,
-        }}
-        className={`absolute bottom-0 left-0 h-1 w-full ${Platform.isTV ? "" : "bg-purple-600"}`}
+        style={
+          Platform.isTV
+            ? { width: `${progress}%`, backgroundColor: "#ffffff" }
+            : { width: `${progress}%` }
+        }
+        className={`absolute bottom-0 left-0 h-1 ${Platform.isTV ? "" : "bg-purple-600"}`}
       />
     </>
   );

components/settings/OtherSettings.tsx

@@ -196,10 +196,7 @@ export const OtherSettings: React.FC = () => {
             }
           />
         </ListItem>
-        <ListItem
-          title={t("home.settings.other.max_auto_play_episode_count")}
-          disabled={pluginSettings?.maxAutoPlayEpisodeCount?.locked}
-        >
+        <ListItem title={t("home.settings.other.max_auto_play_episode_count")}>
           <PlatformDropdown
             groups={autoPlayEpisodeOptions}
             trigger={

components/settings/PlaybackControlsSettings.tsx

@@ -229,10 +229,7 @@ export const PlaybackControlsSettings: React.FC = () => {
 
         <ListItem
           title={t("home.settings.other.max_auto_play_episode_count")}
-          disabled={
-            !settings.autoPlayNextEpisode ||
-            pluginSettings?.maxAutoPlayEpisodeCount?.locked
-          }
+          disabled={!settings.autoPlayNextEpisode}
         >
           <PlatformDropdown
             groups={autoPlayEpisodeOptions}

utils/atoms/settings.ts

@@ -6,7 +6,6 @@ import {
   type SortOrder,
   SubtitlePlaybackMode,
 } from "@jellyfin/sdk/lib/generated-client";
-import { t } from "i18next";
 import { atom, useAtom, useAtomValue } from "jotai";
 import { useCallback, useEffect, useMemo } from "react";
 import { BITRATES, type Bitrate } from "@/components/BitrateSelector";
@@ -122,46 +121,6 @@ export interface MaxAutoPlayEpisodeCount {
   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 = {
   parentId?: string;
   limit?: number;
@@ -469,7 +428,7 @@ export const useSettings = () => {
   );
 
   const refreshStreamyfinPluginSettings = useCallback(
-    async (_forceOverride = false) => {
+    async (forceOverride = false) => {
       if (!api) {
         return;
       }
@@ -482,18 +441,21 @@ export const useSettings = () => {
       );
       setPluginSettings(newPluginSettings);
 
-      // Apply locked plugin values to settings (unlocked values are handled
-      // by the settings memo, which respects user customizations)
+      // Apply plugin values to settings
       if (newPluginSettings && _settings) {
         const updates: Partial<Settings> = {};
         for (const [key, setting] of Object.entries(newPluginSettings)) {
-          if (setting?.locked) {
+          if (setting && !setting.locked && setting.value !== undefined) {
             const settingsKey = key as keyof Settings;
-            // Normalize and apply locked values unconditionally
-            (updates as any)[settingsKey] = normalizePluginValue(
+            const effectiveValue = getEffectiveSettingValue(
+              _settings,
               settingsKey,
-              setting.value,
             );
+            // Apply if forceOverride is true, or if neither persisted settings
+            // nor app defaults provide a meaningful value.
+            if (forceOverride || !hasMeaningfulSettingValue(effectiveValue)) {
+              (updates as any)[settingsKey] = setting.value;
+            }
           }
         }
 
@@ -550,13 +512,8 @@ export const useSettings = () => {
       Partial<Settings>
     >((acc, [key, setting]) => {
       if (setting) {
-        let { value } = setting;
-        const { locked } = setting;
+        const { value, locked } = setting;
         const settingsKey = key as keyof Settings;
-
-        // Normalize object-typed settings from plugin (plain primitive → { key, value })
-        value = normalizePluginValue(settingsKey, value);
-
         const effectiveValue = getEffectiveSettingValue(_settings, settingsKey);
 
         (acc as any)[settingsKey] = locked