[Rebase] Implement localized store

backend/decky_loader/browser.py

@@ -157,8 +157,16 @@ async def _install(self, artifact: str, name: str, version: str, hash: str):
         # Will be set later in code
         res_zip = None
 
-        # Check if plugin is installed
+        # Check if plugin was already installed before this
         isInstalled = False
+
+        try:
+            pluginFolderPath = self.find_plugin_folder(name)
+            if pluginFolderPath:
+                isInstalled = True
+        except:
+            logger.error(f"Failed to determine if {name} is already installed, continuing anyway.")
+
         # Preserve plugin order before removing plugin (uninstall alters the order and removes the plugin from the list)
         current_plugin_order = self.settings.getSetting("pluginOrder")[:]
         if self.loader.watcher:
@@ -213,14 +221,19 @@ async def _install(self, artifact: str, name: str, version: str, hash: str):
                     return
 
                 else:
-                    name = sub(r"/.+$", "", plugin_json_list[0])
-
-        try:
-            pluginFolderPath = self.find_plugin_folder(name)
-            if pluginFolderPath:
-                isInstalled = True
-        except:
-            logger.error(f"Failed to determine if {name} is already installed, continuing anyway.")
+                    plugin_json_file = plugin_json_list[0]
+                    name = sub(r"/.+$", "", plugin_json_file)
+                    try:
+                        with plugin_zip.open(plugin_json_file) as f:
+                            plugin_json_data = json.loads(f.read().decode('utf-8'))
+                            plugin_name_from_plugin_json = plugin_json_data.get('name')
+                            if plugin_name_from_plugin_json and plugin_name_from_plugin_json.strip():
+                                logger.info(f"Extracted plugin name from {plugin_json_file}: {plugin_name_from_plugin_json}")
+                                name = plugin_name_from_plugin_json
+                            else:
+                                logger.warning(f"Nonexistent or invalid 'name' key value in {plugin_json_file}. Falling back to extracting from path.")
+                    except Exception as e:
+                        logger.error(f"Failed to read or parse {plugin_json_file}: {str(e)}. Falling back to extracting from path.")
 
         # Check to make sure we got the file
         if res_zip is None:

backend/decky_loader/locales/bg-BG.json

@@ -99,12 +99,14 @@
         }
     },
     "PluginListIndex": {
+        "freeze": "Замразяване на актуализациите",
         "hide": "Бърз достъп: Скриване",
         "no_plugin": "Няма инсталирани добавки!",
         "plugin_actions": "Действия с добавката",
         "reinstall": "Преинсталиране",
         "reload": "Презареждане",
         "show": "Бърз достъп: Показване",
+        "unfreeze": "Разрешаване на актуализациите",
         "uninstall": "Деинсталиране",
         "update_all_one": "Обновяване на 1 добавка",
         "update_all_other": "Обновяване на {{count}} добавки",
@@ -192,9 +194,19 @@
     "SettingsIndex": {
         "developer_title": "Разработчик",
         "general_title": "Общи",
-        "plugins_title": "Добавки"
+        "plugins_title": "Добавки",
+        "testing_title": "Тестване"
     },
     "Store": {
+        "download_progress_info": {
+            "download_zip": "Изтегляне на плъгина",
+            "increment_count": "Увеличаване на броя изтегляния",
+            "installing_plugin": "Инсталиране на плъгина",
+            "open_zip": "Отваряне на zip файла",
+            "parse_zip": "Разглеждане на zip файла",
+            "start": "Иницииране",
+            "uninstalling_previous": "Деинсталиране на предишното копие"
+        },
         "store_contrib": {
             "desc": "Ако искате да допринесете към магазина за добавки на Decky, разгледайте хранилището SteamDeckHomebrew/decky-plugin-template в GitHub. Може да намерите информация относно разработката и разпространението във файла README.",
             "label": "Допринасяне"
@@ -218,9 +230,17 @@
             "about": "Относно",
             "alph_asce": "По азбучен ред (Я -> А)",
             "alph_desc": "По азбучен ред (А -> Я)",
+            "date_asce": "Най-старият първи",
+            "date_desc": "Най-новият първи",
+            "downloads_asce": "Най-малко изтеглени първи",
+            "downloads_desc": "Най-изтеглени първи",
             "title": "Разглеждане"
         },
-        "store_testing_cta": "Помислете дали искате да тествате новите добавки, за да помогнете на екипа на Decky Loader!"
+        "store_testing_cta": "Помислете дали искате да тествате новите добавки, за да помогнете на екипа на Decky Loader!",
+        "store_testing_warning": {
+            "desc": "Можете да използвате този канал на магазина, за да тествате най-новите версии на плъгините. Не забравяйте да оставите обратна връзка в GitHub, за да може плъгинът да бъде актуализиран за всички потребители.",
+            "label": "Добре дошли в канала на магазина за тестване"
+        }
     },
     "StoreSelect": {
         "custom_store": {
@@ -234,6 +254,17 @@
             "testing": "Тестване"
         }
     },
+    "Testing": {
+        "download": "Изтегляне",
+        "error": "Грешка при инсталирането на PR",
+        "header": "Следните версии на Decky Loader са създадени от отворени заявки за изтегляне от трети страни. Екипът на Decky Loader не е проверявал тяхната функционалност или сигурност и е възможно те да са остарели.",
+        "loading": "Зареждане на отворени заявки за изтегляне...",
+        "start_download_toast": "Изтегляне на PR #{{id}}"
+    },
+    "TitleView": {
+        "decky_store_desc": "Отворете Decky Store",
+        "settings_desc": "Отворете настройките на Decky"
+    },
     "Updater": {
         "decky_updates": "Обновления на Decky",
         "no_patch_notes_desc": "няма бележки за промените в тази версия",

backend/decky_loader/locales/de-DE.json

@@ -198,6 +198,15 @@
         "testing_title": "Testen"
     },
     "Store": {
+        "download_progress_info": {
+            "download_zip": "Plugin herunterladen",
+            "increment_count": "Erhöhen der Downloadanzahl",
+            "installing_plugin": "Plugin installieren",
+            "open_zip": "Öffnen der Zip-Datei",
+            "parse_zip": "Parsen der Zip-Datei",
+            "start": "Initialisieren",
+            "uninstalling_previous": "Vorherige Kopie deinstallieren"
+        },
         "store_contrib": {
             "desc": "Wenn du Erweiterungen im Decky Store veröffentlichen willst, besuche die SteamDeckHomebrew/decky-plugin-template Repository auf GitHub. Informationen rund um Entwicklung und Veröffentlichung findest du in der README.",
             "label": "Mitwirken"
@@ -246,7 +255,11 @@
         }
     },
     "Testing": {
-        "download": "Download"
+        "download": "Download",
+        "error": "Fehler beim Installieren von PR",
+        "header": "Die folgenden Versionen von Decky Loader wurden aus offenen Pull Requests von Dritten erstellt. Das Decky Loader-Team hat ihre Funktionalität oder Sicherheit nicht überprüft, und sie können veraltet sein.",
+        "loading": "Offene Pull Requests laden...",
+        "start_download_toast": "Herunterladen von PR #{{id}}"
     },
     "TitleView": {
         "decky_store_desc": "Decky Store Öffnen",

backend/decky_loader/locales/nl-NL.json

@@ -2,9 +2,9 @@
     "BranchSelect": {
         "update_channel": {
             "label": "Updatekanaal",
-            "prerelease": "Prerelease",
+            "prerelease": "Vooruitgave",
             "stable": "Stabiel",
-            "testing": "Testing"
+            "testing": "Testen"
         }
     },
     "Developer": {
@@ -188,7 +188,7 @@
             "header": "Overige"
         },
         "updates": {
-            "header": "Updates"
+            "header": "Bijwerkingen"
         }
     },
     "SettingsIndex": {
@@ -198,6 +198,15 @@
         "testing_title": "Testen"
     },
     "Store": {
+        "download_progress_info": {
+            "download_zip": "Plugin downloaden",
+            "increment_count": "Aantal downloads verhogen",
+            "installing_plugin": "Plugin installeren",
+            "open_zip": "Zip-bestand openen",
+            "parse_zip": "Zip-bestand parseren",
+            "start": "Initialiseren",
+            "uninstalling_previous": "Vorige kopie verwijderen"
+        },
         "store_contrib": {
             "desc": "Als je wilt bijdragen aan de Decky Plugin Store, kijk dan in de SteamDeckHomebrew/decky-plugin-template repository op GitHub. Informatie over ontwikkeling en distributie is beschikbaar in de README.",
             "label": "Bijdragen"
@@ -242,11 +251,15 @@
             "custom": "Aangepast",
             "default": "Standaard",
             "label": "Winkelkanaal",
-            "testing": "Testing"
+            "testing": "Testen"
         }
     },
     "Testing": {
-        "download": "Downloaden"
+        "download": "Downloaden",
+        "error": "Fout bij installatie van PR",
+        "header": "De volgende versies van Decky Loader zijn gebouwd op basis van open Pull Requests van derden. Het Decky Loader-team heeft hun functionaliteit of veiligheid niet gecontroleerd en ze kunnen verouderd zijn.",
+        "loading": "Openstaande Pull Requests laden...",
+        "start_download_toast": "PR #{{id}} downloaden"
     },
     "TitleView": {
         "decky_store_desc": "Decky Store openen",
@@ -261,7 +274,7 @@
             "checking": "Bezig met controleren op updates",
             "cur_version": "Huidige versie: {{ver}}",
             "install_button": "Bijwerken",
-            "label": "Updates",
+            "label": "Bijwerkingen",
             "lat_version": "Bijwerkt: versie {{ver}}",
             "reloading": "Bezig met herstarten",
             "updating": "Bezig met bijwerken"

backend/decky_loader/locales/zh-CN.json

@@ -191,6 +191,15 @@
         "testing_title": "测试"
     },
     "Store": {
+        "download_progress_info": {
+            "download_zip": "正在下载插件",
+            "increment_count": "正在计入下载次数",
+            "installing_plugin": "正在安装插件",
+            "open_zip": "正在打开 ZIP 文件",
+            "parse_zip": "正在解析 ZIP 文件",
+            "start": "正在初始化",
+            "uninstalling_previous": "正在卸载之前的版本"
+        },
         "store_contrib": {
             "desc": "如果你想要提交你的插件到 Decky 插件商店，请访问 GitHub 上的 SteamDeckHomebrew/decky-plugin-template 存储库。有关开发和分发插件的信息，请查看 README 文件。",
             "label": "贡献"
@@ -239,7 +248,11 @@
         }
     },
     "Testing": {
-        "download": "下载"
+        "download": "下载",
+        "error": "安装 PR 时出错",
+        "header": "以下版本的 Decky Loader 是根据开放的第三方 Pull Request 构建的。Decky Loader 团队尚未验证这些版本的功能或安全性，且它们可能已经过期。",
+        "loading": "正在加载尚未合并的 Pull Request ...",
+        "start_download_toast": "正在下载 PR #{{id}}"
     },
     "TitleView": {
         "decky_store_desc": "打开 Decky 商店",

backend/decky_loader/utilities.py

@@ -9,7 +9,7 @@
 from stat import FILE_ATTRIBUTE_HIDDEN # pyright: ignore [reportAttributeAccessIssue, reportUnknownVariableType]
 
 from asyncio import StreamReader, StreamWriter, start_server, gather, open_connection
-from aiohttp import ClientSession
+from aiohttp import ClientSession, hdrs
 from aiohttp.web import Request, StreamResponse, Response, json_response, post
 from typing import TYPE_CHECKING, Callable, Coroutine, Dict, Any, List, TypedDict
 
@@ -153,14 +153,14 @@ async def http_request(self, req: Request) -> StreamResponse:
         headers["User-Agent"] = helpers.user_agent
 
         for excluded_header in excluded_default_headers:
-            self.logger.debug(f"Excluding default header {excluded_header}")
             if excluded_header in headers:
+                self.logger.debug(f"Excluding default header {excluded_header}: {headers[excluded_header]}")
                 del headers[excluded_header]
 
         if "X-Decky-Fetch-Excluded-Headers" in req.headers:
             for excluded_header in req.headers["X-Decky-Fetch-Excluded-Headers"].split(", "):
-                self.logger.debug(f"Excluding header {excluded_header}")
                 if excluded_header in headers:
+                    self.logger.debug(f"Excluding header {excluded_header}: {headers[excluded_header]}")
                     del headers[excluded_header]
 
         for header in req.headers:
@@ -187,7 +187,21 @@ async def http_request(self, req: Request) -> StreamResponse:
         # defeat the point of this proxy.
         async with ClientSession(auto_decompress=False) as web:
             async with web.request(req.method, url, headers=headers, data=body, ssl=helpers.get_ssl_context()) as web_res:
-                res = StreamResponse(headers=web_res.headers, status=web_res.status)
+                # Whenever the aiohttp_cors is used, it expects a near complete control over whatever headers are needed
+                # for `aiohttp_cors.ResourceOptions`. As a server, if you delegate CORS handling to aiohttp_cors,
+                # the headers below must NOT be set. Otherwise they would be overwritten by aiohttp_cors and there would be 
+                # logic bugs, so it was probably a smart choice to assert if the headers are present.
+                #
+                # However, this request handler method does not act like our own local server, it always acts like a proxy 
+                # where we do not have control over the response headers. For responses that do not allow CORS, we add the support
+                # via aiohttp_cors. For responses that allow CORS, we have to remove the conflicting headers to allow
+                # aiohttp_cors handle it for us as if there was no CORS support.
+                aiohttp_cors_compatible_headers = web_res.headers.copy()
+                aiohttp_cors_compatible_headers.popall(hdrs.ACCESS_CONTROL_ALLOW_ORIGIN, default=None)
+                aiohttp_cors_compatible_headers.popall(hdrs.ACCESS_CONTROL_ALLOW_CREDENTIALS, default=None)
+                aiohttp_cors_compatible_headers.popall(hdrs.ACCESS_CONTROL_EXPOSE_HEADERS, default=None)
+
+                res = StreamResponse(headers=aiohttp_cors_compatible_headers, status=web_res.status)
                 if web_res.headers.get('Transfer-Encoding', '').lower() == 'chunked':
                     res.enable_chunked_encoding()