Fix: Check if the file is written to disk when extracting using 7zip

Author: ollm

CHANGELOG.md

@@ -26,9 +26,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 - Option to ignore files and folders that match Regex or File pattern [`670bced`](https://github.com/ollm/OpenComic/commit/670bced3ed7413145119b401f974e15ea482ddf5)
 - Authentication support for OPDS (Basic and Digest) [`11c3aa8`](https://github.com/ollm/OpenComic/commit/11c3aa88efbff8adcc3fabbf4b066dcb7120b10a)
 - Use safeStorage for passwords and tokens [`6178ded`](https://github.com/ollm/OpenComic/commit/6178dedf1afe13c56b68bd3bd68010d80d30fdc6)
-- Change extraction of rar and tar to 7z to improve performance [`c0c2d6d`](https://github.com/ollm/OpenComic/commit/c0c2d6d61016241e70d4ee475e8d19567b8e71db)
+- Change extraction of `RAR` and `TAR` to 7zip to improve performance [`c0c2d6d`](https://github.com/ollm/OpenComic/commit/c0c2d6d61016241e70d4ee475e8d19567b8e71db)
 - Add suport for compressed `LZH`, `ACE`, `TAR.GZ`, `TAR.XZ`, `TAR.BZIP2` and `TAR.ZSTD` [`e7e7815`](https://github.com/ollm/OpenComic/commit/e7e7815d7a841c02354f9b5219fcdf348c10543b)
-- Support compressed files with password
+- Support compressed files with password [`9a6ef8e`](https://github.com/ollm/OpenComic/commit/9a6ef8e0a363e72e98634e827c50189bb2841047)
 
 ##### 🐛 Bug Fixes
 
@@ -40,6 +40,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 - Stuttering when decode big images (From sync decode to async when possible) [`d320aad`](https://github.com/ollm/OpenComic/commit/d320aad1d95e886d531dcab5721dc44c125cf028)
 - Move zoom using cursor after turning a pages not working property [`3012715`](https://github.com/ollm/OpenComic/commit/30127150751b1de611f95069e748eab68fcd2f51)
 - Turn page forward in manga mode (Only on non-arrow keys) [`bdbc0dc`](https://github.com/ollm/OpenComic/commit/bdbc0dc31ab37bdfcef570bf8f2130e39c08861e)
+- Check if the file is written to disk when extracting using 7zip
 
 ## [v1.4.1](https://github.com/ollm/OpenComic/releases/tag/v1.4.1) (08-02-2025)
 

scripts/file-manager.js

@@ -221,6 +221,8 @@ var file = function(path, _config = false) {
 					if(json.error && !this.config.fromThumbnailsGeneration && !this.config.subtask)
 						dom.compressedError({message: json.error}, false, sha1(this.path));
 
+					setFileSizes(path, json.files);
+
 					return json.files;
 				}
 
@@ -244,6 +246,8 @@ var file = function(path, _config = false) {
 		if(!json || json.mtime != mtime)
 			cache.writeJson(compressed.cacheFile, {mtime: mtime, files: files, metadata: metadata});
 
+		setFileSizes(path, files);
+
 		return files;
 
 	}
@@ -1516,7 +1520,7 @@ var fileCompressed = function(path, _realPath = false, forceType = false, prefix
 					name: key,
 					path: file.path,
 					folder: file.folder ? true : false,
-					size: file.size || 0,
+					fileSize: file.fileSize || 0,
 					compressed: this.isCompressed(file.name),
 				};
 
@@ -1533,7 +1537,7 @@ var fileCompressed = function(path, _realPath = false, forceType = false, prefix
 					name: key,
 					path: p.join(this.path, _name),
 					folder: true,
-					size: 0,
+					fileSize: 0,
 					files: this._filesToMultidimension(files, value, _name),
 				});
 			}
@@ -1671,15 +1675,20 @@ var fileCompressed = function(path, _realPath = false, forceType = false, prefix
 
 	}
 
-	this.fixCorruptedName = function(name, pos = 0) {
+	this.isFullyWrittenToDisk = async function(path, realPath, intent = 0) {
+
+		const fileSize = fileSizes.get(path) ?? 0;
+		const stat = await fsp.stat(realPath);
+		const diskSize = stat.size;
 
-		if(/�/.test(name))
+		if(intent < 6 && (diskSize !== fileSize || (intent === 0 && diskSize === 0))) // Not fully written to disk, try again in 5 milliseconds
 		{
-			let ext = p.extname(name);
-			return pos+' - '+sha1(name)+(ext ? '.'+ext : '');
+			await app.sleep(5);
+
+			return this.isFullyWrittenToDisk(path, realPath, intent + 1);
 		}
 
-		return name;
+		return true;
 
 	}
 
@@ -1722,7 +1731,7 @@ var fileCompressed = function(path, _realPath = false, forceType = false, prefix
 				{
 					let name = _this.removeTmp(p.normalize(data.file));
 
-					files.push({name: name, path: p.join(_this.path, name), size: data.size});
+					files.push({name: name, path: p.join(_this.path, name), fileSize: data.size});
 					_this.setFileStatus(name, {extracted: false});
 
 					readSome = true;
@@ -1775,20 +1784,24 @@ var fileCompressed = function(path, _realPath = false, forceType = false, prefix
 
 			result = await new Promise(function(resolve, reject) {
 
-				_7z.on('data', function(data) {
+				_7z.on('data', async function(data) {
 
-					let extract = data.status == 'extracted' ? true : false;
+					const extract = data.status == 'extracted' ? true : false;
 
 					if(extract)
 					{
-						let name = _this.removeTmp(p.normalize(data.file));
+						_this.setProgress(_this.progressIndex++ / onlyLen);
+
+						const name = _this.removeTmp(p.normalize(data.file));
+						const path = p.join(_this.path, name);
+						const realPath = p.join(_this.tmp, name);
+
+						await _this.isFullyWrittenToDisk(path, realPath);
 
 						_this.setFileStatus(name, {extracted: extract});
-						_this.whenExtractFile(p.join(_this.path, name));
+						_this.whenExtractFile(path);
 
 						extractedSome = true;
-
-						_this.setProgress(_this.progressIndex++ / onlyLen);
 					}
 
 				}).on('progress', function(progress) {
@@ -2284,6 +2297,31 @@ var fileCompressed = function(path, _realPath = false, forceType = false, prefix
 
 }
 
+var fileSizes = new Map();
+var fileSizesInMap = new Set();
+
+function _setFileSizes(files)
+{
+	for(let i = 0, len = files.length; i < len; i++)
+	{
+		const file = files[i];
+
+		if(file.files)
+			_setFileSizes(file.files);
+		else if(file.fileSize)
+			fileSizes.set(file.path, file.fileSize);
+	}
+}
+
+function setFileSizes(path, files)
+{
+	if(fileSizesInMap.has(path))
+		return;
+
+	fileSizesInMap.add(path);
+	_setFileSizes(files);
+}
+
 var extractingPromises = {};
 var extractingPromisesST = {};
 
@@ -3229,6 +3267,7 @@ module.exports = {
 	getBlob: getBlob,
 	revokeObjectURL: revokeObjectURL,
 	revokeAllObjectURL: revokeAllObjectURL,
+	fileSizes: function(){return fileSizes},
 	requestFileAccess: requestFileAccess,
 	filePassword: filePassword,
 }