Packaging fixes, attempt #2

.gitignore

@@ -153,7 +153,7 @@ dmypy.json
 cython_debug/
 
 # static files are built
-backend/static
+backend/decky_loader/static
 
 # ignore settings.json
 # prevents leaking login details

backend/decky_loader/loader.py

@@ -8,7 +8,7 @@
 
 from aiohttp import web
 from os.path import exists
-from watchdog.events import RegexMatchingEventHandler, DirCreatedEvent, DirModifiedEvent, FileCreatedEvent, FileModifiedEvent
+from watchdog.events import RegexMatchingEventHandler, FileSystemEvent
 from watchdog.observers import Observer
 
 from typing import TYPE_CHECKING, List
@@ -37,7 +37,7 @@ def maybe_reload(self, src_path: str):
         if exists(path.join(self.plugin_path, plugin_dir, "plugin.json")):
             self.queue.put_nowait((path.join(self.plugin_path, plugin_dir, "main.py"), plugin_dir, True))
 
-    def on_created(self, event: DirCreatedEvent | FileCreatedEvent):
+    def on_created(self, event: FileSystemEvent):
         src_path = cast(str, event.src_path) #type: ignore # this is the correct type for this is in later versions of watchdog
         if "__pycache__" in src_path:
             return
@@ -51,7 +51,7 @@ def on_created(self, event: DirCreatedEvent | FileCreatedEvent):
         self.logger.debug(f"file created: {src_path}")
         self.maybe_reload(src_path)
 
-    def on_modified(self, event: DirModifiedEvent | FileModifiedEvent):
+    def on_modified(self, event: FileSystemEvent):
         src_path = cast(str, event.src_path) # type: ignore
         if "__pycache__" in src_path:
             return
@@ -106,12 +106,12 @@ async def enable_reload_wait(self):
                 self.watcher.disabled = False
 
     async def handle_frontend_assets(self, request: web.Request):
-        file = Path(__file__).parents[1].joinpath("static").joinpath(request.match_info["path"])
+        file = Path(__file__).parent.joinpath("static").joinpath(request.match_info["path"])
         return web.FileResponse(file, headers={"Cache-Control": "no-cache"})
 
     async def handle_frontend_locales(self, request: web.Request):
         req_lang = request.match_info["path"]
-        file = Path(__file__).parents[1].joinpath("locales").joinpath(req_lang)
+        file = Path(__file__).parent.joinpath("locales").joinpath(req_lang)
         if exists(file):
             return web.FileResponse(file, headers={"Cache-Control": "no-cache", "Content-Type": "application/json"})
         else:

backend/decky_loader/main.py

@@ -88,7 +88,7 @@ async def startup(_: Application):
 
         for route in list(self.web_app.router.routes()):
             self.cors.add(route) # pyright: ignore [reportUnknownMemberType]
-        self.web_app.add_routes([static("/static", path.join(path.dirname(__file__), '..', 'static'))])
+        self.web_app.add_routes([static("/static", path.join(path.dirname(__file__), 'static'))])
 
     def exception_handler(self, loop: AbstractEventLoop, context: Dict[str, str]):
         if context["message"] == "Unclosed connection":

backend/pyinstaller.spec

@@ -6,8 +6,8 @@ from PyInstaller.utils.hooks import copy_metadata
 a = Analysis(
     ['main.py'],
     datas=[
-        ('locales', 'locales'),
-        ('static', 'static'),
+        ('decky_loader/locales', 'decky_loader/locales'),
+        ('decky_loader/static', 'decky_loader/static'),
     ] + copy_metadata('decky_loader'),
     hiddenimports=['logging.handlers', 'sqlite3', 'decky_plugin', 'decky'],
 )

backend/pyproject.toml

@@ -8,21 +8,24 @@ packages = [
     {include = "decky_loader"},
     {include = "decky_loader/main.py"}
 ]
-include = ["decky_loader/static/*"]
+include = [
+  "decky_loader/locales/*",
+  "decky_loader/static/*"
+]
 
 [tool.poetry.dependencies]
 python = ">=3.10,<3.13"
 
 aiohttp = "^3.9.5"
 aiohttp-jinja2 = "^1.5.1"
 aiohttp-cors = "^0.7.0"
-watchdog = "^2.1.7"
+watchdog = "^4"
 certifi = "*"
-packaging = "^23.2"
+packaging = "^24"
 multidict = "^6.0.5"
 
 [tool.poetry.group.dev.dependencies]
-pyinstaller = "^5.13.0"
+pyinstaller = "^6.8.0"
 pyright = "^1.1.335"
 
 [tool.poetry.scripts]

frontend/i18next-parser.config.mjs

@@ -43,7 +43,7 @@ export default {
     // Namespace separator used in your translation keys
     // If you want to use plain english keys, separators such as `.` and `:` will conflict. You might want to set `keySeparator: false` and `namespaceSeparator: false`. That way, `t('Status: Loading...')` will not think that there are a namespace and three separator dots for instance.
 
-    output: '../backend/locales/$LOCALE.json',
+    output: '../backend/decky_loader/locales/$LOCALE.json',
     // Supports $LOCALE and $NAMESPACE injection
     // Supports JSON (.json) and YAML (.yml) file formats
     // Where to write the locale files relative to process.cwd()

frontend/rollup.config.js

@@ -14,7 +14,7 @@ const hiddenWarnings = ['THIS_IS_UNDEFINED', 'EVAL'];
 export default defineConfig({
   input: 'src/index.ts',
   plugins: [
-    del({ targets: '../backend/static/*', force: true }),
+    del({ targets: '../backend/decky_loader/static/*', force: true }),
     commonjs(),
     nodeResolve({
       browser: true,
@@ -38,7 +38,7 @@ export default defineConfig({
   ],
   preserveEntrySignatures: false,
   output: {
-    dir: '../backend/static',
+    dir: '../backend/decky_loader/static',
     format: 'esm',
     chunkFileNames: (chunkInfo) => {
       return 'chunk-[hash].js';