Add option to delete a file/folder before extracting an option

 - Needed for implementing 07th-mod/higurashi-rei#14 as an option, while not overwriting every existing OG sprite

JSONValidator/Sources/JSONValidator/JSONValidator.swift

@@ -149,4 +149,6 @@ public struct ModOptionFileDefinition: Codable {
 	public var relativeExtractionPath: String?
 	/// The priority of this file (same system as above priorities)
 	public var priority: Int
+	/// A file or folder path relative to the *top-level game directory*, to be deleted before extraction
+	public var deletePath: String?
 }

common.py

@@ -1551,3 +1551,22 @@ def crc32_of_file(file_path):
 			fb = f.read(BLOCK_SIZE)
 
 	return "{:08x}".format(hash & 0xffffffff)
+
+def applyDeletions(installPath, optionParser):
+	#type: (str, installConfiguration.ModOptionParser) -> None
+	for opt in optionParser.downloadAndExtractOptionsByPriority:
+			if opt.deletePath is not None:
+				# Do not allow paths with '..' to avoid deleting stuff outside the install path
+				if '..' in opt.deletePath.replace('\\', '/').split('/'):
+					raise Exception("Developer Error: You are not allowed to use '..' for deletePath")
+
+				fullDeletePath = os.path.join(installPath, opt.deletePath)
+
+				try:
+					print("applyDeletions(): Attempting to delete path {} due to option {}...".format(fullDeletePath, opt.name))
+					if os.path.isdir(fullDeletePath):
+						shutil.rmtree(fullDeletePath)
+					else:
+						os.remove(fullDeletePath)
+				except Exception as e:
+					print("applyDeletions(): Failed to delete path: {}".format(e))

higurashiInstaller.py

@@ -524,6 +524,8 @@ def main(fullInstallConfiguration):
 		if not isVoiceOnly:
 			installer.backupFiles()
 			installer.cleanOld()
+		# If any mod options request deletion of a folder, do it before the extraction
+		common.applyDeletions(fullInstallConfiguration.installPath, modOptionParser)
 		print("Extracting...")
 		installer.extractFiles()
 		commandLineParser.printSeventhModStatusUpdate(97, "Cleaning up...")
@@ -544,6 +546,8 @@ def main(fullInstallConfiguration):
 		if not isVoiceOnly:
 			installer.backupFiles()
 			installer.cleanOld()
+		# If any mod options request deletion of a folder, do it before the extraction
+		common.applyDeletions(fullInstallConfiguration.installPath, modOptionParser)
 		installer.moveFilesIntoPlace()
 		commandLineParser.printSeventhModStatusUpdate(97, "Cleaning up...")
 		installer.removeResourcesAssetsBackup()

installConfiguration.py

@@ -255,13 +255,14 @@ def __repr__(self):
 
 
 class DownloadAndExtractOption:
-	def __init__(self, name, description, url, relativeExtractionPath, priority, group):
+	def __init__(self, name, description, url, relativeExtractionPath, priority, group, deletePath):
 		self.name = name # type: str
 		self.description = description # type: str
 		self.url = url # type: str
 		self.relativeExtractionPath = relativeExtractionPath # type: str
 		self.priority = priority # type: int
 		self.group = group # type: str
+		self.deletePath = deletePath # type: str
 
 
 class ModOptionParser:
@@ -286,7 +287,8 @@ def __init__(self, fullInstallConfiguration):
 							modOption.data['url'],
 							modOption.data['relativeExtractionPath'],
 							modOption.data['priority'],
-							modOption.group
+							modOption.group,
+							modOption.data.get('deletePath')
 						)
 					)
 				elif modOption.type == 'keepDownloads':

uminekoInstaller.py

@@ -172,6 +172,9 @@ def remapPaths(originalFolder, originalFilename):
 		else:
 			return originalFolder, originalFilename
 
+	# If any mod options request deletion of a folder, do it before the extraction
+	common.applyDeletions(conf.installPath, optionParser)
+
 	downloaderAndExtractor.extract(remapPaths)
 
 	############################################# FIX .ARC FILE NAMING #################################################

uminekoNScripterInstaller.py

@@ -73,6 +73,9 @@ def main(conf):
 
 	downloaderAndExtractor.download()
 
+	# If any mod options request deletion of a folder, do it before the extraction
+	common.applyDeletions(conf.installPath, parser)
+
 	# Extract files
 	fileVersionManager.saveVersionInstallStarted()
 	downloaderAndExtractor.extract()