Merge pull request #42 from EMERALD0874/dev

add window object for external control, as well as user vars

audio_remoteinstall.py

@@ -1,6 +1,6 @@
 import asyncio, json, tempfile, os
 from audio_utils import Result, Log
-from audio_utils import AUDIO_LOADER_VERSION
+from audio_utils import AUDIO_LOADER_VERSION, DECKY_HOME
 import aiohttp
 
 async def run(command : str) -> str:
@@ -45,7 +45,7 @@ async def install(id : str, base_url : str) -> Result:
 
     Log(f"Unzipping {themeZipPath}")
     try:
-        await run(f"unzip -o \"{themeZipPath}\" -d \"/home/deck/homebrew/sounds\"")
+        await run(f"unzip -o \"{themeZipPath}\" -d \"{DECKY_HOME}/sounds\"")
     except Exception as e:
         return Result(False, str(e))
 

audio_utils.py

@@ -3,6 +3,8 @@
 
 Logger = getLogger("AUDIO_LOADER")
 AUDIO_LOADER_VERSION = 2
+DECKY_HOME = os.environ["DECKY_HOME"] # /home/user/homebrew
+DECKY_USER_HOME = os.environ["DECKY_USER_HOME"] # /home/user
 
 def Log(text : str):
     Logger.info(f"[AUDIO_LOADER] {text}")
@@ -23,7 +25,7 @@ def to_dict(self):
         return {"success": self.success, "message": self.message}
 
 def store_path() -> str:
-    return os.path.join("/home/deck/homebrew/sounds", "STORE")
+    return os.path.join(DECKY_HOME, "sounds", "STORE")
 
 def store_reads() -> dict:
     path = store_path()

main.py

@@ -5,7 +5,7 @@
 
 sys.path.append(os.path.dirname(__file__))
 
-from audio_utils import store_read as util_store_read, store_write as util_store_write, AUDIO_LOADER_VERSION
+from audio_utils import store_read as util_store_read, store_write as util_store_write, AUDIO_LOADER_VERSION, DECKY_HOME, DECKY_USER_HOME
 from audio_remoteinstall import install
 
 starter_config_data = {
@@ -111,7 +111,7 @@ async def download_theme_from_url(self, id : str, url : str) -> dict:
         return (await install(id, url)).to_dict()
 
     async def get_config(self) -> object:
-        configPath = "/home/deck/homebrew/sounds/config.json"
+        configPath = f"{DECKY_HOME}/sounds/config.json"
 
         Log("Audio Loader - Fetching config file at {}".format(configPath))
         if (os.path.exists(configPath)):
@@ -122,7 +122,7 @@ async def get_config(self) -> object:
                 return data
 
     async def set_config(self, configObj: object):
-        configPath = "/home/deck/homebrew/sounds/config.json"
+        configPath = f"{DECKY_HOME}/sounds/config.json"
 
         Log("Audio Loader - Setting config file at {}".format(configPath))
         if (os.path.exists(configPath)):
@@ -189,10 +189,10 @@ async def store_write(self, key : str, val : str) -> dict:
         return Result(True).to_dict()
 
     async def _load(self):
-        packsPath = "/home/deck/homebrew/sounds"
-        symlinkPath = "/home/deck/.local/share/Steam/steamui/sounds_custom"
-
-        configPath = "/home/deck/homebrew/sounds/config.json"
+        packsPath = f"{DECKY_HOME}/sounds"
+        symlinkPath = f"{DECKY_USER_HOME}/.local/share/Steam/steamui/sounds_custom"
+        
+        configPath = f"{DECKY_HOME}/sounds/config.json"
 
         Log("Audio Loader - Finding sound packs...")
         self.soundPacks = []

package.json

@@ -40,7 +40,7 @@
   },
   "dependencies": {
     "@types/lodash": "^4.14.191",
-    "decky-frontend-lib": "^3.19.2",
+    "decky-frontend-lib": "^3.21.0",
     "lodash": "^4.17.21",
     "react-icons": "^4.4.0"
   },

rollup.config.js

@@ -26,12 +26,17 @@ export default defineConfig({
     styles(),
   ],
   context: "window",
-  external: ["react", "react-dom"],
+  external: [
+    "react",
+    "react-dom",
+    // "decky-frontend-lib"
+  ],
   output: {
     file: "dist/index.js",
     globals: {
       react: "SP_REACT",
       "react-dom": "SP_REACTDOM",
+      // "decky-frontend-lib": "DFL",
     },
     format: "iife",
     exports: "default",

src/components/PackDisplayCard.tsx

@@ -122,6 +122,7 @@ export const PackDisplayCard: FC<{
                 backgroundImage: imageURLCreator(),
                 backgroundColor: "#21323d",
                 position: "absolute",
+                backgroundPosition: "center",
                 top: "10%",
                 left: "0",
                 width: "80%",

src/index.tsx

@@ -75,6 +75,17 @@ const Content: VFC<{ serverAPI: ServerAPI }> = ({}) => {
       newMenuMusic.play();
       newMenuMusic.loop = true;
       newMenuMusic.volume = musicVolume;
+      const setVolume = (value: number) => {
+        newMenuMusic.volume = value;
+      };
+      // Update menuMusic in globalState after every change so that it reflects the changes the next time it checks
+      // @ts-ignore
+      window.AUDIOLOADER_MENUMUSIC = {
+        play: newMenuMusic.play.bind(newMenuMusic),
+        pause: newMenuMusic.pause.bind(newMenuMusic),
+        origVolume: newMenuMusic.volume,
+        setVolume: setVolume.bind(this),
+      };
       setGlobalState("menuMusic", newMenuMusic);
     }
   }
@@ -214,7 +225,9 @@ const Content: VFC<{ serverAPI: ServerAPI }> = ({}) => {
             step={0.01}
             onChange={(value) => {
               setGlobalState("musicVolume", value);
-              menuMusic.volume = value;
+              menuMusic.origVolume = value;
+              // @ts-ignore
+              window.AUDIOLOADER_MENUMUSIC.volume = value;
               const configObj = {
                 selected_pack: activeSound,
                 selected_music: selectedMusic,
@@ -423,6 +436,16 @@ export default definePlugin((serverApi: ServerAPI) => {
         menuMusic.play();
         menuMusic.loop = true;
         menuMusic.volume = configMusicVolume;
+        const setVolume = (value: number) => {
+          menuMusic.volume = value;
+        };
+        // @ts-ignore
+        window.AUDIOLOADER_MENUMUSIC = {
+          play: menuMusic.play.bind(menuMusic),
+          pause: menuMusic.pause.bind(menuMusic),
+          origVolume: menuMusic.volume,
+          setVolume: setVolume.bind(this),
+        };
         console.log("play and loop ran", menuMusic);
         setGlobalState("menuMusic", menuMusic);
       }
@@ -484,7 +507,17 @@ export default definePlugin((serverApi: ServerAPI) => {
               newMenuMusic.play();
               newMenuMusic.loop = true;
               newMenuMusic.volume = musicVolume;
+              const setVolume = (value: number) => {
+                newMenuMusic.volume = value;
+              };
               // Update menuMusic in globalState after every change so that it reflects the changes the next time it checks
+              // @ts-ignore
+              window.AUDIOLOADER_MENUMUSIC = {
+                play: newMenuMusic.play.bind(newMenuMusic),
+                pause: newMenuMusic.pause.bind(newMenuMusic),
+                origVolume: newMenuMusic.volume,
+                setVolume: setVolume.bind(this),
+              };
               setGlobalState("menuMusic", newMenuMusic);
             }
           }

src/pack-manager/SettingsPage.tsx

@@ -129,7 +129,7 @@ export const SettingsPage: VFC = () => {
               <span>
                 See the DeckThemes Discord server for support.
                 <br />
-                discord.gg/HsU72Kfnpf
+                deckthemes.com/discord
               </span>
             </div>
             <div>
@@ -143,7 +143,7 @@ export const SettingsPage: VFC = () => {
                 Create and Submit Your Own Packs
               </h2>
               <span>
-                Instructions for theme creation/submission are available
+                Instructions for theme creation/submission are available on
                 DeckThemes' docs website.
                 <br />
                 docs.deckthemes.com