Merge branch 'master' into zstd-long-distance-mode

Author: nicoboss

nsz/FileExistingChecks.py

@@ -153,9 +153,14 @@ def fileNameCheck(filePath, targetFileExtension, filesAtTarget, removeOld, overw
 	'If you want to overwrite it use the -w parameter!'.format(Path(filePath).name))
 	return False
 
-def delete_source_file(source_file_path):
-	if Path(source_file_path).exists():
-		Print.info("Deleting source file {0}".format(source_file_path))
-		remove(source_file_path)
+def delete_source_file(source_file_path, outFolder):
+	filePath = Path(source_file_path)
+	if filePath.exists():
+		resultFile = Path(targetExtension(outFolder.joinpath(filePath.name)))
+		if resultFile.exists():
+			Print.info("[DELETING]   Source file {0}".format(source_file_path))
+			remove(source_file_path)
+		else:
+			Print.warning("[WARNING]    Skipped deleting source file because target file doesn't exist")
 	else:
-		Print.warning("{0} was already removed.".format(source_file_path))
+		Print.warning("[WARNING]    {0} was already removed.".format(source_file_path))

nsz/IndependentNczDecompressor.py

@@ -108,8 +108,6 @@ def __decompressNcz(nspf, f):
 				inputChunk = decompressor.read(chunkSz)
 			if not len(inputChunk):
 				break
-			if not useBlockCompression:
-				decompressor.flush()
 			if s.cryptoType in (3, 4):
 				inputChunk = crypto.encrypt(inputChunk)
 			f.write(inputChunk)

nsz/NszDecompressor.py

@@ -162,7 +162,6 @@ def __decompressNcz(nspf, f, statusReportInfo, pleaseNoPrint):
 				inputChunk = blockDecompressorReader.read(chunkSz)
 			else:
 				inputChunk = decompressor.read(chunkSz)
-				decompressor.flush()
 			if not len(inputChunk):
 				break
 			if useCrypto:

nsz/PathTools.py

@@ -36,6 +36,15 @@ def isXciXcz(filePath):
 def changeExtension(filePath, newExtension):
 	return str(filePath.parent.resolve().joinpath(filePath.stem + newExtension))
 
+def targetExtension(filePath):
+	if filePath.suffix == '.nsp': newExtension = '.nsz'
+	if filePath.suffix == '.xci': newExtension = '.xcz'
+	if filePath.suffix == '.nca': newExtension = '.ncz'
+	if filePath.suffix == '.nsz': newExtension = '.nsp'
+	if filePath.suffix == '.xcz': newExtension = '.xci'
+	if filePath.suffix == '.ncz': newExtension = '.nca'
+	return str(filePath.parent.resolve().joinpath(filePath.stem + newExtension))
+
 def getExtensionName(filePath):
 	return str(Path(filePath).suffix[1:].upper())
 

nsz/SolidCompressor.py

@@ -106,7 +106,6 @@ def processContainer(readContainer, writeContainer, compressionLevel, useLongDis
 					partitions[partNr] = None
 
 					compressor.flush(FLUSH_FRAME)
-					compressor.flush(COMPRESSOBJ_FLUSH_FINISH)
 					statusReport[id] = [nspf.tell(), f.tell(), nspf.size, 'Compressing']
 
 					written = f.tell() - start

nsz/__init__.py

@@ -217,7 +217,7 @@ def main():
 			barManager.stop()
 
 			for filePath in sourceFileToDelete:
-				delete_source_file(filePath)
+				delete_source_file(filePath, outFolder)
 
 		if args.D:
 			for f_str in args.file:
@@ -228,12 +228,12 @@ def main():
 						outFolder = argOutFolder if argOutFolder else filePath.parent.absolute()
 						if filePath.suffix == '.nsz':
 							if not outFolder in targetDictNsz:
-								targetDictNsz[outFolder] = CreateTargetDict(outFolder, args, ".xcz")
+								targetDictNsz[outFolder] = CreateTargetDict(outFolder, args, ".nsp")
 							if not AllowedToWriteOutfile(filePath, ".nsp", targetDictNsz[outFolder], args):
 								continue
 						elif filePath.suffix == '.xcz':
 							if not outFolder in targetDictXcz:
-								targetDictXcz[outFolder] = CreateTargetDict(outFolder, args, ".xcz")
+								targetDictXcz[outFolder] = CreateTargetDict(outFolder, args, ".xci")
 							if not AllowedToWriteOutfile(filePath, ".xci", targetDictXcz[outFolder], args):
 								continue
 						elif filePath.suffix == '.ncz':
@@ -244,7 +244,7 @@ def main():
 								continue
 						decompress(filePath, outFolder)
 						if args.rm_source:
-							delete_source_file(filePath)
+							delete_source_file(filePath, outFolder)
 					except KeyboardInterrupt:
 						raise
 					except BaseException as e:

requirements-gui.txt

@@ -1,5 +1,5 @@
 pycryptodome
-zstandard
+zstandard==0.15.2
 enlighten
 pywin32;platform_system == "Windows"
 pypiwin32;platform_system == "Windows"

requirements.txt

@@ -1,3 +1,3 @@
 pycryptodome
-zstandard
+zstandard==0.15.2
 enlighten

setup.py

@@ -23,7 +23,7 @@
 	],
 	install_requires=[
 		'pycryptodome',
-		'zstandard',
+		'zstandard==0.15.2',
 		'enlighten',
 	],
 	extras_require={