fix paths

SteamDeckHomebrew · Sep 30, 2023 · ade7cb7 · ade7cb7
1 parent e8cbeb1
commit ade7cb7
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 8 deletions.
diff --git a/.github/workflows/build-win.yml b/.github/workflows/build-win.yml
@@ -44,10 +44,10 @@ jobs:
       run: pnpm run build
 
     - name: Build Python Backend 🛠️
-      run: pyinstaller --noconfirm --onefile --name "PluginLoader" --add-data "./backend/static;/backend/static" --add-data "./backend/locales;/backend/locales" --add-data "./backend/src/legacy;/backend/src/legacy" --add-data "./plugin;/plugin" --hidden-import=sqlite3 ./backend/main.py
+      run: pyinstaller --noconfirm --onefile --name "PluginLoader" --add-data "./backend/static;/static" --add-data "./backend/locales;/locales" --add-data "./backend/src/legacy;/src/legacy" --add-data "./plugin;/plugin" --hidden-import=sqlite3 ./backend/main.py
 
     - name: Build Python Backend (noconsole) 🛠️
-      run: pyinstaller --noconfirm --noconsole --onefile --name "PluginLoader_noconsole" --add-data "./backend/static;/backend/static" --add-data "./backend/locales;/backend/locales" --add-data "./backend/src/legacy;/backend/src/legacy" --add-data "./plugin;/plugin" --hidden-import=sqlite3 ./backend/main.py
+      run: pyinstaller --noconfirm --noconsole --onefile --name "PluginLoader_noconsole" --add-data "./backend/static;/static" --add-data "./backend/locales;/locales" --add-data "./backend/src/legacy;/src/legacy" --add-data "./plugin;/plugin" --hidden-import=sqlite3 ./backend/main.py
 
     - name: Upload package artifact ⬆️
       uses: actions/upload-artifact@v3

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -87,7 +87,7 @@ jobs:
       run: pnpm run build
 
     - name: Build Python Backend 🛠️
-      run: pyinstaller --noconfirm --onefile --name "PluginLoader" --add-data ./backend/static:/backend/static --add-data ./backend/locales:/backend/locales --add-data ./backend/src/legacy:/backend/src/legacy --add-data ./plugin:/plugin --hidden-import=sqlite3 ./backend/main.py
+      run: pyinstaller --noconfirm --onefile --name "PluginLoader" --add-data ./backend/static:/static --add-data ./backend/locales:/locales --add-data ./backend/src/legacy:/src/legacy --add-data ./plugin:/plugin --hidden-import=sqlite3 ./backend/main.py
 
     - name: Upload package artifact ⬆️
       if: ${{ !env.ACT }}

diff --git a/backend/src/loader.py b/backend/src/loader.py
@@ -107,13 +107,13 @@ async def enable_reload_wait(self):
                 self.watcher.disabled = False
 
     async def handle_frontend_assets(self, request: web.Request):
-        file = path.join(path.dirname(__file__), "static", request.match_info["path"])
+        file = path.join(path.dirname(__file__), "..", "static", 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.join(path.dirname(__file__), "locales", req_lang)
+        file = path.join(path.dirname(__file__), "..", "locales", req_lang)
         if exists(file):
             return web.FileResponse(file, headers={"Cache-Control": "no-cache", "Content-Type": "application/json"})
         else:

diff --git a/backend/src/main.py b/backend/src/main.py
@@ -86,7 +86,7 @@ async def startup(_: Application):
 
         for route in list(self.web_app.router.routes()):
             self.cors.add(route) # type: ignore
-        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'))])
         self.web_app.add_routes([static("/legacy", path.join(path.dirname(__file__), 'legacy'))])
 
     def exception_handler(self, loop: AbstractEventLoop, context: Dict[str, str]):

diff --git a/backend/src/updater.py b/backend/src/updater.py
@@ -1,3 +1,4 @@
+from __future__ import annotations
 import os
 import shutil
 from asyncio import sleep
@@ -11,7 +12,7 @@
 
 from aiohttp import ClientSession, web
 
-from .import helpers
+from . import helpers
 from .injector import get_gamepadui_tab
 from .settings import SettingsManager
 

diff --git a/backend/src/utilities.py b/backend/src/utilities.py
@@ -19,7 +19,7 @@
     from .main import PluginManager
 from .injector import inject_to_tab, get_gamepadui_tab, close_old_tabs, get_tab
 from .localplatform import ON_WINDOWS
-from .import helpers
+from . import helpers
 from .localplatform import service_stop, service_start, get_home_path, get_username
 
 class FilePickerObj(TypedDict):