revert

Author: mrgogo7

src/constants/defaults.ts

@@ -37,6 +37,15 @@ export interface AppSettings {
    * - Binary data is NEVER stored here.
    */
   localFileName?: string;
+  /**
+   * Local media ID used for IndexedDB lookups.
+   *
+   * - Typically this will be set to the presetId so that each preset
+   *   owns at most one local media record.
+   * - This value is NOT exported into .nzxt-esc-preset files; it is
+   *   used only at runtime and in local storage.
+   */
+  localMediaId?: string;
 }
 
 /**

src/hooks/useConfig.ts

@@ -62,22 +62,7 @@ export function useConfig() {
     const merged = { ...settings, ...newSettings };
     setSettingsState(merged);
 
-    // Background settings are preset-specific; do not persist
-    const {
-      scale,
-      x,
-      y,
-      fit,
-      align,
-      loop,
-      autoplay,
-      mute,
-      resolution,
-      backgroundColor,
-      ...configWithoutBackgroundFields
-    } = merged;
-    
-    const configJson = JSON.stringify(configWithoutBackgroundFields);
+    const configJson = JSON.stringify(merged);
     localStorage.setItem(STORAGE_KEYS.CONFIG, configJson);
     localStorage.setItem(STORAGE_KEYS.CONFIG_COMPAT, configJson);
 

src/hooks/useLocalMedia.ts

@@ -22,7 +22,7 @@ interface UseLocalMediaParams {
  *
  * Responsibilities:
  * - Only active when settings.sourceType === 'local'.
- * - Reads blob from IndexedDB using activePresetId as the key.
+ * - Reads blob from IndexedDB using settings.localMediaId (or activePresetId as fallback).
  * - Creates and manages a blob URL, revoking old URLs to avoid leaks.
  * - Protects against race conditions when source or preset changes rapidly.
  *
@@ -55,7 +55,9 @@ export function useLocalMedia({ settings, activePresetId }: UseLocalMediaParams)
       return;
     }
 
-    if (!activePresetId) {
+    const mediaId = settings.localMediaId || activePresetId;
+
+    if (!mediaId) {
       // Local mode but we don't have an identifier yet – treat as missing
       setBlobUrl(null);
       setIsLoading(false);
@@ -76,7 +78,7 @@ export function useLocalMedia({ settings, activePresetId }: UseLocalMediaParams)
 
     (async () => {
       try {
-        const record = await getLocalMedia(activePresetId);
+        const record = await getLocalMedia(mediaId);
 
         // Ignore if this request is stale
         if (cancelled || currentRequestId !== requestIdRef.current) return;
@@ -128,11 +130,15 @@ export function useLocalMedia({ settings, activePresetId }: UseLocalMediaParams)
     return () => {
       cancelled = true;
     };
+<<<<<<< HEAD
 <<<<<<< HEAD
   }, [settings.sourceType, settings.localFileName, activePresetId]);
 =======
   }, [settings.sourceType, settings.localMediaId, activePresetId]);
 >>>>>>> parent of 2b04aa5 (Repeated Local Media Select Fix)
+=======
+  }, [settings.sourceType, settings.localMediaId, settings.localFileName, activePresetId]);
+>>>>>>> parent of bd81320 (Preset Problems Fix (1))
 
   // Cleanup on unmount
   useEffect(() => {

src/hooks/useSettingsSync.ts

@@ -83,34 +83,16 @@ export function useSettingsSync(
     // Don't save on initial load or before user interaction
     if (!hasLoadedRef.current || !hasInteractedRef.current) return;
 
-    // Skip save if autosave is disabled (during preset apply)
-    if (typeof window !== 'undefined' && window.__disableAutosave) return;
-
     // Throttle: Only save if 100ms has passed since last save
     const now = Date.now();
     if (now - lastSync.current < 100) return;
     lastSync.current = now;
 
-    // Background settings are preset-specific; do not persist
-    const {
-      scale,
-      x,
-      y,
-      fit,
-      align,
-      loop,
-      autoplay,
-      mute,
-      resolution,
-      backgroundColor,
-      ...settingsWithoutBackgroundFields
-    } = settings;
-
     // Save settings with URL for backward compatibility
     // Note: URL is also stored separately in storage.ts (media_url key)
     // But we include it here for legacy config format compatibility
     const save: AppSettings & { url?: string } = {
-      ...settingsWithoutBackgroundFields,
+      ...settings,
       url: mediaUrl || undefined, // Include URL in config for backward compatibility
     };
 

src/ui/Config.tsx

@@ -345,7 +345,7 @@ export default function Config() {
       // Local mode but user typed a URL → validate and switch to remote mode
       if (isValidRemoteMediaUrl(trimmedUrl)) {
         // Delete IndexedDB local media record
-        const presetId = activePresetId || getActivePresetId();
+        const presetId = settings.localMediaId || activePresetId || getActivePresetId();
         if (presetId) {
           deleteLocalMedia(presetId).catch(() => {
             // Silently handle deletion errors
@@ -357,6 +357,7 @@ export default function Config() {
           ...settings,
           sourceType: 'remote',
           localFileName: undefined,
+          localMediaId: undefined,
         });
 
         // Continue with remote URL processing below (will set mediaUrl and transform settings)
@@ -384,6 +385,7 @@ export default function Config() {
         ...settings,
         sourceType: 'remote',
         localFileName: undefined,
+        localMediaId: undefined,
         scale: 1,
         x: 0,
         y: 0,
@@ -423,6 +425,7 @@ export default function Config() {
             ...settings,
             sourceType: 'remote',
             localFileName: undefined,
+            localMediaId: undefined,
             scale: 1,
             x: 0,
             y: 0,
@@ -454,6 +457,7 @@ export default function Config() {
         ...settings,
         sourceType: 'remote',
         localFileName: undefined,
+        localMediaId: undefined,
         scale: 1,
         x: 0,
         y: 0,
@@ -466,7 +470,7 @@ export default function Config() {
   const handleClear = () => {
     // Local mode: delete local media record and reset to remote/empty
     if (settings.sourceType === 'local') {
-      const presetId = activePresetId || getActivePresetId();
+      const presetId = settings.localMediaId || activePresetId || getActivePresetId();
       if (presetId) {
         // Fire and forget deletion; errors will surface via local media hook if needed
         deleteLocalMedia(presetId).catch(() => {
@@ -478,6 +482,7 @@ export default function Config() {
         ...settings,
         sourceType: 'remote',
         localFileName: undefined,
+        localMediaId: undefined,
       });
       setMediaUrl('');
       setUrlInput('');
@@ -538,6 +543,7 @@ export default function Config() {
       ...settings,
       sourceType: 'local',
       localFileName: file.name,
+      localMediaId: presetId,
     });
     setMediaUrl('');
     // Show file name in input for user visibility (read-only indicator) with i18n

src/ui/components/PresetManager/PresetManager.css

@@ -421,7 +421,7 @@
 }
 
 .preset-modal-button {
-  padding: 6px 16px;
+  padding: 8px 16px;
   border-radius: 8px;
   border: 1px solid;
   cursor: pointer;

src/ui/styles/ConfigPreview.css

@@ -118,11 +118,11 @@
   align-items: center;
 }
 .url-input {
-  width: 100%;
+  width: 70%;
   background: #2c2c2c;
   border: 1px solid #3a3a3a;
   color: #f2f2f2;
-  padding: 7px 18px 8px 10px;
+  padding: 5px 18px 5px 10px;
   border-radius: 6px;
 }
 .url-input:hover {

src/utils/settings.ts

@@ -8,30 +8,12 @@ import { DEFAULT_OVERLAY } from '../types/overlay';
  * @returns Complete settings object with defaults applied
  */
 export function mergeSettings(saved: any): AppSettings {
-  // Safely ignore localMediaId if present in saved settings (legacy field, no longer used)
-  const { localMediaId, ...savedWithoutLocalMediaId } = saved || {};
-  
-  // Background settings are preset-specific; ignore them from localStorage merge
-  const {
-    scale,
-    x,
-    y,
-    fit,
-    align,
-    loop,
-    autoplay,
-    mute,
-    resolution,
-    backgroundColor,
-    ...savedWithoutBackgroundFields
-  } = savedWithoutLocalMediaId || {};
-  
   return {
     ...DEFAULT_SETTINGS,
-    ...savedWithoutBackgroundFields,
+    ...saved,
     overlay: {
       ...DEFAULT_OVERLAY,
-      ...(savedWithoutBackgroundFields?.overlay || {}),
+      ...(saved?.overlay || {}),
     },
   };
 }