Merge fb564e7 into b7b38c3

seanbudd · web-flow · commit e3556a1ea066 · 2023-07-10T10:25:25.000+10:00
diff --git a/source/_addonStore/dataManager.py b/source/_addonStore/dataManager.py
@@ -153,19 +153,21 @@ def _cacheLatestAddons(self, addonData: str, cacheHash: str):
 	def _getCachedAddonData(self, cacheFilePath: str) -> Optional[CachedAddonsModel]:
 		if not os.path.exists(cacheFilePath):
 			return None
-		with open(cacheFilePath, 'r') as cacheFile:
-			try:
+		try:
+			with open(cacheFilePath, 'r') as cacheFile:
 				cacheData = json.load(cacheFile)
-			except Exception:
-				log.exception(f"Invalid add-on store cache")
-				return None
+		except Exception:
+			log.exception(f"Invalid add-on store cache")
+			os.remove(cacheFilePath)
+			return None
 		try:
 			data = cacheData["data"]
 			cacheHash = cacheData["cacheHash"]
 			cachedLanguage = cacheData["cachedLanguage"]
 			nvdaAPIVersion = cacheData["nvdaAPIVersion"]
 		except KeyError:
 			log.exception(f"Invalid add-on store cache:\n{cacheData}")
+			os.remove(cacheFilePath)
 			return None
 		return CachedAddonsModel(
 			cachedAddonData=_createStoreCollectionFromJson(data),
