New: Label to display only the contents of a master folder

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
 
-- Option to set maximum size of temporary files, preserving them when closing the app
+- Option to set maximum size of temporary files, preserving them when closing the app [`a727249`](https://github.com/ollm/OpenComic/commit/a7272499407191064f9d6bd7c42ecf3bb1231a83)
+- Label to display only the contents of a master folder
 
 ##### 🐛 Bug Fixes
 

README.md

@@ -12,7 +12,7 @@
 
 <div align="center">
 
-[Screenshots](https://github.com/ollm/OpenComic/blob/master/SCREENSHOTS.MD) | [Features](#features) | [Changelog](https://github.com/ollm/OpenComic/blob/master/CHANGELOG.md) | [Download](#download-beta-v100-beta5)
+[Screenshots](https://github.com/ollm/OpenComic/blob/master/SCREENSHOTS.MD) | [Features](#features) | [Changelog](https://github.com/ollm/OpenComic/blob/master/CHANGELOG.md) | [Download](#download-v100)
 
 </div>
 

scripts/dom.js

@@ -1,5 +1,6 @@
 const domPoster = require(p.join(appDir, 'scripts/dom/poster.js')),
 	domManager = require(p.join(appDir, 'scripts/dom/dom.js')),
+	labels = require(p.join(appDir, 'scripts/dom/labels.js')),
 	search = require(p.join(appDir, 'scripts/dom/search.js'));
 
 /*Page - Index*/
@@ -338,6 +339,13 @@ async function reloadIndex()
 	if(indexPathA) indexPathControlA.pop();
 }
 
+var indexLabel = {};
+
+function setIndexLabel(config)
+{
+	indexLabel = config;
+}
+
 var currentPath = false, currentPathScrollTop = [], fromDeepLoadNow = 0;
 
 async function loadIndexPage(animation = true, path = false, content = false, keepScroll = false, mainPath = false, fromGoBack = false, notAutomaticBrowsing = false, fromDeepLoad = false)
@@ -359,6 +367,9 @@ async function loadIndexPage(animation = true, path = false, content = false, ke
 	if(currentPathScrollTop[path === false ? 0 : path])
 		keepScroll = currentPathScrollTop[path === false ? 0 : path];
 
+	let _indexLabel = indexLabel;
+	indexLabel = {};
+
 	currentPath = path;
 
 	if(!path)
@@ -410,7 +421,7 @@ async function loadIndexPage(animation = true, path = false, content = false, ke
 		{
 			for(let key in masterFolders)
 			{
-				if(fs.existsSync(masterFolders[key]))
+				if(fs.existsSync(masterFolders[key]) && (!_indexLabel.masterFolder || _indexLabel.masterFolder == masterFolders[key]))
 				{
 					let file = fileManager.file(masterFolders[key]);
 					let files = await file.readDir();
@@ -441,7 +452,7 @@ async function loadIndexPage(animation = true, path = false, content = false, ke
 		// Get comics in library
 		let comicsStorage = storage.get('comics');
 
-		if(!isEmpty(comicsStorage))
+		if(!isEmpty(comicsStorage) && !_indexLabel.masterFolder)
 		{
 			for(let key in comicsStorage)
 			{
@@ -494,7 +505,7 @@ async function loadIndexPage(animation = true, path = false, content = false, ke
 
 		if(!content)
 		{
-			if(template.contentLeft('.menu-list').length === 0) template.loadContentLeft('index.content.left.html', animation);
+			if(template.contentLeft('.menu-list').length === 0) dom.loadIndexContentLeft(animation);
 			template.loadGlobalElement('index.elements.menus.html', 'menus');
 			floatingActionButton(true, 'dom.addComicButtons();');
 		}
@@ -532,7 +543,7 @@ async function loadIndexPage(animation = true, path = false, content = false, ke
 		{
 			if(readingActive)
 			{
-				template.loadContentLeft('index.content.left.html', animation);
+				dom.loadIndexContentLeft(animation);
 			}
 
 			template.loadGlobalElement('index.elements.menus.html', 'menus');
@@ -627,15 +638,40 @@ async function loadIndexPage(animation = true, path = false, content = false, ke
 	if(readingActive)
 		readingActive = false;
 
-	if(!isFromRecentlyOpened)
-		selectMenuItem('library');
-	else
-		selectMenuItem('recently-opened');
+	if(isEmpty(_indexLabel))
+	{
+		if(!isFromRecentlyOpened)
+			selectMenuItem('library');
+		else
+			selectMenuItem('recently-opened');
+	}
 
 	shortcuts.register('browse');
 	gamepad.updateBrowsableItems(path ? sha1(path) : 'library');
 }
 
+function loadIndexContentLeft(animation, isFromSettings = false)
+{
+	let masterFolders = storage.get('masterFolders');
+
+	let _masterFolders = [];
+
+	for(let i = 0, len = masterFolders.length; i < len; i++)
+	{
+		_masterFolders.push({
+			name: p.basename(masterFolders[i]),
+			path: masterFolders[i],
+		});
+	}
+
+	handlebarsContext.masterFolders = _masterFolders;
+	handlebarsContext.isFromSettings = isFromSettings;
+
+	template.loadContentLeft('index.content.left.html', animation);
+
+	handlebarsContext.isFromSettings = false;
+}
+
 function compressedError(error)
 {
 	//console.log(error);
@@ -1064,7 +1100,7 @@ function changeLanguage(lan)
 	template.contentRight('.language-list.active').removeClass('active');
 	template.contentRight('.language-list-'+lan).addClass('active');
 
-	template.loadContentLeft('index.content.left.html', false);
+	dom.loadIndexContentLeft(false);
 	template.loadHeader('languages.header.html', false);
 	storage.updateVar('config', 'language', lan);
 
@@ -1661,12 +1697,15 @@ gamepad.setButtonEvent('reading', 1, function(key, button) {
 
 module.exports = {
 	loadIndexPage: loadIndexPage,
+	loadIndexContentLeft: loadIndexContentLeft,
+	setIndexLabel: setIndexLabel,
 	reloadIndex: reloadIndex,
 	loadRecentlyOpened: loadRecentlyOpened,
 	loadLanguagesPage: loadLanguagesPage,
 	loadSettingsPage: loadSettingsPage,
 	loadThemePage: loadThemePage,
 	changeLanguage: changeLanguage,
+	selectMenuItem: selectMenuItem,
 	floatingActionButton: floatingActionButton,
 	setCurrentPageVars: setCurrentPageVars,
 	changeView: changeView,
@@ -1699,6 +1738,7 @@ module.exports = {
 	metadataPathName: metadataPathName,
 	fromLibrary: fromLibrary,
 	search: search,
+	labels: labels,
 	this: domManager.this,
 	query: domManager.query,
 	queryAll: domManager.queryAll,

scripts/dom/labels.js

@@ -0,0 +1,11 @@
+
+function masterFolder(folder, index)
+{
+	dom.selectMenuItem('master-folder-'+index);
+	dom.setIndexLabel({masterFolder: folder});
+	dom.loadIndexPage(true);
+}
+
+module.exports = {
+	masterFolder: masterFolder,
+};

scripts/opencomic.js

@@ -341,8 +341,8 @@ async function startApp()
 
 	template.loadContentRight('index.content.right.empty.html', false);
 	template.loadHeader('index.header.html', false);
-	template.loadContentLeft('index.content.left.html', false);
 	template.loadGlobalElement('index.elements.menus.html', 'menus');
+	dom.loadIndexContentLeft(false);
 
 	if(!toOpenFile)
 	{
@@ -940,6 +940,20 @@ hb.registerHelper('compare', function(lvalue, operator, rvalue, options) {
 
 });
 
+hb.registerHelper('ifOr', function() {
+
+	let options = arguments[arguments.length - 1];
+
+	for(let i = 0, len = arguments.length - 1; i < len; i++)
+	{
+		if(!playmax.empty(arguments[i]))
+			return options.fn(this);
+	}
+
+	return options.inverse(this);
+
+});
+
 hb.registerHelper('for', function(from, to, incr, options) {
 
 	var accum = '';

scripts/recently-opened.js

@@ -126,7 +126,7 @@ async function load(animation = true, content = false)
 
 	if(!content)
 	{
-		if(template.contentLeft('.menu-list').length === 0) template.loadContentLeft('index.content.left.html', animation);
+		if(template.contentLeft('.menu-list').length === 0) dom.loadIndexContentLeft(animation);
 		template.loadGlobalElement('index.elements.menus.html', 'menus');
 		dom.floatingActionButton(false);
 	}

scripts/settings.js

@@ -202,6 +202,7 @@ function removeMasterFolder(key)
 		storage.set('masterFolders', masterFolders);
 
 		updateMasterFolders();
+		dom.loadIndexContentLeft(true, true);
 	}
 }
 
@@ -224,6 +225,7 @@ function addMasterFolder()
 				storage.set('masterFolders', masterFolders);
 
 				updateMasterFolders();
+				dom.loadIndexContentLeft(true, true);
 			}
 		}
 

templates/index.content.left.html

@@ -1,6 +1,6 @@
 
 <div class="menu-list">
-	<div class="menu-item menu-item-library body-medium gamepad-item{{#unless isFromRecentlyOpened}} active{{/unless}}" onclick="dom.loadIndexPage(true);">
+	<div class="menu-item menu-item-library body-medium gamepad-item{{#unless isFromRecentlyOpened}}{{#unless isFromSettings}} active{{/unless}}{{/unless}}" onclick="dom.loadIndexPage(true);">
 		<div class="icon-24 material-icon">book</div>
 		{{language.global.library}}
 	</div>
@@ -10,6 +10,19 @@
 		{{language.global.recents}}
 	</div>
 
+	{{#if masterFolders}}
+
+		<div class="separator-2" style="width: calc(100% + 12px);"></div>
+
+		{{#each masterFolders}}
+		<div class="menu-item menu-item-master-folder-{{@key}} body-medium gamepad-item" onclick="dom.labels.masterFolder('{{chain 'escapeBackSlash' 'escapeQuotesSimples' path}}', {{@key}});">
+			<div class="icon-24 material-icon">folder</div>
+			{{name}}
+		</div>
+		{{/each}}
+
+	{{/if}}
+
 	<div class="separator-2" style="width: calc(100% + 12px);"></div>
 
 	<div class="menu-item menu-item-language body-medium gamepad-item" onclick="dom.loadLanguagesPage();">
@@ -22,7 +35,7 @@
 		{{language.global.theme}}
 	</div>
 
-	<div class="menu-item menu-item-settings body-medium gamepad-item" onclick="dom.loadSettingsPage();">
+	<div class="menu-item menu-item-settings body-medium gamepad-item{{#if isFromSettings}} active{{/if}}" onclick="dom.loadSettingsPage();">
 		<div class="icon-24 material-icon">settings</div>
 		{{language.global.settings}}
 	</div>