Merge pull request #116 from p-stream/Enable-source-ordering

Add toggle for custom source order

src/assets/locales/en.json

@@ -618,7 +618,8 @@
       "autoplayLabel": "Autoplay",
       "sourceOrder": "Reordering sources",
       "sourceOrderDescription": "Drag and drop to reorder sources. This will determine the order in which sources are checked for the media you are trying to watch. If a source is greyed out, it means it is not available on your device.",
-      "title": "Preferences"
+      "title": "Preferences",
+      "sourceOrderEnableLabel": "Custom source order"
     },
     "reset": "Reset",
     "save": "Save",

src/hooks/useProviderScrape.tsx

@@ -158,6 +158,7 @@ export function useScrape() {
   } = useBaseScrape();
 
   const preferredSourceOrder = usePreferencesStore((s) => s.sourceOrder);
+  const enableSourceOrder = usePreferencesStore((s) => s.enableSourceOrder);
 
   const startScraping = useCallback(
     async (media: ScrapeMedia) => {
@@ -184,7 +185,8 @@ export function useScrape() {
       const providers = getProviders();
       const output = await providers.runAll({
         media,
-        sourceOrder: preferredSourceOrder,
+        // Only pass sourceOrder if enableSourceOrder is true
+        sourceOrder: enableSourceOrder ? preferredSourceOrder : undefined,
         events: {
           init: initEvent,
           start: startEvent,
@@ -204,6 +206,7 @@ export function useScrape() {
       getResult,
       startScrape,
       preferredSourceOrder,
+      enableSourceOrder,
     ],
   );
 

src/hooks/useSettingsState.ts

@@ -53,6 +53,7 @@ export function useSettingsState(
   enableThumbnails: boolean,
   enableAutoplay: boolean,
   sourceOrder: string[],
+  enableSourceOrder: boolean,
 ) {
   const [proxyUrlsState, setProxyUrls, resetProxyUrls, proxyUrlsChanged] =
     useDerived(proxyUrls);
@@ -98,6 +99,12 @@ export function useSettingsState(
     resetSourceOrder,
     sourceOrderChanged,
   ] = useDerived(sourceOrder);
+  const [
+    enableSourceOrderState,
+    setEnableSourceOrderState,
+    resetEnableSourceOrder,
+    enableSourceOrderChanged,
+  ] = useDerived(enableSourceOrder);
 
   function reset() {
     resetTheme();
@@ -111,6 +118,7 @@ export function useSettingsState(
     resetEnableThumbnails();
     resetEnableAutoplay();
     resetSourceOrder();
+    resetEnableSourceOrder();
   }
 
   const changed =
@@ -123,7 +131,8 @@ export function useSettingsState(
     profileChanged ||
     enableThumbnailsChanged ||
     enableAutoplayChanged ||
-    sourceOrderChanged;
+    sourceOrderChanged ||
+    enableSourceOrderChanged;
 
   return {
     reset,
@@ -178,5 +187,10 @@ export function useSettingsState(
       set: setSourceOrderState,
       changed: sourceOrderChanged,
     },
+    enableSourceOrder: {
+      state: enableSourceOrderState,
+      set: setEnableSourceOrderState,
+      changed: enableSourceOrderChanged,
+    },
   };
 }

src/pages/Settings.tsx

@@ -130,6 +130,11 @@ export function SettingsPage() {
   const sourceOrder = usePreferencesStore((s) => s.sourceOrder);
   const setSourceOrder = usePreferencesStore((s) => s.setSourceOrder);
 
+  const enableSourceOrder = usePreferencesStore((s) => s.enableSourceOrder);
+  const setEnableSourceOrder = usePreferencesStore(
+    (s) => s.setEnableSourceOrder,
+  );
+
   const account = useAuthStore((s) => s.account);
   const updateProfile = useAuthStore((s) => s.setAccountProfile);
   const updateDeviceName = useAuthStore((s) => s.updateDeviceName);
@@ -154,6 +159,7 @@ export function SettingsPage() {
     enableThumbnails,
     enableAutoplay,
     sourceOrder,
+    enableSourceOrder,
   );
 
   const availableSources = useMemo(() => {
@@ -228,6 +234,7 @@ export function SettingsPage() {
     setTheme(state.theme.state);
     setSubStyling(state.subtitleStyling.state);
     setProxySet(state.proxyUrls.state?.filter((v) => v !== "") ?? null);
+    setEnableSourceOrder(state.enableSourceOrder.state);
 
     if (state.profile.state) {
       updateProfile(state.profile.state);
@@ -259,6 +266,7 @@ export function SettingsPage() {
     updateProfile,
     logout,
     setBackendUrl,
+    setEnableSourceOrder,
   ]);
   return (
     <SubPageLayout>
@@ -303,6 +311,8 @@ export function SettingsPage() {
             setEnableAutoplay={state.enableAutoplay.set}
             sourceOrder={availableSources}
             setSourceOrder={state.sourceOrder.set}
+            enableSourceOrder={state.enableSourceOrder.state}
+            setEnableSourceOrder={state.enableSourceOrder.set}
           />
         </div>
         <div id="settings-appearance" className="mt-48">

src/pages/parts/settings/PreferencesPart.tsx

@@ -22,6 +22,8 @@ export function PreferencesPart(props: {
   setEnableAutoplay: (v: boolean) => void;
   sourceOrder: string[];
   setSourceOrder: (v: string[]) => void;
+  enableSourceOrder: boolean;
+  setEnableSourceOrder: (v: boolean) => void;
 }) {
   const { t } = useTranslation();
   const sorted = sortLangCodes(appLanguageOptions.map((item) => item.code));
@@ -119,20 +121,33 @@ export function PreferencesPart(props: {
         <p className="max-w-[25rem] font-medium">
           {t("settings.preferences.sourceOrderDescription")}
         </p>
-
-        <SortableList
-          items={sourceItems}
-          setItems={(items) =>
-            props.setSourceOrder(items.map((item) => item.id))
-          }
-        />
-        <Button
-          className="max-w-[25rem]"
-          theme="secondary"
-          onClick={() => props.setSourceOrder(allSources.map((s) => s.id))}
+        <div
+          onClick={() => props.setEnableSourceOrder(!props.enableSourceOrder)}
+          className="bg-dropdown-background hover:bg-dropdown-hoverBackground select-none my-4 cursor-pointer space-x-3 flex items-center max-w-[25rem] py-3 px-4 rounded-lg"
         >
-          {t("settings.reset")}
-        </Button>
+          <Toggle enabled={props.enableSourceOrder} />
+          <p className="flex-1 text-white font-bold">
+            {t("settings.preferences.sourceOrderEnableLabel")}
+          </p>
+        </div>
+
+        {props.enableSourceOrder && (
+          <div className="w-full flex flex-col gap-4">
+            <SortableList
+              items={sourceItems}
+              setItems={(items) =>
+                props.setSourceOrder(items.map((item) => item.id))
+              }
+            />
+            <Button
+              className="max-w-[25rem]"
+              theme="secondary"
+              onClick={() => props.setSourceOrder(allSources.map((s) => s.id))}
+            >
+              {t("settings.reset")}
+            </Button>
+          </div>
+        )}
       </div>
     </div>
   );

src/stores/preferences/index.tsx

@@ -6,10 +6,12 @@ export interface PreferencesStore {
   enableThumbnails: boolean;
   enableAutoplay: boolean;
   sourceOrder: string[];
+  enableSourceOrder: boolean;
 
   setEnableThumbnails(v: boolean): void;
   setEnableAutoplay(v: boolean): void;
   setSourceOrder(v: string[]): void;
+  setEnableSourceOrder(v: boolean): void;
 }
 
 export const usePreferencesStore = create(
@@ -18,6 +20,7 @@ export const usePreferencesStore = create(
       enableThumbnails: false,
       enableAutoplay: true,
       sourceOrder: [],
+      enableSourceOrder: false,
       setEnableThumbnails(v) {
         set((s) => {
           s.enableThumbnails = v;
@@ -33,6 +36,11 @@ export const usePreferencesStore = create(
           s.sourceOrder = v;
         });
       },
+      setEnableSourceOrder(v) {
+        set((s) => {
+          s.enableSourceOrder = v;
+        });
+      },
     })),
     {
       name: "__MW::preferences",