New: Support for image format

Author: ollm

CHANGELOG.md

@@ -8,7 +8,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 ##### 🚀 New Features
 
-- Improve chapter detection in tracking
+- Improve chapter detection in tracking [`ad05a23`](https://github.com/ollm/OpenComic/commit/ad05a2364882227688cccfa2fdf58a21f8e9615c)
+- Support for `JP2` image format
 
 ## [v1.4.1](https://github.com/ollm/OpenComic/releases/tag/v1.4.1) (08-02-2025)
 

package-lock.json

@@ -31,7 +31,9 @@ var imagesWithoutSaving = 0;
 
 function processTheImageQueue()
 {
-	let img = queuedImages[0];
+	let img = queuedImages.shift();
+	if(!img) return;
+
 	let sha = img.sha;
 
 	let realPath = fileManager.realPath(img.file);
@@ -52,8 +54,6 @@ function processTheImageQueue()
 
 		img.callback({cache: true, path: escapeBackSlash(addCacheVars(toImage, img.size, img.sha)), sha: sha}, img.vars);
 
-		queuedImages.splice(0, 1);
-
 		if(queuedImages.length > 0)
 		{
 			imagesWithoutSaving++;
@@ -80,8 +80,6 @@ function processTheImageQueue()
 
 		img.callback({cache: true, path: escapeBackSlash(realPath), sha: sha}, img.vars);
 
-		queuedImages.splice(0, 1);
-
 		if(queuedImages.length > 0)
 		{
 			imagesWithoutSaving++;
@@ -107,8 +105,13 @@ function processTheImageQueue()
 	});
 }
 
-function addImageToQueue(file, size, sha, callback, vars, type, forceSize)
+async function addImageToQueue(file, size, sha, callback, vars, type, forceSize)
 {
+	const extention = fileExtension(file);
+
+	if(inArray(extention, imageExtensions.convert)) // Convert unsupported images
+		await workers.convertImage(file);
+
 	queuedImages.push({file: file, size: size, sha: sha, callback: callback, vars: vars, type: type, forceSize: forceSize});
 
 	if(!processingTheImageQueue && !stopTheImageQueue)

scripts/cache.js

@@ -2452,6 +2452,8 @@ async function openComic(animation = true, path = true, mainPath = true, end = f
 		await file.makeAvailable(files, false, true);
 	}
 
+	await fileManager.convertUnsupportedImages(files);
+
 	if(hasMusic) files.pop(); // Remove now
 
 	file.destroy();

scripts/dom.js

@@ -56,7 +56,7 @@ function openDialog(path)
 {
 	let dialog = electronRemote.dialog;
 
-	dialog.showOpenDialog({properties: ['openFile'], defaultPath: fileManager.containsCompressed(path) ? p.dirname(path) : path, filters: [{name: language.global.comics, extensions: [...compatibleImageExtensions, ...compatibleSpecialExtensions]}]}).then(function (files) {
+	dialog.showOpenDialog({properties: ['openFile'], defaultPath: fileManager.containsCompressed(path) ? p.dirname(path) : path, filters: [{name: language.global.comics, extensions: [...compatibleImageExtensionsWithoutConvert, ...compatibleSpecialExtensions]}]}).then(function (files) {
 
 		if(files.filePaths && files.filePaths[0])
 			setNewPoster(files.filePaths[0]);

scripts/dom/poster.js

@@ -784,7 +784,7 @@ var file = function(path, _config = false) {
 			}
 
 			if(_path !== file.path) // If it is different it is because it is not a compressed file
-				this.setTmpUsage(_path);
+				fileManager.setTmpUsage(_path);
 		}
 
 		if(filesToDecompress)
@@ -842,41 +842,9 @@ var file = function(path, _config = false) {
 			}
 		}
 
-		this.saveTmpUsage();
-
 		return filesToDecompressNum;
 	}
 
-	this.tmpUsage = [];
-
-	this.setTmpUsage = function(path) {
-
-		this.tmpUsage.push(path);
-
-	}
-
-	this.saveTmpUsage = function() {
-
-		let len = this.tmpUsage.length;
-
-		if(len === 0) return;
-
-		let time = app.time();
-		let tmpUsage = storage.get('tmpUsage');
-
-		for(let i = 0; i < len; i++)
-		{
-			let path = this.tmpUsage[i];
-
-			if(!tmpUsage[path]) tmpUsage[path] = {};
-			tmpUsage[path].lastAccess = time;
-		}
-
-		storage.setThrottle('tmpUsage', tmpUsage);
-		this.tmpUsage = [];
-
-	}
-
 	this.macosScopedResources = [];
 
 	this.macosStartAccessingSecurityScopedResource = function(path) {
@@ -1105,15 +1073,7 @@ var fileCompressed = function(path, _realPath = false, forceType = false, prefix
 	this.setTmpUsage = function() {
 
 		if(this.path !== this.realPath)
-		{
-			let time = app.time();
-			let tmpUsage = storage.get('tmpUsage');
-
-			if(!tmpUsage[this.realPath]) tmpUsage[this.realPath] = {};
-			tmpUsage[this.realPath].lastAccess = time;
-
-			storage.setThrottle('tmpUsage', tmpUsage);
-		}
+			fileManager.setTmpUsage(this.realPath);
 
 	}
 
@@ -2893,13 +2853,13 @@ function downloadedCompressedFile(path)
 
 function realPath(path, index = 0, prefixes = false)
 {
-	let segments = splitPath(path);
-	let len = segments.length;
+	const segments = splitPath(path);
+	const len = segments.length;
+	const numSegments = len + index;
 
 	let virtualPath;
 
 	let newPath = virtualPath = (len > 0) ? (isEmpty(segments[0]) ? '/' : segments[0]) : '';
-	let numSegments = len + index;
 
 	if(isServer(path))
 	{
@@ -2923,31 +2883,94 @@ function realPath(path, index = 0, prefixes = false)
 		{
 			let extension = fileExtension(newPath);
 
-			if(extension && inArray(extension, compressedExtensions.all)/* && fs.existsSync(newPath) && !fs.statSync(newPath).isDirectory()*/)
+			if(extension)
 			{
-				let sha = sha1(p.normalize(virtualPath));
-
-				if(prefixes)
+				if(inArray(extension, compressedExtensions.all) /* && fs.existsSync(newPath) && !fs.statSync(newPath).isDirectory()*/)
 				{
-					for(let ext in prefixes)
+					let sha = sha1(p.normalize(virtualPath));
+
+					if(prefixes)
 					{
-						if(inArray(extension, compressedExtensions[ext]))
+						for(let ext in prefixes)
 						{
-							sha = prefixes[ext]+'-'+sha;
+							if(inArray(extension, compressedExtensions[ext]))
+							{
+								sha = prefixes[ext]+'-'+sha;
 
-							break;
+								break;
+							}
 						}
 					}
+
+					newPath = p.join(tempFolder, sha);
 				}
+				else if(inArray(extension, imageExtensions.convert) && i + 1 === len)
+				{
+					const sha = sha1(p.dirname(p.normalize(virtualPath)));
 
-				newPath = p.join(tempFolder, sha);
+					let image = p.basename(virtualPath);
+					image = image+'.png';
+
+					newPath = p.join(tempFolder, sha, image);
+				}
 			}
 		}
 	}
 
 	return newPath;
 }
 
+async function convertUnsupportedImages(files)
+{
+	const promises = [];
+
+	for(let i = 0, len = files.length; i < len; i++)
+	{
+		const file = files[i];
+		const path = file.path;
+
+		if(inArray(fileExtension(path), imageExtensions.convert)) // Convert unsupported images
+			promises.push(workers.convertImage(path));
+	}
+
+	await Promise.all(promises);
+
+	return true;
+}
+
+var tmpUsageST = false, tmpUsageQueue = [];
+
+function setTmpUsage(path)
+{
+	tmpUsageQueue.push(path);
+
+	if(tmpUsageST === false)
+	{
+		tmpUsageST = setTimeout(function() {
+
+			tmpUsageST = false;
+
+			const len = tmpUsageQueue.length;
+			if(len === 0) return;
+
+			const time = app.time();
+			const tmpUsage = storage.get('tmpUsage');
+
+			for(let i = 0; i < len; i++)
+			{
+				const path = tmpUsageQueue[i];
+
+				if(!tmpUsage[path]) tmpUsage[path] = {};
+				tmpUsage[path].lastAccess = time;
+			}
+
+			storage.setThrottle('tmpUsage', tmpUsage);
+			tmpUsageQueue = [];
+
+		}, 1000);
+	}
+}
+
 var serverInOfflineMode = false;
 
 function setServerInOfflineMode(value = false)
@@ -3372,6 +3395,8 @@ module.exports = {
 	isParentPath: isParentPath,
 	simpleExists: simpleExists,
 	replaceReservedCharacters: replaceReservedCharacters,
+	convertUnsupportedImages: convertUnsupportedImages,
+	setTmpUsage: setTmpUsage,
 	macosSecurityScopedBookmarks: macosSecurityScopedBookmarks,
 	macosStartAccessingSecurityScopedResource: macosStartAccessingSecurityScopedResource,
 	dirSize: dirSize,