New: Improve relative path support for folder portable

Author: ollm

CHANGELOG.md

@@ -14,6 +14,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 - Separate order of browsing and reading [`e08faea`](https://github.com/ollm/OpenComic/commit/e08faea31038fc51c207a940d853734a45b32c7a)
 - Sort option to list compressed files first, separated from folders [`508fd1a`](https://github.com/ollm/OpenComic/commit/508fd1aa1886f11aee0ca6559754200d312da706)
 - Auto-prompt to track [`30608da`](https://github.com/ollm/OpenComic/commit/30608da602868c9e8c2ea2d528868c9b6464fc61)
+- Improve relative path support for folder portable
 
 ##### 🐛 Bug Fixes
 
@@ -23,7 +24,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 - Rare cases of blank images during reading [`e1f27b3`](https://github.com/ollm/OpenComic/commit/e1f27b315bc9023e35c7ea52122d3c918564f5e3)
 - Show magnifying glass instantaneous when enabled from shortcuts [`43bc73d`](https://github.com/ollm/OpenComic/commit/43bc73dcf85d80e756f1b674a64c66c7ce75529c)
 - goBack not working if OpenComic starts directly on reading [`2f6e2fc`](https://github.com/ollm/OpenComic/commit/2f6e2fc0ccb6d6d22eaa2c543a87d3a8b91bfc46)
-- Error on migrating some config
+- Error on migrating some config [`3b4e1ce`](https://github.com/ollm/OpenComic/commit/3b4e1ceb8c167bb76a7355a4085a09e2173c520d)
 
 ## [v1.6.0](https://github.com/ollm/OpenComic/releases/tag/v1.6.0) (27-07-2025)
 

package.json

@@ -38,8 +38,9 @@
 		"rename-win-arm": "node scripts/rename.js --win-arm",
 		"watch": "nodemon --ignore 'dist/' --ignore scripts/builded --watch * --exec npm run start",
 		"build": "npm run prebuild && electron-builder build && npm run postbuild",
-		"build-dist": "npm run prebuild && electron-builder --x64 --linux deb rpm AppImage 7z flatpak && electron-builder --arm64 --linux deb rpm AppImage 7z flatpak && npm run postbuild",
+		"build-dist": "npm run build-linux-folder-portable && npm run prebuild && electron-builder --x64 --linux deb rpm AppImage 7z flatpak && electron-builder --arm64 --linux deb rpm AppImage 7z flatpak && npm run postbuild",
 		"build-linux": "npm run prebuild && electron-builder --x64 --linux deb rpm AppImage 7z tar.gz && npm run postbuild",
+		"build-linux-folder-portable": "npm run prebuild && npm run prebuild-folder-portable && electron-builder --x64 --linux 7z && electron-builder --arm64 --linux 7z && npm run rename-folder-portable && npm run postbuild",
 		"build-deb": "npm run prebuild && electron-builder --x64 --linux deb && npm run postbuild",
 		"build-rpm": "npm run prebuild && electron-builder --x64 --linux rpm && npm run postbuild",
 		"build-snap": "npm run prebuild && electron-builder --x64 --linux snap && npm run postbuild",

scripts/dom.js

@@ -95,36 +95,17 @@ function orderBy(a, b, mode, key = false, key2 = false)
 	}
 }
 
-
-//Get reading progres of path
-function getReadingProgress(path, callback)
-{
-	path = p.normalize(path);
-
-	var readingProgress = storage.getKey('readingProgress');
-
-	for(let rpPath in readingProgress)
-	{
-		var data = readingProgress[rpPath];
-
-		if(typeof data.progress[path] !== 'undefined')		
-			return data;
-	}
-
-	return false;
-}
-
 function addImageToDom(sha, path, animation = true)
 {
 	const src = dom.queryAll('img.sha-image-'+sha).setAttribute('src', path);
 
 	if(animation)
 	{
-		src.addClass('a', 'border');
+		src.addClass('a', 'active', 'border');
 	}
 	else
 	{
-		src.addClass('border');
+		src.addClass('active', 'border');
 		src.filter('.folder-poster-img').addClass('has-poster');
 	}
 }
@@ -254,7 +235,7 @@ async function readFilesIndexPage(path, mainPath, fromGoBack, notAutomaticBrowsi
 	};
 
 	// Get comic reading progress image
-	let _readingProgress = storage.get('readingProgress');
+	let _readingProgress = relative.get('readingProgress');
 	let readingProgress = _readingProgress[mainPath]?.path ? _readingProgress[mainPath] : false;
 	let readingProgressCurrentPath = (mainPath != path) ? (_readingProgress[path]?.path ? _readingProgress[path] : false) : false;
 
@@ -375,7 +356,7 @@ async function loadFilesIndexPage(files, file, animation, path, keepScroll, main
 	let thumbnails = [];
 
 	// Get comic reading progress image
-	let _readingProgress = storage.get('readingProgress');
+	let _readingProgress = relative.get('readingProgress');
 
 	let readingProgress = _readingProgress[mainPath]?.path ? _readingProgress[mainPath] : false;
 	let readingProgressCurrentPath = (mainPath != path) ? (_readingProgress[path]?.path ? _readingProgress[path] : false) : false;
@@ -734,15 +715,17 @@ async function loadIndexPage(animation = true, path = false, content = false, ke
 		let ignore = fileManager.ignoreFilesRegex();
 
 		// Get comics in master folders
-		let masterFolders = storage.get('masterFolders');
+		let masterFolders = relative.get('masterFolders');
 
 		if(!isEmpty(masterFolders))
 		{
-			for(let key in masterFolders)
+			for(let path of masterFolders)
 			{
-				if(fs.existsSync(masterFolders[key]) && (!_indexLabel.masterFolder || _indexLabel.masterFolder == masterFolders[key]) && !_indexLabel.server)
+				path = path;
+
+				if(fs.existsSync(path) && (!_indexLabel.masterFolder || _indexLabel.masterFolder == path) && !_indexLabel.server)
 				{
-					let file = fileManager.file(masterFolders[key]);
+					let file = fileManager.file(path);
 					let files = await file.readDir();
 					file.destroy();
 
@@ -856,18 +839,20 @@ async function loadIndexPage(animation = true, path = false, content = false, ke
 		}
 
 		// Get comics in library
-		let comicsStorage = storage.get('comics');
+		let comicsStorage = relative.get('comics');
 
 		if(!isEmpty(comicsStorage) && !_indexLabel.masterFolder && !_indexLabel.server)
 		{
-			for(let key in comicsStorage)
+			for(const comic of comicsStorage)
 			{
-				if(!comicPaths.has(comicsStorage[key].path) && fs.existsSync(comicsStorage[key].path))
+				const path = comic.path;
+
+				if(!comicPaths.has(path) && fs.existsSync(path))
 				{
-					comicsStorage[key].name = metadataPathName(comicsStorage[key]);
-					comics.push(comicsStorage[key]);
+					comic.name = metadataPathName(comic);
+					comics.push(comic);
 
-					comicPaths.add(comicsStorage[key].path);
+					comicPaths.add(path);
 				}
 			}
 		}
@@ -878,15 +863,15 @@ async function loadIndexPage(animation = true, path = false, content = false, ke
 			const labelsPath = [];
 
 			// Favorites
-			const favorites = storage.get('favorites');
+			const favorites = relative.get('favorites');
 
 			for(let path in favorites)
 			{
 				labelsPath.push(path);
 			}
 
 			// Labels
-			const comicLabels = storage.get('comicLabels');
+			const comicLabels = relative.get('comicLabels');
 
 			for(let path in comicLabels)
 			{
@@ -927,7 +912,7 @@ async function loadIndexPage(animation = true, path = false, content = false, ke
 		{
 			if(_indexLabel.favorites)
 			{
-				let favorites = storage.get('favorites');
+				let favorites = relative.get('favorites');
 				let _comics = [];
 
 				for(let i = 0; i < len; i++)
@@ -944,7 +929,7 @@ async function loadIndexPage(animation = true, path = false, content = false, ke
 				let labels = storage.get('labels') || [];
 				let label = labels[_indexLabel.index] || false;
 
-				let comicLabels = storage.get('comicLabels');
+				let comicLabels = relative.get('comicLabels');
 				let _comics = [];
 
 				for(let i = 0; i < len; i++)
@@ -967,7 +952,7 @@ async function loadIndexPage(animation = true, path = false, content = false, ke
 		if(len)
 		{
 			// Comic reading progress
-			let readingProgress = storage.get('readingProgress');
+			let readingProgress = relative.get('readingProgress');
 
 			for(let i = 0; i < len; i++)
 			{
@@ -1123,21 +1108,22 @@ async function loadIndexPage(animation = true, path = false, content = false, ke
 function loadIndexContentLeft(animation)
 {
 	// Master folders
-	let masterFolders = storage.get('masterFolders');
+	let masterFolders = relative.get('masterFolders');
 
-	let _masterFolders = [];
+	masterFolders = masterFolders.map(function(path, i) {
 
-	for(let i = 0, len = masterFolders.length; i < len; i++)
-	{
-		_masterFolders.push({
+		path = path;
+
+		return {
 			id: 'master-folder-'+i,
 			key: i,
-			name: p.basename(masterFolders[i]),
-			path: masterFolders[i],
-		});
-	}
+			name: p.basename(path),
+			path: path,
+		};
+
+	});
 
-	_masterFolders.sort(function(a, b){
+	masterFolders.sort(function(a, b){
 
 		if(a.name === b.name)
 			return 0;
@@ -1146,7 +1132,7 @@ function loadIndexContentLeft(animation)
 
 	});
 
-	handlebarsContext.masterFolders = _masterFolders;
+	handlebarsContext.masterFolders = masterFolders;
 
 	// Labels
 	let labels = storage.get('labels');
@@ -2427,7 +2413,7 @@ async function comicContextMenu(path, mainPath, fromIndex = true, fromIndexNotMa
 
 	if(fromIndex || folder)
 	{
-		let favorites = storage.get('favorites');
+		let favorites = relative.get('favorites');
 		let isFavorte = favorites[path] ? true : false;
 
 		favorite.style.display = 'block';
@@ -2596,6 +2582,7 @@ async function comicContextMenu(path, mainPath, fromIndex = true, fromIndexNotMa
 // Remove the comic from OpenComic
 function removeComic(path, confirm = false, reload = true)
 {
+	path = relative.path(path);
 	var _comics = [], comics = storage.get('comics');
 
 	for(let i in comics)

scripts/dom/file-info.js

@@ -135,7 +135,7 @@ async function show(path, opds = false)
 
 		metadata.size = '<span class="file-info-size">...</span>';
 
-		let readingProgress = storage.get('readingProgress');
+		let readingProgress = relative.get('readingProgress');
 		readingProgress = readingProgress[path] || false;
 
 		if(readingProgress)

scripts/dom/labels.js

@@ -7,6 +7,7 @@ function masterFolder(folder, index)
 
 function setFavorite(path)
 {
+	path = relative.path(path);
 	let favorites = storage.get('favorites');
 
 	if(favorites[path])
@@ -162,8 +163,8 @@ function filterList(comics, filter = {favorites: false, labels: false, withoutLa
 	if(!filter.favorites && !filter.labels && !filter.withoutLabels)
 		return comics;
 
-	const favorites = storage.get('favorites');
-	const comicLabels = storage.get('comicLabels');
+	const favorites = relative.get('favorites');
+	const comicLabels = relative.get('comicLabels');
 
 	return comics.filter(function(comic){
 
@@ -295,9 +296,9 @@ function setLabels(path, save = false)
 	}
 	else
 	{
-		labelsDialogPath = path;
+		labelsDialogPath = relative.path(path);
 
-		const comicLabels = storage.get('comicLabels');
+		const comicLabels = relative.get('comicLabels');
 		const labels = getLabels(comicLabels[path] || []);
 
 		handlebarsContext.labels = labels;
@@ -652,7 +653,7 @@ function getName(indexLabel, recentlyOpened)
 
 function has(path, parents = false)
 {
-	const comicLabels = storage.get('comicLabels');
+	const comicLabels = relative.get('comicLabels');
 
 	if(comicLabels[path])
 		return comicLabels[path];

scripts/migration.js

@@ -374,6 +374,26 @@ function migrateSeparateOrderOfBrowsingAndReading(data)
 	return data;
 }
 
+function migrateBookmarksPath(data)
+{
+	console.time('Migration: bookmarksPath');
+
+	for(const path in data.bookmarks)
+	{
+		if(data.bookmarks[path] && data.bookmarks[path].length)
+		{
+			for(const bookmark of data.bookmarks[path])
+			{
+				bookmark.path = p.relative(path, bookmark.path);
+			}
+		}
+	}
+
+	console.timeEnd('Migration: bookmarksPath');
+
+	return data;
+}
+
 function start(data)
 {
 	let changes = data.config.changes;
@@ -416,6 +436,9 @@ function start(data)
 	if(changes < 128) // Separate order of browsing and reading
 		data = migrateSeparateOrderOfBrowsingAndReading(data);
 
+	if(changes < 131) // Bookmarks path
+		data = migrateBookmarksPath(data);
+
 	data = opds.addNewDefaultCatalogs(data, changes);
 
 	return data;

scripts/opds.js

@@ -876,7 +876,7 @@ async function boxes(path = false, mainPath = false)
 		if(len)
 		{
 			// Comic reading progress
-			let readingProgress = storage.get('readingProgress');
+			let readingProgress = relative.get('readingProgress');
 
 			for(let i = 0; i < len; i++)
 			{