New: Max cache size and max cache old

ollm · Oct 9, 2023 · fe679d4 · fe679d4
1 parent c3ee1e2
commit fe679d4
Show file tree

Hide file tree

Showing 22 changed files with 227 additions and 9 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -21,6 +21,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 - Search and filter in library/browsing [`8393903`](https://github.com/ollm/OpenComic/commit/8393903117981bea2b8a79e2e50b77d02334aa05)
 - Tracking at the end of the chapter/volume setting option [`39f1954`](https://github.com/ollm/OpenComic/commit/39f19546b2fd363d321f9c423e706c3dc773aa4f)
 - View size and remove cache and temporary files from settings [`8114336`](https://github.com/ollm/OpenComic/commit/8114336ef2c70748e3b1d87618903ef34cb58f0a)
+- Max cache size and max cache old
 
 ##### 🐛 Bug Fixes
 

diff --git a/languages/ca.json b/languages/ca.json
@@ -43,6 +43,7 @@
 		"language": "Idioma",
 		"settings": "Configuració",
 		"theme": "Tema",
+		"days": "Dies",
 		"valueCannotBeEmpty": "El valor no pot estar buit",
 		"nightMode": "Mode nit"
 	},
@@ -180,6 +181,10 @@
 			"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",
+			"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",
+			"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",
 			"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",

diff --git a/languages/cs.json b/languages/cs.json
@@ -43,6 +43,7 @@
 		"language": "Jazyk",
 		"settings": "",
 		"theme": "Vzhled",
+		"days": "",
 		"valueCannotBeEmpty": "Hodnota nesmí být prázdná",
 		"nightMode": "Noční režim"
 	},
@@ -180,6 +181,10 @@
 			"main": "",
 			"cache": "",
 			"cacheDescription": "",
+			"cacheMaxSize": "",
+			"cacheMaxSizeDescription": "",
+			"cacheMaxOld": "",
+			"cacheMaxOldDescription": "",
 			"clearCache": "",
 			"temporaryFiles": "",
 			"temporaryFilesDescription": "",

diff --git a/languages/de.json b/languages/de.json
@@ -43,6 +43,7 @@
 		"language": "Sprache",
 		"settings": "",
 		"theme": "Thema",
+		"days": "",
 		"valueCannotBeEmpty": "",
 		"nightMode": "Nachtmodus"
 	},
@@ -180,6 +181,10 @@
 			"main": "",
 			"cache": "",
 			"cacheDescription": "",
+			"cacheMaxSize": "",
+			"cacheMaxSizeDescription": "",
+			"cacheMaxOld": "",
+			"cacheMaxOldDescription": "",
 			"clearCache": "",
 			"temporaryFiles": "",
 			"temporaryFilesDescription": "",

diff --git a/languages/en.json b/languages/en.json
@@ -43,6 +43,7 @@
 		"language": "Language",
 		"settings": "Settings",
 		"theme": "Theme",
+		"days": "Days",
 		"valueCannotBeEmpty": "Value cannot be empty",
 		"nightMode": "Night mode"
 	},
@@ -180,9 +181,13 @@
 			"main": "Storage",
 			"cache": "Cache",
 			"cacheDescription": "The thumbnails and index of the compressed files are stored here, it is not recommended to clean it unless it is very large or there is an error related to it",
+			"cacheMaxSize": "Maximum cache size",
+			"cacheMaxSizeDescription": "Files will be removed from the cache when it exceeds this size, prioritizing older unused files",
+			"cacheMaxOld": "Maximum cache time",
+			"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 deleted when closing OpenComic",
+			"temporaryFilesDescription": "Here the compressed files are decompressed as they are needed, this is automatically removed when closing OpenComic",
 			"removeTemporaryFiles": "Remove temporary files"
 		}
 	},

diff --git a/languages/es.json b/languages/es.json
@@ -43,6 +43,7 @@
 		"language": "Idioma",
 		"settings": "Ajustes",
 		"theme": "Tema",
+		"days": "Días",
 		"valueCannotBeEmpty": "El valor no puede estar vació",
 		"nightMode": "Modo noche"
 	},
@@ -180,6 +181,10 @@
 			"main": "Almacenamiento",
 			"cache": "Caché",
 			"cacheDescription": "Las miniaturas y el índice de los archivos comprimidos se almacenan aquí, no se recomienda limpiarla a no ser que sea muy grande o haya algún error relacionado con ella",
+			"cacheMaxSize": "Tamaño máximo de la caché",
+			"cacheMaxSizeDescription": "Se eliminarán archivos de la caché cuando supere este tamaño, priorizando los archivos más antiguos sin uso",
+			"cacheMaxOld": "Tiempo máximo de la caché",
+			"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",

diff --git a/languages/fr.json b/languages/fr.json
@@ -43,6 +43,7 @@
 		"language": "Langues",
 		"settings": "",
 		"theme": "Theme",
+		"days": "",
 		"valueCannotBeEmpty": "",
 		"nightMode": "Mode nuit"
 	},
@@ -180,6 +181,10 @@
 			"main": "",
 			"cache": "",
 			"cacheDescription": "",
+			"cacheMaxSize": "",
+			"cacheMaxSizeDescription": "",
+			"cacheMaxOld": "",
+			"cacheMaxOldDescription": "",
 			"clearCache": "",
 			"temporaryFiles": "",
 			"temporaryFilesDescription": "",

diff --git a/languages/hu.json b/languages/hu.json
@@ -43,6 +43,7 @@
 		"language": "Nyelv",
 		"settings": "",
 		"theme": "Téma",
+		"days": "",
 		"valueCannotBeEmpty": "",
 		"nightMode": "Sötét téma"
 	},
@@ -180,6 +181,10 @@
 			"main": "",
 			"cache": "",
 			"cacheDescription": "",
+			"cacheMaxSize": "",
+			"cacheMaxSizeDescription": "",
+			"cacheMaxOld": "",
+			"cacheMaxOldDescription": "",
 			"clearCache": "",
 			"temporaryFiles": "",
 			"temporaryFilesDescription": "",

diff --git a/languages/it.json b/languages/it.json
@@ -43,6 +43,7 @@
 		"language": "Lingua",
 		"settings": "",
 		"theme": "Tema",
+		"days": "",
 		"valueCannotBeEmpty": "",
 		"nightMode": "Modalità notte"
 	},
@@ -180,6 +181,10 @@
 			"main": "",
 			"cache": "",
 			"cacheDescription": "",
+			"cacheMaxSize": "",
+			"cacheMaxSizeDescription": "",
+			"cacheMaxOld": "",
+			"cacheMaxOldDescription": "",
 			"clearCache": "",
 			"temporaryFiles": "",
 			"temporaryFilesDescription": "",

diff --git a/languages/ja.json b/languages/ja.json
@@ -43,6 +43,7 @@
 		"language": "言語",
 		"settings": "",
 		"theme": "テーマ",
+		"days": "",
 		"valueCannotBeEmpty": "",
 		"nightMode": "ナイトモード"
 	},
@@ -180,6 +181,10 @@
 			"main": "",
 			"cache": "",
 			"cacheDescription": "",
+			"cacheMaxSize": "",
+			"cacheMaxSizeDescription": "",
+			"cacheMaxOld": "",
+			"cacheMaxOldDescription": "",
 			"clearCache": "",
 			"temporaryFiles": "",
 			"temporaryFilesDescription": "",

diff --git a/languages/pt-br.json b/languages/pt-br.json
@@ -43,6 +43,7 @@
 		"language": "Linguagem",
 		"settings": "",
 		"theme": "Tema",
+		"days": "",
 		"valueCannotBeEmpty": "",
 		"nightMode": "Modo Noturno"
 	},
@@ -180,6 +181,10 @@
 			"main": "",
 			"cache": "",
 			"cacheDescription": "",
+			"cacheMaxSize": "",
+			"cacheMaxSizeDescription": "",
+			"cacheMaxOld": "",
+			"cacheMaxOldDescription": "",
 			"clearCache": "",
 			"temporaryFiles": "",
 			"temporaryFilesDescription": "",

diff --git a/languages/ru.json b/languages/ru.json
@@ -43,6 +43,7 @@
 		"language": "Язык",
 		"settings": "",
 		"theme": "Тема",
+		"days": "",
 		"valueCannotBeEmpty": "Значение не может быть пустым",
 		"nightMode": "Ночной режим"
 	},
@@ -180,6 +181,10 @@
 			"main": "",
 			"cache": "",
 			"cacheDescription": "",
+			"cacheMaxSize": "",
+			"cacheMaxSizeDescription": "",
+			"cacheMaxOld": "",
+			"cacheMaxOldDescription": "",
 			"clearCache": "",
 			"temporaryFiles": "",
 			"temporaryFilesDescription": "",

diff --git a/languages/vi.json b/languages/vi.json
@@ -43,6 +43,7 @@
 		"language": "Ngôn ngữ",
 		"settings": "",
 		"theme": "Chủ đề",
+		"days": "",
 		"valueCannotBeEmpty": "Giá trị không được để trống",
 		"nightMode": "Chế độ tối"
 	},
@@ -180,6 +181,10 @@
 			"main": "",
 			"cache": "",
 			"cacheDescription": "",
+			"cacheMaxSize": "",
+			"cacheMaxSizeDescription": "",
+			"cacheMaxOld": "",
+			"cacheMaxOldDescription": "",
 			"clearCache": "",
 			"temporaryFiles": "",
 			"temporaryFilesDescription": "",

diff --git a/languages/zh-hans.json b/languages/zh-hans.json
@@ -43,6 +43,7 @@
 		"language": "语言",
 		"settings": "",
 		"theme": "主题",
+		"days": "",
 		"valueCannotBeEmpty": "",
 		"nightMode": "夜间模式"
 	},
@@ -180,6 +181,10 @@
 			"main": "",
 			"cache": "",
 			"cacheDescription": "",
+			"cacheMaxSize": "",
+			"cacheMaxSizeDescription": "",
+			"cacheMaxOld": "",
+			"cacheMaxOldDescription": "",
 			"clearCache": "",
 			"temporaryFiles": "",
 			"temporaryFilesDescription": "",

diff --git a/languages/zh-hant.json b/languages/zh-hant.json
@@ -43,6 +43,7 @@
 		"language": "語言",
 		"settings": "",
 		"theme": "圖形介面",
+		"days": "",
 		"valueCannotBeEmpty": "",
 		"nightMode": "夜間模式"
 	},
@@ -180,6 +181,10 @@
 			"main": "",
 			"cache": "",
 			"cacheDescription": "",
+			"cacheMaxSize": "",
+			"cacheMaxSizeDescription": "",
+			"cacheMaxOld": "",
+			"cacheMaxOldDescription": "",
 			"clearCache": "",
 			"temporaryFiles": "",
 			"temporaryFilesDescription": "",

diff --git a/scripts/cache.js b/scripts/cache.js
@@ -213,6 +213,83 @@ async function deleteInCache(path)
 	return;
 }
 
+function deleteInCacheSha(sha, returnFileSize = false)
+{
+	let cachePath = p.join(cacheFolder, sha+'.jpg');
+
+	if(data[sha])
+		delete data[sha];
+
+	let fileSize = 0;
+
+	if(fs.existsSync(cachePath))
+	{
+		if(returnFileSize)
+			fileSize = fs.statSync(cachePath).size;
+
+		fs.unlinkSync(cachePath);
+	}
+
+	return fileSize;
+}
+
+function purge()
+{
+	let _time = time();
+
+	let cacheMaxSize = config.cacheMaxSize * 1000 * 1000;
+	let cacheMaxOld = config.cacheMaxOld * 60 * 60 * 24;
+
+	let dataArray = [];
+
+	// Remove not usage files
+	for(let sha in data)
+	{
+		if(_time - data[sha].lastAccess > cacheMaxOld)
+		{
+			deleteInCacheSha(sha);
+		}
+		else
+		{
+			dataArray.push({
+				sha: sha,
+				lastAccess: data[sha].lastAccess,
+			});
+		}
+	}
+
+	// Remove if exede cache max size
+	let cacheSize = fileManager.dirSizeSync(cache.folder);
+
+	if(cacheSize > cacheMaxSize)
+	{
+		let cacheMaxSizeMargin = cacheMaxSize * 0.8; // Remove 20% if cache exceeds maximum size to avoid running this every time
+
+		dataArray.sort(function(a, b) {
+
+			if(a.lastAccess === b.lastAccess)
+				return 0;
+
+			return a.lastAccess > b.lastAccess ? 1 : -1;
+
+		});
+
+		for(let i = 0, len = dataArray.length; i < len; i++)
+		{
+			let size = deleteInCacheSha(dataArray[i].sha, true);
+
+			cacheSize -= size;
+
+			if(cacheSize < cacheMaxSizeMargin)
+				break;
+		}
+	}
+
+	storage.set('cache', data);
+
+	return;
+}
+
 module.exports = {
 	folder: cacheFolder,
 	returnThumbnailsImages: returnThumbnailsImages,
@@ -224,4 +301,5 @@ module.exports = {
 	processingTheImageQueue: function(){return processingTheImageQueue},
 	stopQueue: stopQueue,
 	resumeQueue: resumeQueue,
+	purge: purge,
 };
diff --git a/scripts/file-manager.js b/scripts/file-manager.js
@@ -1958,6 +1958,25 @@ async function dirSize(dir)
 	return size;
 }
 
+function dirSizeSync(dir)
+{
+	let files = fs.readdirSync(dir, {withFileTypes: true});
+	let size = 0;
+
+	for(let i = 0, len = files.length; i < len; i++)
+	{
+		let file = files[i];
+		let path = p.join(dir, file.name);
+
+		if(file.isDirectory())
+			size += dirSizeSync(path);
+		else if(file.isFile())
+			size += fs.statSync(path).size;
+	}
+
+	return size;
+}
+
 var prevDevicePixelRatio = window.devicePixelRatio;
 
 window.addEventListener('resize', function() {
@@ -1987,4 +2006,5 @@ module.exports = {
 	lastCompressedFile: lastCompressedFile,
 	containsCompressed: containsCompressed,
 	dirSize: dirSize,
+	dirSizeSync: dirSizeSync,
 }