Merge pull request #112 from DeckThemes/dev

Merge Dev into Profile-Uploading

css_loader.py

@@ -3,6 +3,7 @@
 from css_theme import Theme, CSS_LOADER_VER
 from css_themepatch import ThemePatch
 from css_browserhook import remove_all, commit_all
+from css_remoteinstall import upload
 
 from asyncio import sleep
 from os import listdir, path, mkdir
@@ -171,6 +172,17 @@ async def generate_preset_theme_from_theme_names(self, name : str, themeNames :
         except Exception as e:
             return Result(False, str(e))  
 
+    async def upload_theme(self, name : str, base_url : str, bearer_token : str) -> Result:
+        theme = await self._get_theme(name)
+
+        if theme is None:
+            return Result(False, f"Could not find theme {name}")
+
+        try:
+            return await upload(theme, base_url, bearer_token)
+        except Exception as e:
+            return Result(False, str(e))
+
     async def _enable_theme(self, theme : Theme, set_deps : bool = True, set_deps_value : bool = True, ignore_dependencies : list = []) -> Result:
         if theme is None:
             return Result(False)

css_remoteinstall.py

@@ -1,6 +1,6 @@
-import asyncio, json, tempfile, os, aiohttp, zipfile
+import asyncio, json, tempfile, os, aiohttp, zipfile, shutil
 from css_utils import Result, Log, get_theme_path, store_or_file_config
-from css_theme import CSS_LOADER_VER
+from css_theme import CSS_LOADER_VER, Theme
 
 async def run(command : str) -> str:
     proc = await asyncio.create_subprocess_shell(command,        
@@ -64,4 +64,30 @@ async def install(id : str, base_url : str, local_themes : list) -> Result:
 
             await install(x["id"], base_url, local_themes)
 
-    return Result(True)
+    return Result(True)
+
+async def upload(theme : Theme, base_url : str, bearer_token : str) -> Result:
+    if not base_url.endswith("/"):
+        base_url = base_url + "/"
+
+    url = f"{base_url}blobs"
+
+    with tempfile.TemporaryDirectory() as tmp:
+        themePath = os.path.join(tmp, "theme.zip")
+        print(themePath[:-4])
+        print(theme.themePath)
+        shutil.make_archive(themePath[:-4], 'zip', theme.themePath)
+
+        with open(themePath, "rb") as file:
+            async with aiohttp.ClientSession(headers={"User-Agent": f"SDH-CSSLoader/{CSS_LOADER_VER}", "Authorization": f"Bearer {bearer_token}"}, connector=aiohttp.TCPConnector(verify_ssl=False)) as session:
+                try:
+                    mp = aiohttp.FormData()
+                    mp.add_field("file", file)
+                    async with session.post(url, data=mp) as resp:
+                        if resp.status != 200:
+                            raise Exception(f"Invalid status code {resp.status}")
+
+                        data = await resp.json()
+                        return Result(True, data)
+                except Exception as e:
+                    return Result(False, str(e))

main.py

@@ -144,6 +144,9 @@ async def get_last_load_errors(self):
         return {
             "fails": self.loader.last_load_errors
         }
+
+    async def upload_theme(self, name : str, base_url : str, bearer_token : str) -> dict:
+        return (await self.loader.upload_theme(name, base_url, bearer_token)).to_dict()
 
     async def _main(self):
         global Initialized

package.json

@@ -1,6 +1,6 @@
 {
   "name": "SDH-CssLoader",
-  "version": "2.0.5",
+  "version": "2.0.6",
   "description": "A css loader",
   "scripts": {
     "build": "shx rm -rf dist && rollup -c",

src/components/Modals/ThemeSettingsModal/ThemeSettingsModal.tsx

@@ -124,7 +124,7 @@ function ThemeSettingsModal({
           <>
             <Focusable className="CSSLoader_ThemeSettingsModal_Header">
               <div className="CSSLoader_ThemeSettingsModal_TitleContainer">
-                <span className="CSSLoader_ThemeSettingsModal_Title">{themeData.name}</span>
+                <span className="CSSLoader_ThemeSettingsModal_Title">{themeData.display_name}</span>
                 <span className="CSSLoader_ThemeSettingsModal_Subtitle">
                   {themeData.version} | {themeData.author}
                 </span>

src/deckyPatches/NavControllerFinder.tsx

@@ -1,3 +1,18 @@
 import { Module, findModuleChild } from "decky-frontend-lib";
 
-export const NavController = findModuleChild((m: Module) => m?.CFocusNavNode);
+export const NavController = findModuleChild((m: Module) => {
+  if (typeof m !== "object") return undefined;
+
+  // Pre Chromium-109
+  if (m?.CFocusNavNode) {
+    return m.CFocusNavNode;
+  }
+
+  for (let prop in m) {
+    if (m[prop]?.prototype?.FindNextFocusableChildInDirection) {
+      return m[prop];
+    }
+  }
+
+  return undefined;
+});