New: Use single thread in HDD extractions

Author: ollm

CHANGELOG.md

@@ -15,6 +15,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 - Support Discord Rich Presence [`a19f9eb`](https://github.com/ollm/OpenComic/commit/a19f9eb6dd99350037b7c77f14e706223256af4c)
 - Get Calibre `series` and `series_index` metadata in PDF and ePub [`da739de`](https://github.com/ollm/OpenComic/commit/da739ded8ff1cdbc2b5da39662e85e725cd71545)
 - Increase and decrease horizontal margin shortcuts [`0bae05f`](https://github.com/ollm/OpenComic/commit/0bae05f210018120b56210797cd5850e13254aa9)
+- Use single thread in HDD extractions
 
 ##### 🐛 Bug Fixes
 

package-lock.json

@@ -112,6 +112,7 @@
 		"short-windows-path": "^1.0.3",
 		"shosho": "^1.4.3",
 		"ssh2-sftp-client": "v12.0.1",
+		"systeminformation": "^5.27.6",
 		"webdav": "^5.8.0"
 	},
 	"devDependencies": {

package.json

@@ -1,5 +1,6 @@
 const requestFileAccess = require(p.join(appDir, 'scripts/file-manager/request-file-access.js'))
-	filePassword = require(p.join(appDir, 'scripts/file-manager/file-password.js'));
+	filePassword = require(p.join(appDir, 'scripts/file-manager/file-password.js')),
+	diskType = require(p.join(appDir, 'scripts/file-manager/disk-type.js'));
 
 var un7z = false, bin7z = false, fastXmlParser = false, Minimatch = false;
 
@@ -1869,6 +1870,17 @@ var fileCompressed = function(path, _realPath = false, forceType = false, prefix
 
 	}
 
+	this.getOptimalThreads = function() {
+
+		const disk = diskType.check(this.realPath);
+
+		if(disk.hdd)
+			return {readKey: 'readUsingThreadsHDD', extractKey: 'extractUsingThreadsHDD', read: 0.01, extract: 0.01};
+		else
+			return {readKey: 'readUsingThreads', extractKey: 'extractUsingThreads', read: 1, extract: 1};
+
+	}
+
 	// 7z
 	this._7z = false;
 
@@ -1893,51 +1905,67 @@ var fileCompressed = function(path, _realPath = false, forceType = false, prefix
 
 	this.read7z = async function(callback = false) {
 
-		const files = [];
-
 		const self = this;
+		const optimalThreads = this.getOptimalThreads();
 
-		const _7z = await this.open7z();
-		let readSome = false;
+		return threads.job(optimalThreads.readKey, {useThreads: optimalThreads.read}, async function() {
 
-		return new Promise(function(resolve, reject) {
+			return new Promise(async function(resolve, reject) {
 
-			_7z.on('data', function(data) {
+				let readSome = false;
+				let endEvent = false;
 
-				if(data.file)
-				{
-					if(/^D/.test(data.attributes) && !data.size) // Ignore directories
-						return;
+				const files = [];
+				const _7z = await self.open7z();
 
-					const originalName = self.removeTmp(p.normalize(data.file));
-					const name = self.fixUnsupportedCharsInWindows(originalName);
-					const same = originalName === name ? true : false;
+				_7z.on('data', function(data) {
 
-					files.push({name: name, fixedName: (!same ? name : ''), originalName: (!same ? originalName : ''), path: p.join(self.path, name), fileSize: data.size});
-					self.setFileStatus(name, {extracted: false});
+					if(data.file)
+					{
+						if(/^D/.test(data.attributes) && !data.size) // Ignore directories
+							return;
 
-					readSome = true;
-				}
+						const originalName = self.removeTmp(p.normalize(data.file));
+						const name = self.fixUnsupportedCharsInWindows(originalName);
+						const same = originalName === name ? true : false;
 
-			}).on('end', function(data) {
+						files.push({name: name, fixedName: (!same ? name : ''), originalName: (!same ? originalName : ''), path: p.join(self.path, name), fileSize: data.size});
+						self.setFileStatus(name, {extracted: false});
 
-				self.files = self.filesToMultidimension(files);
-				resolve(self.files);
+						readSome = true;
+					}
 
-			}).on('error', function(error){
+				}).on('end', function(data) {
 
-				if(readSome)
-				{
-					/*self.files = self.filesToMultidimension(files);
-					resolve(self.files);*/
+					endEvent = true;
 
-					//self.saveErrorToCache(error);
-					dom.compressedError(error, false, sha1(self.path));
-				}
-				else
-				{
-					reject(error);
-				}
+					self.files = self.filesToMultidimension(files);
+					resolve(self.files);
+
+				}).on('error', function(error){
+
+					if(readSome)
+					{
+						//self.saveErrorToCache(error);
+						dom.compressedError(error, false, sha1(self.path));
+
+						// Just in case the 'end' event is not called
+						setTimeout(function() {
+
+							if(endEvent)
+								return;
+
+							self.files = self.filesToMultidimension(files);
+							resolve(self.files);
+
+						}, 5000);
+					}
+					else
+					{
+						reject(error);
+					}
+
+				});
 
 			});
 
@@ -1948,6 +1976,7 @@ var fileCompressed = function(path, _realPath = false, forceType = false, prefix
 	this.extract7z = async function() {
 
 		const self = this;
+		const optimalThreads = this.getOptimalThreads();
 
 		const only = [];
 		const extractName = {};
@@ -1979,7 +2008,7 @@ var fileCompressed = function(path, _realPath = false, forceType = false, prefix
 			let extractedSome = false;
 			let hasError = false;
 
-			promises.push(threads.job('extractUsingThreads', {useThreads: 1}, async function() {
+			promises.push(threads.job(optimalThreads.extractKey, {useThreads: optimalThreads.extract}, async function() {
 
 				return new Promise(async function(resolve, reject) {
 
@@ -3600,4 +3629,5 @@ module.exports = {
 	fileSizes: function(){return fileSizes},
 	requestFileAccess: requestFileAccess,
 	filePassword: filePassword,
+	diskType: diskType,
 }

scripts/file-manager.js

@@ -0,0 +1,115 @@
+const systemInfo = require('systeminformation');
+
+var runned = false;
+
+async function findDisks(force = false)
+{
+	if(runned && !force)
+		return;
+
+	runned = true;
+
+	const disks = [];
+
+	if(process.platform == 'win32')
+	{
+		const diskLayout = await systemInfo.diskLayout();
+		const fsSize = await systemInfo.fsSize();
+		const blockDevices = await si.blockDevices();
+
+		/*
+
+
+
+
+
+
+		*/
+	}
+	else
+	{
+		const diskLayout = await systemInfo.diskLayout();
+		const fsSize = await systemInfo.fsSize();
+
+		for(const layout of diskLayout)
+		{
+			const regex = layout.device ? new RegExp('^'+pregQuote(layout.device), '') : false;;
+			const mount = fsSize.find(function(size) {
+
+				return regex && size.fs && regex.test(size.fs) ? true : false;
+
+			});
+
+			if(mount)
+			{
+				disks.push({
+					name: layout.name,
+					mount: mount.mount,
+					type: layout.type,
+					hdd: /HD/iu.test(layout.type),
+					ssd: /SSD/iu.test(layout.type),
+					nvme: /NVMe/iu.test(layout.type),
+				});
+			}
+		}
+	}
+
+	disks.sort(function(a, b) {
+		
+		if(a.mount.length === b.mount.length)
+			return 0;
+
+		return a.mount.length > b.mount.length ? -1 : 1;
+
+	});
+
+	storage.set('disks', disks);
+	getDisks(true); // Update disks cache
+
+	return disks;
+}
+
+var disks = false;
+
+function getDisks(force = false)
+{
+	if(disks !== false && !force)
+		return disks;
+
+	if(!force)
+		findDisks();
+
+	disks = storage.get('disks') || [];
+
+	for(const disk of disks)
+	{
+		disk.mountRegex = new RegExp('^'+pregQuote(disk.mount), '');
+	}
+
+	return disks;
+}
+
+function check(path)
+{
+	const disks = getDisks();
+
+	for(let i = 0, len = disks.length; i < len; i++)
+	{
+		const disk = disks[i];
+
+		if(disk.mountRegex.test(path))
+			return disk;
+	}
+
+	return {
+		hdd: false,
+		ssd: true,
+		nvme: false,
+	};
+}
+
+module.exports = {
+	check,
+	getDisks,
+	findDisks,
+};

scripts/file-manager/disk-type.js

@@ -381,6 +381,7 @@ async function startApp()
 	dragAndDrop.start();
 	dom.search.start();
 	tracking.start();
+	fileManager.diskType.findDisks();
 
 	document.fonts.ready.then(function(){
 

scripts/opencomic.js

@@ -1,6 +1,6 @@
 const safe = require(p.join(appDir, 'scripts/storage/safe.js'));
 
-const changes = 121; // Update this if readingPagesConfig is updated
+const changes = 122; // Update this if readingPagesConfig is updated
 
 const readingPagesConfig = {
 	readingConfigName: '',
@@ -423,6 +423,14 @@ const storageDefault = {
 			author: '',
 		}
 	},
+	disks: [{
+		name: '',
+		mount: '',
+		type: '',
+		hdd: false,
+		ssd: false,
+		nvme: false,
+	}],
 	cache: {
 		wildcard: {
 			lastAccess: 0,