New: Search and filter in library/browsing

ollm · Oct 5, 2023 · 8393903 · 8393903
1 parent 7507563
commit 8393903
Show file tree

Hide file tree

Showing 26 changed files with 802 additions and 12 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -17,7 +17,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 - Buttons in library to go next and prev chapter [`c41ecde`](https://github.com/ollm/OpenComic/commit/c41ecde33a3b0b2361b9ccdcbec92d848b48077d)
 - Adjust the brightness, saturation, contrast, sepia and colorize black and white images [`04b1caa`](https://github.com/ollm/OpenComic/commit/04b1caa5d28a468df6e94893bd943518da762030)
 - Master folder support from settings [`9edd70e`](https://github.com/ollm/OpenComic/commit/9edd70ec871855cf2b43fa5cebea4bdf83baae7f)
-- Ignore single folders
+- Ignore single folders in browsing [`7507563`](https://github.com/ollm/OpenComic/commit/75075631fcad5fb269427c178e9bac86bc352971)
+- Search and filter in library/browsing
 
 ##### 🐛 Bug Fixes
 

diff --git a/languages/ca.json b/languages/ca.json
@@ -38,6 +38,8 @@
 		"addToLibrary": "Afegir a la biblioteca",
 		"unsupportedFile": "L'arxiu no és compatible",
 		"reload": "Recarregar",
+		"search": "Cerca",
+		"filterCurrentPage": "Filtra la pàgina actual",
 		"language": "Idioma",
 		"settings": "Configuració",
 		"theme": "Tema",

diff --git a/languages/cs.json b/languages/cs.json
@@ -38,6 +38,8 @@
 		"addToLibrary": "",
 		"unsupportedFile": "",
 		"reload": "",
+		"search": "",
+		"filterCurrentPage": "",
 		"language": "Jazyk",
 		"settings": "",
 		"theme": "Vzhled",

diff --git a/languages/de.json b/languages/de.json
@@ -38,6 +38,8 @@
 		"addToLibrary": "",
 		"unsupportedFile": "",
 		"reload": "",
+		"search": "",
+		"filterCurrentPage": "",
 		"language": "Sprache",
 		"settings": "",
 		"theme": "Thema",

diff --git a/languages/en.json b/languages/en.json
@@ -38,6 +38,8 @@
 		"addToLibrary": "Add to library",
 		"unsupportedFile": "The file is not supported",
 		"reload": "Reload",
+		"search": "Search",
+		"filterCurrentPage": "Filter current page",
 		"language": "Language",
 		"settings": "Settings",
 		"theme": "Theme",

diff --git a/languages/es.json b/languages/es.json
@@ -38,6 +38,8 @@
 		"addToLibrary": "Añadir a la biblioteca",
 		"unsupportedFile": "El archivo no es compatible",
 		"reload": "Recargar",
+		"search": "Buscar",
+		"filterCurrentPage": "Filtrar la página actual",
 		"language": "Idioma",
 		"settings": "Ajustes",
 		"theme": "Tema",

diff --git a/languages/fr.json b/languages/fr.json
@@ -38,6 +38,8 @@
 		"addToLibrary": "",
 		"unsupportedFile": "",
 		"reload": "",
+		"search": "",
+		"filterCurrentPage": "",
 		"language": "Langues",
 		"settings": "",
 		"theme": "Theme",

diff --git a/languages/hu.json b/languages/hu.json
@@ -38,6 +38,8 @@
 		"addToLibrary": "",
 		"unsupportedFile": "",
 		"reload": "",
+		"search": "",
+		"filterCurrentPage": "",
 		"language": "Nyelv",
 		"settings": "",
 		"theme": "Téma",

diff --git a/languages/it.json b/languages/it.json
@@ -38,6 +38,8 @@
 		"addToLibrary": "",
 		"unsupportedFile": "",
 		"reload": "",
+		"search": "",
+		"filterCurrentPage": "",
 		"language": "Lingua",
 		"settings": "",
 		"theme": "Tema",

diff --git a/languages/ja.json b/languages/ja.json
@@ -38,6 +38,8 @@
 		"addToLibrary": "",
 		"unsupportedFile": "",
 		"reload": "",
+		"search": "",
+		"filterCurrentPage": "",
 		"language": "言語",
 		"settings": "",
 		"theme": "テーマ",

diff --git a/languages/pt-br.json b/languages/pt-br.json
@@ -38,6 +38,8 @@
 		"addToLibrary": "",
 		"unsupportedFile": "",
 		"reload": "",
+		"search": "",
+		"filterCurrentPage": "",
 		"language": "Linguagem",
 		"settings": "",
 		"theme": "Tema",

diff --git a/languages/ru.json b/languages/ru.json
@@ -38,6 +38,8 @@
 		"addToLibrary": "",
 		"unsupportedFile": "",
 		"reload": "",
+		"search": "",
+		"filterCurrentPage": "",
 		"language": "Язык",
 		"settings": "",
 		"theme": "Тема",

diff --git a/languages/vi.json b/languages/vi.json
@@ -38,6 +38,8 @@
 		"addToLibrary": "",
 		"unsupportedFile": "",
 		"reload": "",
+		"search": "",
+		"filterCurrentPage": "",
 		"language": "Ngôn ngữ",
 		"settings": "",
 		"theme": "Chủ đề",

diff --git a/languages/zh-hans.json b/languages/zh-hans.json
@@ -38,6 +38,8 @@
 		"addToLibrary": "",
 		"unsupportedFile": "",
 		"reload": "",
+		"search": "",
+		"filterCurrentPage": "",
 		"language": "语言",
 		"settings": "",
 		"theme": "主题",

diff --git a/languages/zh-hant.json b/languages/zh-hant.json
@@ -38,6 +38,8 @@
 		"addToLibrary": "",
 		"unsupportedFile": "",
 		"reload": "",
+		"search": "",
+		"filterCurrentPage": "",
 		"language": "語言",
 		"settings": "",
 		"theme": "圖形介面",

diff --git a/scripts/dom.js b/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'));
+	domManager = require(p.join(appDir, 'scripts/dom/dom.js')),
+	search = require(p.join(appDir, 'scripts/dom/search.js'));
 
 /*Page - Index*/
 
@@ -160,7 +161,7 @@ function addImageToDom(querySelector, path, animation = true)
 	let src = dom.queryAll('.fi-sha-'+querySelector+' img, .sha-'+querySelector+' img, img.fi-sha-'+querySelector).setAttribute('src', path);
 
 	let ri = dom.queryAll('.ri-sha-'+querySelector).setAttribute('src', path);
-	let cr = dom.queryAll('.continue-reading-sha-'+querySelector).css({backgroundImage: backgroundImage});
+	let cr = dom.queryAll('.continue-reading-sha-'+querySelector+', .search-result-sha-'+querySelector).css({backgroundImage: backgroundImage});
 
 	if(animation)
 	{
@@ -1433,6 +1434,7 @@ module.exports = {
 	indexPathControlUpdateLastComic: indexPathControlUpdateLastComic,
 	indexMainPathA: function(){return indexMainPathA},
 	currentPathScrollTop: function(){return currentPathScrollTop},
+	search: search,
 	this: domManager.this,
 	query: domManager.query,
 	queryAll: domManager.queryAll,