Merge pull request #3 from hwf1324/feature-refresh-cache-JSON

直接替换 network 中 的 _BASE_URL

Author: cary-rowen

.vscode/settings.json

@@ -8,18 +8,18 @@
     "python.linting.flake8Enabled": true,
     "python.linting.pylintEnabled": false,
     "python.autoComplete.extraPaths": [
-        "../nvda/source",
-        "../nvda/miscDeps/python"
-        ],	
+        "${workspaceFolder}/../nvda/source", // NVDA 源代码应位于此工作区所在文件夹的父文件夹。
+        "${workspaceFolder}/../nvda/miscDeps/python"
+    ],
     "files.insertFinalNewline": true,
     "files.trimFinalNewlines": true,
     "editor.insertSpaces": false,
     "python.analysis.diagnosticSeverityOverrides": {
         "reportUndefinedVariable": "none"
     },
     "python.analysis.extraPaths": [
-        "../nvda/source",
-        "../nvda/miscDeps/python"
+        "${workspaceFolder}/../nvda/source",
+        "${workspaceFolder}/../nvda/miscDeps/python"
     ],
-    "python.defaultInterpreterPath": "../nvda/.venv/scripts/python.exe"
+    "python.defaultInterpreterPath": "${workspaceFolder}/../nvda/.venv/scripts/python.exe"
 }

addon/globalPlugins/updateMirror.py

@@ -5,7 +5,11 @@
 import globalPluginHandler
 import updateCheck
 import versionInfo
-REQUIRED_VERSION_YEAR, REQUIRED_VERSION_MAJOR= 2023, 2
+
+MIRROR_CHECK_UPDATE_URL = "https://nvaccess.mirror.nvdadr.com/nvdaUpdateCheck"
+MIRROR_STORE_URL = "https://nvaccess.mirror.nvdadr.com/addonStore/"
+REQUIRED_VERSION_YEAR, REQUIRED_VERSION_MAJOR = 2023, 2
+
 current_version_year, current_version_major = versionInfo.version_year, versionInfo.version_major
 
 if (current_version_year, current_version_major) >= (REQUIRED_VERSION_YEAR, REQUIRED_VERSION_MAJOR):
@@ -17,24 +21,19 @@
 else:
     isSupported = False
 
-MIRROR_CHECK_UPDATE_URL = "https://nvaccess.mirror.nvdadr.com/nvdaUpdateCheck"
-MIRROR_STORE_URL = "https://nvaccess.mirror.nvdadr.com/addonStore/"
-
-def _getAddonStoreURLMirror(channel, lang: str, nvdaApiVersion: str) -> str:
-	return MIRROR_STORE_URL + f"{lang}/{channel.value}/{nvdaApiVersion}.json"
 
 class GlobalPlugin(globalPluginHandler.GlobalPlugin):
 	def __init__(self):
 		super().__init__()
 		self.originalURL = updateCheck.CHECK_URL
 		updateCheck.CHECK_URL = MIRROR_CHECK_UPDATE_URL
 		if isSupported:
-			self.original_getAddonStoreURL = _addonStore.dataManager._getAddonStoreURL
-			_addonStore.dataManager._getAddonStoreURL = _getAddonStoreURLMirror
+			self.original_BASE_URL = _addonStore.network._BASE_URL
+			_addonStore.network._BASE_URL = MIRROR_STORE_URL
 			_addonStore.dataManager.initialize()
 
 	def terminate(self):
 		updateCheck.CHECK_URL = self.originalURL
 		if isSupported:
-			_addonStore.dataManager._getAddonStoreURL = self.original_getAddonStoreURL
+			_addonStore.network._BASE_URL = self.original_BASE_URL
 			_addonStore.dataManager.initialize()