Fixup translation generation: reset temp files

Author: seanbudd

_validate/manifestLoader.py

@@ -5,6 +5,7 @@
 from glob import glob
 import os
 import pathlib
+import shutil
 from typing import Generator, Tuple
 import zipfile
 from addonManifest import AddonManifest
@@ -16,11 +17,14 @@ def getAddonManifest(addonPath: str) -> AddonManifest:
 	""" Extract manifest.ini from *.nvda-addon and parse.
 	Raise on error.
 	"""
-	expandedPath = os.path.join(TEMP_DIR, "nvda-addon")
+	extractDir = os.path.join(TEMP_DIR, "tempAddon")
+	if pathlib.Path(extractDir).exists():
+		shutil.rmtree(extractDir)
+	pathlib.Path(extractDir).mkdir()
 	with zipfile.ZipFile(addonPath, "r") as z:
 		for info in z.infolist():
-			z.extract(info, expandedPath)
-	filePath = os.path.join(expandedPath, "manifest.ini")
+			z.extract(info, extractDir)
+	filePath = os.path.join(extractDir, "manifest.ini")
 	try:
 		manifest = AddonManifest(filePath)
 		return manifest

_validate/regenerateTranslations.py

@@ -17,7 +17,7 @@
 
 sys.path.append(os.path.dirname(__file__))  # To allow this module to be run as a script by runcreatejson.bat
 # E402 module level import not at top of file
-from manifestLoader import getAddonManifest, getAddonManifestLocalizations, TEMP_DIR  # noqa:E402
+from manifestLoader import getAddonManifest, getAddonManifestLocalizations  # noqa:E402
 del sys.path[-1]
 
 
@@ -27,8 +27,7 @@ def regenerateJsonFile(filePath: str, errorFilePath: Optional[str]) -> None:
 	if addonData.get("legacy"):
 		return
 	addonData["translations"] = []
-	addonFilePath = os.path.join(TEMP_DIR, "addon.nvda-addon")
-	urlretrieve(addonData["URL"], addonFilePath)
+	addonFilePath, _ = urlretrieve(addonData["URL"])
 	manifest = getAddonManifest(addonFilePath)
 	if manifest.errors:
 		if errorFilePath:

_validate/validate.py

@@ -315,6 +315,7 @@ def validateSubmission(submissionFilePath: str, verFilename: str) -> ValidationE
 			raise ValueError(submissionData["URL"])
 
 		addonDestPath = os.path.join(TEMP_DIR, "addon.nvda-addon")
+		os.remove(addonDestPath)
 		yield from downloadAddon(url=submissionData["URL"], destPath=addonDestPath)
 
 		checksumErrors = list(checkSha256(addonDestPath, expectedSha=submissionData["sha256"]))