diff --git a/main.py b/main.py index 3165fad..0f6e206 100644 --- a/main.py +++ b/main.py @@ -139,7 +139,7 @@ async def save_mappings(self, val: str) -> dict: util_save_mappings(val) return Result(True).to_dict() - async def get_webpack_mappigns(self) -> dict: + async def get_webpack_mappings(self) -> dict: return generate_webpack_id_name_list_from_local_file() async def exit(self): diff --git a/src/backend/services/backend-service.ts b/src/backend/services/backend-service.ts index 8330047..207d485 100644 --- a/src/backend/services/backend-service.ts +++ b/src/backend/services/backend-service.ts @@ -111,6 +111,9 @@ export class Backend { ) { return Backend.repository.fetch(url, request, mode); } + async getMappings() { + return Backend.repository.call<[], object>("get_webpack_mappings", []); + } toast(title: string, body?: string) { Backend.repository.toast(title, body); diff --git a/src/backend/state/theme-store.ts b/src/backend/state/theme-store.ts index 449607c..5b6c41e 100644 --- a/src/backend/state/theme-store.ts +++ b/src/backend/state/theme-store.ts @@ -127,7 +127,7 @@ export const createCSSLoaderStore = (backend: Backend) => async function getPatrons() { try { const data = await apiFetch( - `${apiUrl}/patrons`, + "/patrons", {}, { responseMode: "text", @@ -137,7 +137,7 @@ export const createCSSLoaderStore = (backend: Backend) => return data.split("\n"); } } catch (error) { - console.error(error); + console.error("CSSLoader - Error Fetching Patrons", error); } return []; } @@ -191,6 +191,8 @@ export const createCSSLoaderStore = (backend: Backend) => const themePath = await backend.fetchThemePath(); set({ themeRootPath: themePath }); + console.log("HELLO TEST", await backend.getMappings()); + const unpinnedThemesStr = await backend.storeRead("unpinnedThemes"); const unpinnedThemes: string[] = unpinnedThemesStr ? JSON.parse(unpinnedThemesStr) : []; const allThemeIds = themes.map((e) => e.id); @@ -230,7 +232,7 @@ export const createCSSLoaderStore = (backend: Backend) => const patrons = await getPatrons(); set({ patrons }); } catch (error) { - console.log("Error During Initialzation", error); + console.log("CSSLoader - Error During Initialzation", error); } }, deactivate: () => { @@ -264,7 +266,7 @@ export const createCSSLoaderStore = (backend: Backend) => await backend.reset(); await get().getThemes(); } catch (error) { - console.error("Error Reloading Themes", error); + console.error("CSSLoader - Error Reloading Themes", error); } }, logInWithShortToken: async (newToken?: string) => { @@ -356,7 +358,7 @@ export const createCSSLoaderStore = (backend: Backend) => selectedPreset: themes.find((e) => e.flags.includes(Flags.isPreset) && e.enabled), }); } catch (error) { - console.error("Error Fetching Themes", error); + console.error("CSSLoader - Error Fetching Themes", error); } }, changePreset: async (presetName: string) => { @@ -436,7 +438,7 @@ export const createCSSLoaderStore = (backend: Backend) => set({ nextUpdateCheckTime: new Date().valueOf() + 24 * 60 * 60 * 1000 }); } catch (err) { - console.log("Error Checking For Theme Updates", err); + console.log("CSSLoader - Error Checking For Theme Updates", err); } recursiveCheck(); }, 5 * 60 * 1000); @@ -542,7 +544,7 @@ export const createCSSLoaderStore = (backend: Backend) => await get().getThemes(); } } catch (error) { - console.error(error); + console.error("CSSLoader - Error Toggling Theme", error); } }, pinTheme: async (themeId: string) => { diff --git a/src/decky-patches/decky-patch-store.ts b/src/decky-patches/decky-patch-store.ts index 02b981b..5d1a4cc 100644 --- a/src/decky-patches/decky-patch-store.ts +++ b/src/decky-patches/decky-patch-store.ts @@ -26,7 +26,6 @@ const createDeckyPatchStore = (backend: Backend) => initializeStore: async () => { try { const shouldEnable = await backend.storeRead("enableNavPatch"); - return; if (shouldEnable) { const patch = enableNavPatch(); set({ navPatchInstance: patch }); diff --git a/src/decky-patches/unminify-mode/steam-tab-elements-finder.ts b/src/decky-patches/unminify-mode/steam-tab-elements-finder.ts index 70d1a10..28c7e48 100644 --- a/src/decky-patches/unminify-mode/steam-tab-elements-finder.ts +++ b/src/decky-patches/unminify-mode/steam-tab-elements-finder.ts @@ -3,18 +3,18 @@ import { getGamepadNavigationTrees } from "@decky/ui"; export function getElementFromNavID(navID: string) { const all = getGamepadNavigationTrees(); if (!all) return null; - const tree = all?.find((e: any) => e.m_ID == navID); + const tree = all?.find((e: any) => e.m_ID.includes(navID)); if (!tree) return null; return tree.Root.Element; } export function getSP() { - return getElementFromNavID("root_1_"); + return getElementFromNavID("GamepadUI"); } export function getQAM() { - return getElementFromNavID("QuickAccess-NA"); + return getElementFromNavID("QuickAccess"); } export function getMainMenu() { - return getElementFromNavID("MainNavMenuContainer"); + return getElementFromNavID("MainNavMenu"); } export function getRootElements() { return [getSP(), getQAM(), getMainMenu()].filter(Boolean); diff --git a/src/modules/expanded-view/context/ExpandedViewStore.tsx b/src/modules/expanded-view/context/ExpandedViewStore.tsx index d9bb68f..626073d 100644 --- a/src/modules/expanded-view/context/ExpandedViewStore.tsx +++ b/src/modules/expanded-view/context/ExpandedViewStore.tsx @@ -129,7 +129,7 @@ const expandedViewStore = createStore((set, get) => { }, }); } catch (error) { - console.error(error); + console.error("CSSLoader - Error Starring Theme", error); const { toast } = getCSSLoaderState(); toast("Error starring theme!"); } diff --git a/src/modules/theme-store/pages/ThemeStoreRouter.tsx b/src/modules/theme-store/pages/ThemeStoreRouter.tsx index 9237fcf..3965b6e 100644 --- a/src/modules/theme-store/pages/ThemeStoreRouter.tsx +++ b/src/modules/theme-store/pages/ThemeStoreRouter.tsx @@ -92,7 +92,6 @@ export function ThemeStoreRouter() { { - console.log("Setting tab", tab); setCurrentTab(tab); }} tabs={tabs}