New: Option to set maximum size of temporary files, preserving them w…

…hen closing the app
ollm · Dec 11, 2023 · a727249 · a727249
1 parent 0f81947
commit a727249
Show file tree

Hide file tree

Showing 24 changed files with 315 additions and 39 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,13 +4,15 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## v1.0.1 (dd-mm-yyyy)
+## v1.1.0 (dd-mm-yyyy)
 
 ##### 🚀 New Features
 
+- Option to set maximum size of temporary files, preserving them when closing the app
+
 ##### 🐛 Bug Fixes
 
-- Error on detect file type from binary
+- Error on detect file type from binary [`0f81947`](https://github.com/ollm/OpenComic/commit/0f819470d42ce996cd4f1f0a31665a605d2bc39a)
 
 ## [v1.0.0](https://github.com/ollm/OpenComic/releases/tag/v1.0.0) (09-12-2023)
 

diff --git a/languages/ca.json b/languages/ca.json
@@ -226,15 +226,19 @@
 		"storage": {
 			"main": "Emmagatzematge",
 			"cache": "Memòria cau",
-			"cacheDescription": "Les miniatures i l'índex dels fitxers comprimits s'emmagatzemen aquí, no es recomana netejar-la tret que sigui molt gran o hi hagi algun error relacionat amb ella",
+			"cacheDescription": "Les miniatures i l'índex dels arxius comprimits s'emmagatzemen aquí, no es recomana netejar-la tret que sigui molt gran o hi hagi algun error relacionat amb ella",
 			"cacheMaxSize": "Tamany màxim de la memòria cau",
-			"cacheMaxSizeDescription": "S'eliminaran fitxers de la memòria cau quan superi aquesta mida, prioritzant els fitxers més antics sense ús",
+			"cacheMaxSizeDescription": "S'eliminaran arxius de la memòria cau quan superi aquesta mida, prioritzant els arxius més antics sense ús",
 			"cacheMaxOld": "Temps màxim de la memòria cau",
-			"cacheMaxOldDescription": "S'eliminaran fitxers de la memòria cau quan portin més d'aquest temps sense fer-se servir",
+			"cacheMaxOldDescription": "S'eliminaran arxius de la memòria cau quan portin més d'aquest temps sense fer-se servir",
 			"clearCache": "Netejar memòria cau",
 			"temporaryFiles": "Arxius temporals",
-			"temporaryFilesDescription": "Aquí es descomprimeixen els fitxers comprimits a mesura que es van necessitant, això s'elimina automàticament en tancar OpenComic",
-			"removeTemporaryFiles": "Eliminar fitxers temporals"
+			"temporaryFilesDescription": "Aquí es descomprimeixen els arxius comprimits a mesura que es van necessitant, això s'elimina parcialment en tancar OpenComic",
+			"removeTemporaryFiles": "Eliminar arxius temporals",
+			"temporaryFilesMaxSize": "Tamany màxim dels arxius temporals",
+			"temporaryFilesMaxSizeDescription": "S'eliminaran arxius temporals quan superin aquesta mida, prioritzant els arxius més antics sense ús",
+			"temporaryFilesMaxOld": "Temps màxim dels arxius temporals",
+			"temporaryFilesMaxOldDescription": "S'eliminaran arxius temporals quan portin més d'aquest temps sense fer-se servir"
 		}
 	},
 	"menu": {

diff --git a/languages/cs.json b/languages/cs.json
@@ -234,7 +234,11 @@
 			"clearCache": "",
 			"temporaryFiles": "",
 			"temporaryFilesDescription": "",
-			"removeTemporaryFiles": ""
+			"removeTemporaryFiles": "",
+			"temporaryFilesMaxSize": "",
+			"temporaryFilesMaxSizeDescription": "",
+			"temporaryFilesMaxOld": "",
+			"temporaryFilesMaxOldDescription": ""
 		}
 	},
 	"menu": {

diff --git a/languages/de.json b/languages/de.json
@@ -234,7 +234,11 @@
 			"clearCache": "",
 			"temporaryFiles": "",
 			"temporaryFilesDescription": "",
-			"removeTemporaryFiles": ""
+			"removeTemporaryFiles": "",
+			"temporaryFilesMaxSize": "",
+			"temporaryFilesMaxSizeDescription": "",
+			"temporaryFilesMaxOld": "",
+			"temporaryFilesMaxOldDescription": ""
 		}
 	},
 	"menu": {

diff --git a/languages/en.json b/languages/en.json
@@ -233,8 +233,12 @@
 			"cacheMaxOldDescription": "Files will be removed from the cache when they have not been used for more than this time",
 			"clearCache": "Clear cache",
 			"temporaryFiles": "Temporary files",
-			"temporaryFilesDescription": "Here the compressed files are decompressed as they are needed, this is automatically removed when closing OpenComic",
-			"removeTemporaryFiles": "Remove temporary files"
+			"temporaryFilesDescription": "Here the compressed files are decompressed as they are needed, this is partially removed when closing OpenComic",
+			"removeTemporaryFiles": "Remove temporary files",
+			"temporaryFilesMaxSize": "Maximum temporary files",
+			"temporaryFilesMaxSizeDescription": "Temporary files will be removed when they exceed this size, prioritizing older unused files",
+			"temporaryFilesMaxOld": "Maximum temporary files time",
+			"temporaryFilesMaxOldDescription": "Temporary files will be removed when they have not been used for more than this time"
 		}
 	},
 	"menu": {

diff --git a/languages/es.json b/languages/es.json
@@ -233,8 +233,12 @@
 			"cacheMaxOldDescription": "Se eliminarán archivos de la caché cuando lleven más de este tiempo sin usarse",
 			"clearCache": "Limpiar caché",
 			"temporaryFiles": "Archivos temporales",
-			"temporaryFilesDescription": "Aquí se descomprimen los archivos comprimidos a medida que se van necesitando, esto se elimina automáticamente al cerrar OpenComic",
-			"removeTemporaryFiles": "Eliminar archivos temporales"
+			"temporaryFilesDescription": "Aquí se descomprimen los archivos comprimidos a medida que se van necesitando, esto se elimina parcialmente al cerrar OpenComic",
+			"removeTemporaryFiles": "Eliminar archivos temporales",
+			"temporaryFilesMaxSize": "Tamaño máximo de los archivos temporales",
+			"temporaryFilesMaxSizeDescription": "Se eliminarán archivos temporales cuando superen este tamaño, priorizando los archivos más antiguos sin uso",
+			"temporaryFilesMaxOld": "Tiempo máximo de los archivos temporales",
+			"temporaryFilesMaxOldDescription": "Se eliminarán archivos temporales cuando lleven más de este tiempo sin usarse"
 		}
 	},
 	"menu": {

diff --git a/languages/fr.json b/languages/fr.json
@@ -234,7 +234,11 @@
 			"clearCache": "",
 			"temporaryFiles": "",
 			"temporaryFilesDescription": "",
-			"removeTemporaryFiles": ""
+			"removeTemporaryFiles": "",
+			"temporaryFilesMaxSize": "",
+			"temporaryFilesMaxSizeDescription": "",
+			"temporaryFilesMaxOld": "",
+			"temporaryFilesMaxOldDescription": ""
 		}
 	},
 	"menu": {

diff --git a/languages/hu.json b/languages/hu.json
@@ -234,7 +234,11 @@
 			"clearCache": "",
 			"temporaryFiles": "",
 			"temporaryFilesDescription": "",
-			"removeTemporaryFiles": ""
+			"removeTemporaryFiles": "",
+			"temporaryFilesMaxSize": "",
+			"temporaryFilesMaxSizeDescription": "",
+			"temporaryFilesMaxOld": "",
+			"temporaryFilesMaxOldDescription": ""
 		}
 	},
 	"menu": {

diff --git a/languages/it.json b/languages/it.json
@@ -234,7 +234,11 @@
 			"clearCache": "",
 			"temporaryFiles": "",
 			"temporaryFilesDescription": "",
-			"removeTemporaryFiles": ""
+			"removeTemporaryFiles": "",
+			"temporaryFilesMaxSize": "",
+			"temporaryFilesMaxSizeDescription": "",
+			"temporaryFilesMaxOld": "",
+			"temporaryFilesMaxOldDescription": ""
 		}
 	},
 	"menu": {

diff --git a/languages/ja.json b/languages/ja.json
@@ -234,7 +234,11 @@
 			"clearCache": "",
 			"temporaryFiles": "",
 			"temporaryFilesDescription": "",
-			"removeTemporaryFiles": ""
+			"removeTemporaryFiles": "",
+			"temporaryFilesMaxSize": "",
+			"temporaryFilesMaxSizeDescription": "",
+			"temporaryFilesMaxOld": "",
+			"temporaryFilesMaxOldDescription": ""
 		}
 	},
 	"menu": {

diff --git a/languages/pt-br.json b/languages/pt-br.json
@@ -234,7 +234,11 @@
 			"clearCache": "",
 			"temporaryFiles": "",
 			"temporaryFilesDescription": "",
-			"removeTemporaryFiles": ""
+			"removeTemporaryFiles": "",
+			"temporaryFilesMaxSize": "",
+			"temporaryFilesMaxSizeDescription": "",
+			"temporaryFilesMaxOld": "",
+			"temporaryFilesMaxOldDescription": ""
 		}
 	},
 	"menu": {

diff --git a/languages/ru.json b/languages/ru.json
@@ -234,7 +234,11 @@
 			"clearCache": "",
 			"temporaryFiles": "",
 			"temporaryFilesDescription": "",
-			"removeTemporaryFiles": ""
+			"removeTemporaryFiles": "",
+			"temporaryFilesMaxSize": "",
+			"temporaryFilesMaxSizeDescription": "",
+			"temporaryFilesMaxOld": "",
+			"temporaryFilesMaxOldDescription": ""
 		}
 	},
 	"menu": {

diff --git a/languages/th.json b/languages/th.json
@@ -234,7 +234,11 @@
 			"clearCache": "ล้างแคช",
 			"temporaryFiles": "ไฟล์ชั่วคราว",
 			"temporaryFilesDescription": "ที่ที่ไฟล์บีบอัดจำเป็นต้นใช้ในการคลายไฟล์ โดยจะมีการนำไฟล์ออกโดยอัตโนมัติเมื่อปิด OpenComic",
-			"removeTemporaryFiles": "นำไฟล์ชั่วคราวออก"
+			"removeTemporaryFiles": "นำไฟล์ชั่วคราวออก",
+			"temporaryFilesMaxSize": "",
+			"temporaryFilesMaxSizeDescription": "",
+			"temporaryFilesMaxOld": "",
+			"temporaryFilesMaxOldDescription": ""
 		}
 	},
 	"menu": {

diff --git a/languages/vi.json b/languages/vi.json
@@ -234,7 +234,11 @@
 			"clearCache": "",
 			"temporaryFiles": "",
 			"temporaryFilesDescription": "",
-			"removeTemporaryFiles": ""
+			"removeTemporaryFiles": "",
+			"temporaryFilesMaxSize": "",
+			"temporaryFilesMaxSizeDescription": "",
+			"temporaryFilesMaxOld": "",
+			"temporaryFilesMaxOldDescription": ""
 		}
 	},
 	"menu": {

diff --git a/languages/zh-hans.json b/languages/zh-hans.json
@@ -234,7 +234,11 @@
 			"clearCache": "清除缓存",
 			"temporaryFiles": "临时文件",
 			"temporaryFilesDescription": "在这里，压缩文件根据需要进行解压缩，这在关闭 OpenComic 时会自动删除",
-			"removeTemporaryFiles": "删除临时文件"
+			"removeTemporaryFiles": "删除临时文件",
+			"temporaryFilesMaxSize": "",
+			"temporaryFilesMaxSizeDescription": "",
+			"temporaryFilesMaxOld": "",
+			"temporaryFilesMaxOldDescription": ""
 		}
 	},
 	"menu": {

diff --git a/languages/zh-hant.json b/languages/zh-hant.json
@@ -234,7 +234,11 @@
 			"clearCache": "",
 			"temporaryFiles": "",
 			"temporaryFilesDescription": "",
-			"removeTemporaryFiles": ""
+			"removeTemporaryFiles": "",
+			"temporaryFilesMaxSize": "",
+			"temporaryFilesMaxSizeDescription": "",
+			"temporaryFilesMaxOld": "",
+			"temporaryFilesMaxOldDescription": ""
 		}
 	},
 	"menu": {

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "opencomic",
 	"productName": "OpenComic",
-	"version": "1.0.1",
+	"version": "1.1.0",
 	"main": "scripts/main.js",
 	"type": "commonjs",
 	"keywords": [

diff --git a/scripts/app.js b/scripts/app.js
@@ -197,6 +197,11 @@ function stripTagsWithDOM(string)
     return doc.body.textContent || '';
 }
 
+function time()
+{
+	return Math.floor(Date.now() / 1000);
+}
+
 function sleep(ms)
 {
 	return new Promise(function(resolve){
@@ -231,6 +236,7 @@ module.exports = {
 	extract: extract,
 	capitalize: capitalize,
 	stripTagsWithDOM: stripTagsWithDOM,
+	time: time,
 	sleep: sleep,
 	setImmediate: setImmediate,
 };
diff --git a/scripts/cache.js b/scripts/cache.js
@@ -127,6 +127,8 @@ function returnThumbnailsImages(images, callback, file = false)
 	let toGenerateThumbnails = [];
 	let toGenerateThumbnailsData = {};
 
+	let time = app.time();
+
 	for(let i = 0, len = images.length; i < len; i++)
 	{
 		let image = images[i];
@@ -145,7 +147,7 @@ function returnThumbnailsImages(images, callback, file = false)
 		}
 		else
 		{
-			data[sha].lastAccess = time();
+			data[sha].lastAccess = time;
 
 			if(imgCache.size != size)
 			{
@@ -240,7 +242,7 @@ function purge()
 {
 	if(!data) data = storage.get('cache') || {};
 
-	let _time = time();
+	let time = app.time();
 
 	let cacheMaxSize = config.cacheMaxSize * 1000 * 1000;
 	let cacheMaxOld = config.cacheMaxOld * 60 * 60 * 24;
@@ -250,7 +252,7 @@ function purge()
 	// Remove not usage files
 	for(let sha in data)
 	{
-		if(_time - data[sha].lastAccess > cacheMaxOld)
+		if(time - data[sha].lastAccess > cacheMaxOld)
 		{
 			deleteInCacheSha(sha);
 		}

diff --git a/scripts/file-manager.js b/scripts/file-manager.js
@@ -577,7 +577,9 @@ var file = function(path) {
 		{
 			let file = files[i];
 
-			if(fs.existsSync(realPath(file.path, -1, this.config.prefixes)))
+			let _path = realPath(file.path, -1, this.config.prefixes);
+
+			if(fs.existsSync(_path))
 			{
 				if(callbackWhenFileAvailable) callbackWhenFileAvailable(file);
 			}
@@ -592,6 +594,9 @@ var file = function(path) {
 
 				filesToDecompressNum++;
 			}
+
+			if(_path !== file.path) // If it is different it is because it is not a compressed file
+				this.setTmpUsage(_path);
 		}
 
 		if(filesToDecompress)
@@ -613,9 +618,41 @@ var file = function(path) {
 			}
 		}
 
+		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) {
@@ -1804,7 +1841,7 @@ var fileCompressed = function(path, _realPath = false, forceType = false, prefix
 		}
 		catch(error)
 		{
-			return this.readIfTypeFromBinaryIsDifferent(error);
+			return this.extractIfTypeFromBinaryIsDifferent(error);
 		}
 	}
 

diff --git a/scripts/main.js b/scripts/main.js
@@ -108,7 +108,7 @@ function createWindow() {
 		{
 			appClosing = true;
 
-			win.webContents.executeJavaScript('var saved = reading.saveReadingProgress(); settings.removeTemporaryFiles(true); cache.purge(); ebook.closeAllRenders(); saved;', false).then(function(value) {
+			win.webContents.executeJavaScript('var saved = reading.saveReadingProgress(); settings.purgeTemporaryFiles(); cache.purge(); ebook.closeAllRenders(); saved;', false).then(function(value) {
 
 				if(!value)
 					app.quit();