From 0abcb048b410dec41fd1b213dec01a03ebe7ddea Mon Sep 17 00:00:00 2001
From: Alocks <alocksmasao@gmail.com>
Date: Mon, 2 Dec 2019 16:46:22 -0300
Subject: [PATCH 01/10] filter for main page(1/2)

---
 nhentai/utils.py         | 18 +++++++++++++-----
 nhentai/viewer/main.css  | 37 +++++++++++++++++++++++++++++++++----
 nhentai/viewer/main.html |  9 +++++----
 nhentai/viewer/main.js   |  0
 4 files changed, 51 insertions(+), 13 deletions(-)
 create mode 100644 nhentai/viewer/main.js

diff --git a/nhentai/utils.py b/nhentai/utils.py
index 4af629d..ce7033c 100644
--- a/nhentai/utils.py
+++ b/nhentai/utils.py
@@ -94,7 +94,7 @@ def generate_html(output_dir='.', doujinshi_obj=None):
         with open(os.path.join(doujinshi_dir, 'metadata.json'), 'w') as f:
             json.dump(metadata, f, separators=','':')
     else:
-        metadata= {'Title': 'nHentai HTML Viewer'}
+        metadata = {'Title': 'nHentai HTML Viewer'}
 
     data = html.format(TITLE=metadata['Title'], IMAGES=image_html, SCRIPTS=js, STYLES=css)
     try:
@@ -117,10 +117,11 @@ def generate_main_html(output_dir='./'):
     Default output folder will be the CLI path.
     """
 
-    count = 0
     image_html = ''
     main = readfile('viewer/main.html')
     css = readfile('viewer/main.css')
+    js = readfile('viewer/main.js')
+
     element = '\n\
             <div class="gallery-favorite">\n\
                 <div class="gallery">\n\
@@ -133,18 +134,24 @@ def generate_main_html(output_dir='./'):
 
     os.chdir(output_dir)
     doujinshi_dirs = next(os.walk('.'))[1]
+    database = open('data.js', 'w')
+    database.write("var data = JSON.parse('[")
 
     for folder in doujinshi_dirs:
-
+        folder_json = ',"Folder":"'+folder+'"}'
         files = os.listdir(folder)
         files.sort()
 
         if 'index.html' in files:
-            count += 1
             logger.info('Add doujinshi \'{}\''.format(folder))
         else:
             continue
 
+        database.write(open(output_dir + folder + '/' + files[-1], 'r').read()[:-2]+folder_json)
+        if folder != doujinshi_dirs[-1]:
+            database.write(",'+\n'")
+        else:
+            database.write("]')")
         image = files[0]  # 001.jpg or 001.png
         if folder is not None:
             title = folder.replace('_', ' ')
@@ -153,11 +160,12 @@ def generate_main_html(output_dir='./'):
 
         image_html += element.format(FOLDER=folder, IMAGE=image, TITLE=title)
 
+    database.close()
     if image_html == '':
         logger.warning('None index.html found, --gen-main paused.')
         return
     try:
-        data = main.format(STYLES=css, COUNT=count, PICTURE=image_html)
+        data = main.format(STYLES=css, SCRIPTS=js, PICTURE=image_html)
         if sys.version_info < (3, 0):
             with open('./main.html', 'w') as f:
                 f.write(data)
diff --git a/nhentai/viewer/main.css b/nhentai/viewer/main.css
index 60494e3..dc63203 100644
--- a/nhentai/viewer/main.css
+++ b/nhentai/viewer/main.css
@@ -13,7 +13,7 @@ body {
 
 h1 {
     font-size: 2em;
-    margin: .67em 0
+    margin: .67em 0;
 }
 
 a {
@@ -130,14 +130,14 @@ blockquote {
 .container {
     display: block;
     clear: both;
-    margin-left: auto;
+    margin-left: 200px;
     margin-right: auto;
     margin-bottom: 10px;
     margin-top: 10px;
     padding: 10px;
     border-radius: 9px;
     background-color: #ecf0f1;
-    width: 100%;
+    width: 100% - 200px;
     max-width: 1200px
 }
 
@@ -222,6 +222,35 @@ blockquote {
     width: 100%
 }
 
+.sidenav {
+  height: 100%;
+  width: 200px;
+  position: absolute;
+  z-index: 1;
+  top: 0;
+  left: 0;
+  background-color: #111;
+  overflow-x: hidden;
+  padding-top: 20px;
+}
+
+.sidenav a {
+  padding: 6px 6px 6px 32px;
+  text-decoration: none;
+  font-size: 25px;
+  color: #818181;
+  display: block;
+}
+
+.sidenav a:hover {
+  color: #f1f1f1;
+}
+
+@media screen and (max-height: 450px) {
+  .sidenav {padding-top: 15px;}
+  .sidenav a {font-size: 18px;}
+}
+
 html.theme-black,html.theme-black body {
     color: #d9d9d9;
     background-color: #0d0d0d
@@ -252,4 +281,4 @@ html.theme-black code {
     color: #ed2553;
     border: none;
     background-color: #292929
-}
\ No newline at end of file
+}
diff --git a/nhentai/viewer/main.html b/nhentai/viewer/main.html
index b966780..410f8a2 100644
--- a/nhentai/viewer/main.html
+++ b/nhentai/viewer/main.html
@@ -6,6 +6,7 @@
     <meta name="theme-color" content="#1f1f1f" />
     <meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=yes, viewport-fit=cover" />
     <title>nHentai &raquo; Viewer</title>
+    <script type="text/javascript" src="data.js"></script>
         <!-- <link rel="stylesheet" href="./main.css"> -->
 <style>
 {STYLES}
@@ -14,9 +15,7 @@
 
 <body>
     <div id="content">
-
-        <h1>Main Folder({COUNT})</h1>
-
+        <nav class="sidenav">nHentai Viewer</nav>
         <div class="container" id="favcontainer">
 
             {PICTURE}
@@ -24,7 +23,9 @@
         </div> <!-- container -->
 
     </div>
-
+<script>
+    {SCRIPTS}
+</script>
 </body>
 
 </html>
\ No newline at end of file
diff --git a/nhentai/viewer/main.js b/nhentai/viewer/main.js
new file mode 100644
index 0000000..e69de29

From bd8bb42ecd3da4c30233eba41bf0a1f7c92abd23 Mon Sep 17 00:00:00 2001
From: Alocks <alocksmasao@gmail.com>
Date: Wed, 4 Dec 2019 00:45:14 -0300
Subject: [PATCH 02/10] main page filter(1/2)

---
 nhentai/serializer.py    |  79 +++++++++++---
 nhentai/utils.py         |  31 ++----
 nhentai/viewer/main.css  | 216 ++++++++++++++++++++++++++++++++++-----
 nhentai/viewer/main.html |  26 ++++-
 nhentai/viewer/main.js   |  60 +++++++++++
 5 files changed, 347 insertions(+), 65 deletions(-)

diff --git a/nhentai/serializer.py b/nhentai/serializer.py
index 5b5675c..17c62b2 100644
--- a/nhentai/serializer.py
+++ b/nhentai/serializer.py
@@ -1,24 +1,77 @@
 # coding: utf-8
+import json
+import os
 
-
-def serialize(doujinshi):
-    metadata = {'Title'    : doujinshi.name,
-                'Subtitle' : doujinshi.info.subtitle}
+def serialize(doujinshi, dir):
+    metadata = {'title'    : doujinshi.name,
+                'subtitle' : doujinshi.info.subtitle}
     if doujinshi.info.date:
-        metadata['Upload_Date'] = doujinshi.info.date
+        metadata['upload_date'] = doujinshi.info.date
     if doujinshi.info.parodies:
-        metadata['Parodies']    = [i.strip() for i in doujinshi.info.parodies.split(',')]
+        metadata['parody']    = [i.strip() for i in doujinshi.info.parodies.split(',')]
     if doujinshi.info.characters:
-        metadata['Characters']  = [i.strip() for i in doujinshi.info.characters.split(',')]
+        metadata['character']  = [i.strip() for i in doujinshi.info.characters.split(',')]
     if doujinshi.info.tags:
-        metadata['Tags']        = [i.strip() for i in doujinshi.info.tags.split(',')]
+        metadata['tag']        = [i.strip() for i in doujinshi.info.tags.split(',')]
     if doujinshi.info.artists:
-        metadata['Artists']     = [i.strip() for i in doujinshi.info.artists.split(',')]
+        metadata['artist']     = [i.strip() for i in doujinshi.info.artists.split(',')]
     if doujinshi.info.groups:
-        metadata['Groups']      = [i.strip() for i in doujinshi.info.groups.split(',')]
+        metadata['group']      = [i.strip() for i in doujinshi.info.groups.split(',')]
     if doujinshi.info.languages:
-        metadata['Languages']   = [i.strip() for i in doujinshi.info.languages.split(',')]
-    metadata['Categories']      = doujinshi.info.categories
+        metadata['language']   = [i.strip() for i in doujinshi.info.languages.split(',')]
+    metadata['category']      = doujinshi.info.categories
     metadata['URL']             = doujinshi.url
     metadata['Pages']           = doujinshi.pages
-    return metadata
+    with open(os.path.join(dir, 'metadata.json'), 'w') as f:
+        json.dump(metadata, f, separators=','':')
+
+
+def merge_json():
+    lst = []
+    output_dir = "./"
+    os.chdir(output_dir)
+    doujinshi_dirs = next(os.walk('.'))[1]
+    for folder in doujinshi_dirs:
+        folder_json = ',"Folder":"' + folder + '"}'
+        files = os.listdir(folder)
+        if 'metadata.json' not in files:
+            continue
+        data_folder = output_dir + folder + '/' + 'metadata.json'
+        json_file = open(data_folder, encoding='raw_unicode_escape').read()[:-2]+folder_json
+        lst.append(json.loads(json_file.encode('raw_unicode_escape').decode()))
+    return lst
+
+
+def serialize_unique(lst):
+    dictionary = {}
+    parody = []
+    character = []
+    tag = []
+    artist = []
+    group = []
+    for dic in lst:
+        if dic['parody']:
+            parody.extend([i for i in dic['parody']])
+        if dic['character']:
+            character.extend([i for i in dic['character']])
+        if dic['tag']:
+            tag.extend([i for i in dic['tag']])
+        if dic['artist']:
+            artist.extend([i for i in dic['artist']])
+        if dic['group']:
+            group.extend([i for i in dic['group']])
+    dictionary['parody'] = list(set(parody))
+    dictionary['character'] = list(set(character))
+    dictionary['tag'] = list(set(tag))
+    dictionary['artist'] = list(set(artist))
+    dictionary['group'] = list(set(group))
+    return dictionary
+
+
+def set_js_database():
+    with open('data.js', 'w') as f:
+        indexed_json = merge_json()
+        unique_json = json.dumps(serialize_unique(indexed_json), separators=','':')
+        indexed_json = json.dumps(indexed_json, separators=','':')
+        f.write('var data = '+indexed_json)
+        f.write(';\nvar tags = '+unique_json)
diff --git a/nhentai/utils.py b/nhentai/utils.py
index ce7033c..16f8bdf 100644
--- a/nhentai/utils.py
+++ b/nhentai/utils.py
@@ -4,7 +4,6 @@ from __future__ import unicode_literals, print_function
 import sys
 import re
 import os
-import json
 import string
 import zipfile
 import shutil
@@ -12,7 +11,7 @@ import requests
 
 from nhentai import constant
 from nhentai.logger import logger
-from nhentai.serializer import serialize
+from nhentai.serializer import serialize, set_js_database
 
 
 def request(method, url, **kwargs):
@@ -81,22 +80,19 @@ def generate_html(output_dir='.', doujinshi_obj=None):
 
         image_html += '<img src="{0}" class="image-item"/>\n'\
             .format(image)
-
     html = readfile('viewer/index.html')
     css = readfile('viewer/styles.css')
     js = readfile('viewer/scripts.js')
 
     if doujinshi_obj is not None:
-        metadata = serialize(doujinshi_obj)
+        serialize(doujinshi_obj, doujinshi_dir)
+        name = doujinshi_obj.name
         if sys.version_info < (3, 0):
-            metadata['Title'] = doujinshi_obj.name.encode('utf-8')
-            metadata['Subtitle'] = doujinshi_obj.info.subtitle.encode('utf-8')
-        with open(os.path.join(doujinshi_dir, 'metadata.json'), 'w') as f:
-            json.dump(metadata, f, separators=','':')
+            name = doujinshi_obj.name.encode('utf-8')
     else:
-        metadata = {'Title': 'nHentai HTML Viewer'}
+        name = {'title': 'nHentai HTML Viewer'}
 
-    data = html.format(TITLE=metadata['Title'], IMAGES=image_html, SCRIPTS=js, STYLES=css)
+    data = html.format(TITLE=name, IMAGES=image_html, SCRIPTS=js, STYLES=css)
     try:
         if sys.version_info < (3, 0):
             with open(os.path.join(doujinshi_dir, 'index.html'), 'w') as f:
@@ -118,6 +114,7 @@ def generate_main_html(output_dir='./'):
     """
 
     image_html = ''
+
     main = readfile('viewer/main.html')
     css = readfile('viewer/main.css')
     js = readfile('viewer/main.js')
@@ -134,11 +131,8 @@ def generate_main_html(output_dir='./'):
 
     os.chdir(output_dir)
     doujinshi_dirs = next(os.walk('.'))[1]
-    database = open('data.js', 'w')
-    database.write("var data = JSON.parse('[")
 
     for folder in doujinshi_dirs:
-        folder_json = ',"Folder":"'+folder+'"}'
         files = os.listdir(folder)
         files.sort()
 
@@ -147,11 +141,6 @@ def generate_main_html(output_dir='./'):
         else:
             continue
 
-        database.write(open(output_dir + folder + '/' + files[-1], 'r').read()[:-2]+folder_json)
-        if folder != doujinshi_dirs[-1]:
-            database.write(",'+\n'")
-        else:
-            database.write("]')")
         image = files[0]  # 001.jpg or 001.png
         if folder is not None:
             title = folder.replace('_', ' ')
@@ -159,8 +148,6 @@ def generate_main_html(output_dir='./'):
             title = 'nHentai HTML Viewer'
 
         image_html += element.format(FOLDER=folder, IMAGE=image, TITLE=title)
-
-    database.close()
     if image_html == '':
         logger.warning('None index.html found, --gen-main paused.')
         return
@@ -172,6 +159,8 @@ def generate_main_html(output_dir='./'):
         else:
             with open('./main.html', 'wb') as f:
                 f.write(data.encode('utf-8'))
+        shutil.copy(os.path.dirname(__file__)+'/viewer/logo.png', './')
+        set_js_database()
         logger.log(
             15, 'Main Viewer has been write to \'{0}main.html\''.format(output_dir))
     except Exception as e:
@@ -225,5 +214,3 @@ an invalid filename.
 def signal_handler(signal, frame):
     logger.error('Ctrl-C signal received. Stopping...')
     exit(1)
-
-
diff --git a/nhentai/viewer/main.css b/nhentai/viewer/main.css
index dc63203..bf4100c 100644
--- a/nhentai/viewer/main.css
+++ b/nhentai/viewer/main.css
@@ -1,7 +1,6 @@
 /*! normalize.css v5.0.0 | MIT License | github.com/necolas/normalize.css */
 /* Original from https://static.nhentai.net/css/main_style.9bb9b703e601.css */
 html {
-    font-family: sans-serif;
     line-height: 1.15;
     -ms-text-size-adjust: 100%;
     -webkit-text-size-adjust: 100%
@@ -21,10 +20,6 @@ a {
     -webkit-text-decoration-skip: objects
 }
 
-a:active,a:hover {
-    outline-width: 0
-}
-
 abbr[title] {
     border-bottom: none;
     text-decoration: underline;
@@ -104,11 +99,6 @@ a {
     color: #34495e
 }
 
-a:hover {
-    text-decoration: none;
-    color: #ed2553
-}
-
 a.count {
     color: #999
 }
@@ -130,15 +120,15 @@ blockquote {
 .container {
     display: block;
     clear: both;
-    margin-left: 200px;
-    margin-right: auto;
-    margin-bottom: 10px;
-    margin-top: 10px;
-    padding: 10px;
+    margin-left: 15rem;
+    margin-right: 0.5rem;
+    margin-bottom: 5px;
+    margin-top: 5px;
+    padding: 4px;
     border-radius: 9px;
     background-color: #ecf0f1;
-    width: 100% - 200px;
-    max-width: 1200px
+    width: 100% - 15rem;
+    max-width: 1500px
 }
 
 .gallery,.gallery-favorite,.thumb-container {
@@ -156,7 +146,6 @@ blockquote {
     .gallery,.gallery-favorite,.thumb-container {
         width:19%;
         margin: 3px;
-        margin-bottom: 8px
     }
 }
 
@@ -224,31 +213,202 @@ blockquote {
 
 .sidenav {
   height: 100%;
-  width: 200px;
-  position: absolute;
+  width: 15rem;
+  position: fixed;
   z-index: 1;
   top: 0;
   left: 0;
-  background-color: #111;
-  overflow-x: hidden;
+  background-color: #0d0d0d;
+  overflow: hidden;
+
   padding-top: 20px;
+  -webkit-touch-callout: none; /* iOS Safari */
+  -webkit-user-select: none; /* Safari */
+  -khtml-user-select: none; /* Konqueror HTML */
+  -moz-user-select: none; /* Old versions of Firefox */
+  ms-user-select: none; /* Internet Explorer/Edge */
+  user-select: none;
 }
 
 .sidenav a {
-  padding: 6px 6px 6px 32px;
+  background-color: #eee;
+  padding: 5px 0px 5px 15px;
   text-decoration: none;
-  font-size: 25px;
-  color: #818181;
+  font-size: 15px;
+  color: #0d0d0d9;
   display: block;
+  text-align: left;
+}
+.sidenav img {
+	width:100%;
+	padding: 0px 5px 0px 5px;
+
+}
+
+.sidenav h1 {
+    font-size: 1.5em;
+	margin: 0px 0px 10px;
 }
 
 .sidenav a:hover {
-  color: #f1f1f1;
+  color: white;
+  background-color: #EC2754;
 }
 
 @media screen and (max-height: 450px) {
   .sidenav {padding-top: 15px;}
-  .sidenav a {font-size: 18px;}
+  .sidenav a {font-size: 15px;}
+}
+
+.accordion {
+  font-weight: bold;
+  background-color: #eee;
+  color: #444;
+  padding: 10px 0px 5px 8px;
+  width: 100%;
+  border: none;
+  text-align: left;
+  outline: none;
+  font-size: 15px;
+  transition: 0.4s;
+  cursor:pointer;
+}
+
+.accordion:hover {
+  background-color: #ddd;
+}
+
+.accordion.active{
+  background-color:#ddd;
+}
+
+.nav-btn {
+  font-weight: bold;
+  background-color: #eee;
+  color: #444;
+  padding: 10px 0px 5px 8px;
+  width: 100%;
+  border: none;
+  text-align: left;
+  outline: none;
+  font-size: 15px;
+  transition: 0.4s;
+}
+
+.nav-btn.hidden {
+  display:none
+}
+
+.options {
+  padding: 0px 0px 0px 0px;
+  background-color: #eee;
+  max-height: 0;
+  overflow: hidden;
+  transition: max-height 0.2s ease-out;
+  cursor:pointer;
+}
+
+.search{background-color: #eee;
+  padding-right:45px;
+  white-space: nowrap;
+  padding-top: 5px
+}
+
+.search input{
+  border-top-right-radius:10px;
+  padding-top:0;
+  padding-bottom:0;
+  font-size:1em;
+  width:100%;
+  height:38px;
+  vertical-align:top;
+}
+
+.search .btn.btn-square{
+  border-top-left-radius:10px;
+  border-bottom-left-radius:0px;
+}
+
+.fa{
+  font:normal normal normal 14px/1 FontAwesome;
+  font-size:1.33333333em;
+  line-height:.75em;
+}
+
+.fa-search:before{
+  content:"\f002";
+}
+
+.btn{
+  font-weight:700;
+  padding-right:12px;
+  padding-left:12px;
+  color:#fff;
+  border:0;
+  font-size:100%;
+  height:38px;
+  line-height:40px;
+  outline: 0;
+}
+
+.btn.btn-primary{
+  background-color:#ed2553;
+}
+
+.btn.btn-primary:active,.btn.btn-primary:focus,.btn.btn-primary:hover{
+  color:#fff;background:#f15478;
+}
+
+#tags{
+    text-align:left;
+    display: block;
+	width:15rem;
+	display: flex;
+    flex-flow: row wrap;
+    justify-content: start;
+	margin: 2px 2px 2px 0px
+}
+
+.btn-2{
+  font-weight:700;
+  padding-right:10px;
+  padding-left:10px;
+  color:#fff;
+  border:0;
+  font-size:100%;
+  height:20px;
+  outline: 0;
+  border-radius: 3px;
+  cursor: pointer;
+  margin:2px;
+}
+
+.btn-2.parody{
+  background-color: red;
+}
+
+.btn-2.character{
+  background-color: blue;
+}
+
+.btn-2.tag{
+  background-color: green;
+}
+
+.btn-2.artist{
+  background-color: fuchsia;
+}
+
+.btn-2.group{
+  background-color: teal;
+}
+
+.btn-2.hover{
+  filter: saturate(20%)
+}
+input,input:focus{
+  border:none;
+  outline:0;
 }
 
 html.theme-black,html.theme-black body {
@@ -281,4 +441,4 @@ html.theme-black code {
     color: #ed2553;
     border: none;
     background-color: #292929
-}
+}
\ No newline at end of file
diff --git a/nhentai/viewer/main.html b/nhentai/viewer/main.html
index 410f8a2..376dd70 100644
--- a/nhentai/viewer/main.html
+++ b/nhentai/viewer/main.html
@@ -5,7 +5,7 @@
     <meta charset="utf-8" />
     <meta name="theme-color" content="#1f1f1f" />
     <meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=yes, viewport-fit=cover" />
-    <title>nHentai &raquo; Viewer</title>
+    <title>nHentai Viewer</title>
     <script type="text/javascript" src="data.js"></script>
         <!-- <link rel="stylesheet" href="./main.css"> -->
 <style>
@@ -15,7 +15,29 @@
 
 <body>
     <div id="content">
-        <nav class="sidenav">nHentai Viewer</nav>
+        <nav class="sidenav">
+			<img src="logo.png">
+			<h1>nHentai Viewer</h1>
+									<button class="accordion">Language</button>
+            <div class="options" id="language">
+                    <a>English</a>
+                    <a>日本語</a>
+                    <a>中国語</a>
+            </div>
+			<button class="accordion">Category</button>
+            <div class="options" id ="category">
+                    <a>Doujinshi	</a>
+                    <a>Manga</a>
+            </div>
+			<button class="nav-btn hidden">Filters</button>
+			<div class="search">
+				<input type="search" name="q" value="" autocapitalize="none" required="">
+				<button type="submit" class="btn btn-primary btn-square">
+				<i class="fa fa-search"></i></button>
+			</div>
+			<div id="tags">
+			</div>
+		</nav>
         <div class="container" id="favcontainer">
 
             {PICTURE}
diff --git a/nhentai/viewer/main.js b/nhentai/viewer/main.js
index e69de29..9755939 100644
--- a/nhentai/viewer/main.js
+++ b/nhentai/viewer/main.js
@@ -0,0 +1,60 @@
+//------------------------------------navbar script------------------------------------
+var menu = document.getElementsByClassName("accordion");
+for (var i = 0; i < menu.length; i++) {
+  menu[i].addEventListener("click", function() {
+    var panel = this.nextElementSibling;
+    if (panel.style.maxHeight) {
+	  this.classList.toggle("active");
+      panel.style.maxHeight = null;
+    } else {
+      panel.style.maxHeight = panel.scrollHeight + "px";
+	  this.classList.toggle("active");
+    }
+  });
+}
+var language = document.getElementById("language").children;
+for (var i = 0; i < language.length; i++){
+	language[i].addEventListener("click", function() {
+		document.getElementById("language").style.maxHeight = null;
+		document.getElementsByClassName("accordion")[0].classList.toggle("active");
+
+		var toggler = document.getElementsByClassName("nav-btn")[0].classList;
+				if (toggler.contains("hidden")){
+		  toggler.toggle("hidden");
+		}
+});
+}
+var category = document.getElementById("category").children;
+for (var i = 0; i < category.length; i++){
+	category[i].addEventListener("click", function() {
+		document.getElementById("category").style.maxHeight = null;
+		document.getElementsByClassName("accordion")[1].classList.toggle("active");
+
+		var toggler = document.getElementsByClassName("nav-btn")[0].classList;
+				if (toggler.contains("hidden")){
+		  toggler.toggle("hidden");
+		}
+});
+}
+//-----------------------------------------------------------------------------------
+var tags = document.getElementById("tags");
+for (i in data){
+	tag_maker(data[i])
+}
+function tag_maker(data){
+	var options = ["parody", "character", "tag", "artist", "group"];
+		for (i in options){
+			var i = options[i]
+			if (data[i] != null){
+				for (j in data[i]){
+					var node = document.createElement("button");                   // Create a <li> node
+					var textnode = document.createTextNode(data[i][j]);  					// Create a text node
+					node.appendChild(textnode);                             // Append the text to <li>
+					node.classList.add("btn-2");
+					node.classList.add("parody");
+					document.getElementById(i).appendChild(node);
+					console.log("teste");
+				}
+			}
+		}
+}
\ No newline at end of file

From 4f2db83a135b9ab19fd3f97c0420a9c7f7d2cd47 Mon Sep 17 00:00:00 2001
From: Alocks <alocksmasao@gmail.com>
Date: Wed, 4 Dec 2019 18:54:40 -0300
Subject: [PATCH 03/10] almost gave up

---
 nhentai/viewer/logo.png  | Bin 0 -> 10419 bytes
 nhentai/viewer/main.css  |  48 +++++++++++++++----
 nhentai/viewer/main.html |   8 ++--
 nhentai/viewer/main.js   |  97 ++++++++++++++++++++++++++++-----------
 4 files changed, 113 insertions(+), 40 deletions(-)
 create mode 100644 nhentai/viewer/logo.png

diff --git a/nhentai/viewer/logo.png b/nhentai/viewer/logo.png
new file mode 100644
index 0000000000000000000000000000000000000000..c6132096578a3645590788d250e4540bf071f3d0
GIT binary patch
literal 10419
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
b-y=`Ai2pyqoY}cEo&cbyWvtn#j)?ysuHRO+

literal 0
HcmV?d00001

diff --git a/nhentai/viewer/main.css b/nhentai/viewer/main.css
index bf4100c..2519d81 100644
--- a/nhentai/viewer/main.css
+++ b/nhentai/viewer/main.css
@@ -286,17 +286,26 @@ blockquote {
   font-weight: bold;
   background-color: #eee;
   color: #444;
-  padding: 10px 0px 5px 8px;
+  padding: 8px 8px 5px 9px;
   width: 100%;
   border: none;
   text-align: left;
   outline: none;
   font-size: 15px;
-  transition: 0.4s;
 }
 
 .nav-btn.hidden {
-  display:none
+  display:none;
+}
+
+.nav-btn a{
+  font-weight: normal;
+  padding-right: 10px;
+  border-radius: 15px;
+  cursor: crosshair
+}
+
+.nav-btn a.language{
 }
 
 .options {
@@ -363,24 +372,24 @@ blockquote {
     text-align:left;
     display: block;
 	width:15rem;
-	display: flex;
-    flex-flow: row wrap;
+
     justify-content: start;
 	margin: 2px 2px 2px 0px
 }
 
 .btn-2{
   font-weight:700;
-  padding-right:10px;
-  padding-left:10px;
+  padding-right:0.5rem;
+  padding-left:0.5rem;
   color:#fff;
   border:0;
   font-size:100%;
-  height:20px;
+  height:1.25rem;
   outline: 0;
-  border-radius: 3px;
+  border-radius: 0.3rem;
   cursor: pointer;
-  margin:2px;
+  margin:0.15rem;
+  transition: all 1s linear;
 }
 
 .btn-2.parody{
@@ -406,6 +415,15 @@ blockquote {
 .btn-2.hover{
   filter: saturate(20%)
 }
+
+.btn-2.hidden{
+  display: none;
+}
+
+.btn-2.vhidden {
+  opacity: 0;
+}
+
 input,input:focus{
   border:none;
   outline:0;
@@ -441,4 +459,14 @@ html.theme-black code {
     color: #ed2553;
     border: none;
     background-color: #292929
+}
+.btn span.icon {
+    background: url(imgs/icon.png) no-repeat;
+    float: right;
+    width: 10px;
+    height: 40px;
+}
+.cross{
+	float:left
+	height: 5px;
 }
\ No newline at end of file
diff --git a/nhentai/viewer/main.html b/nhentai/viewer/main.html
index 376dd70..73437a5 100644
--- a/nhentai/viewer/main.html
+++ b/nhentai/viewer/main.html
@@ -18,18 +18,18 @@
         <nav class="sidenav">
 			<img src="logo.png">
 			<h1>nHentai Viewer</h1>
-									<button class="accordion">Language</button>
+            <button class="accordion">Language</button>
             <div class="options" id="language">
                     <a>English</a>
-                    <a>日本語</a>
-                    <a>中国語</a>
+                    <a>Japanese</a>
+                    <a>Chinese</a>
             </div>
 			<button class="accordion">Category</button>
             <div class="options" id ="category">
                     <a>Doujinshi	</a>
                     <a>Manga</a>
             </div>
-			<button class="nav-btn hidden">Filters</button>
+			<button id="nav-btn" class="hidden">Filters</button>
 			<div class="search">
 				<input type="search" name="q" value="" autocapitalize="none" required="">
 				<button type="submit" class="btn btn-primary btn-square">
diff --git a/nhentai/viewer/main.js b/nhentai/viewer/main.js
index 9755939..0e1ead3 100644
--- a/nhentai/viewer/main.js
+++ b/nhentai/viewer/main.js
@@ -15,13 +15,17 @@ for (var i = 0; i < menu.length; i++) {
 var language = document.getElementById("language").children;
 for (var i = 0; i < language.length; i++){
 	language[i].addEventListener("click", function() {
-		document.getElementById("language").style.maxHeight = null;
+		toggler = document.getElementById("language")
+		toggler.style.maxHeight = null;
 		document.getElementsByClassName("accordion")[0].classList.toggle("active");
-
-		var toggler = document.getElementsByClassName("nav-btn")[0].classList;
-				if (toggler.contains("hidden")){
-		  toggler.toggle("hidden");
+		var nav_btn = document.getElementsByClassName("nav-btn")[0];
+		if (nav_btn.classList.contains("hidden")){
+		  nav_btn.classList.toggle("hidden");
 		}
+		var node = filter_maker(this.innerText, "language");
+		var check = filter_checker(this.innerText)
+		if (check == true){
+			nav_btn.appendChild(node);}
 });
 }
 var category = document.getElementById("category").children;
@@ -30,31 +34,72 @@ for (var i = 0; i < category.length; i++){
 		document.getElementById("category").style.maxHeight = null;
 		document.getElementsByClassName("accordion")[1].classList.toggle("active");
 
-		var toggler = document.getElementsByClassName("nav-btn")[0].classList;
-				if (toggler.contains("hidden")){
-		  toggler.toggle("hidden");
+		var nav_btn = document.getElementsByClassName("nav-btn")[0];
+		if (nav_btn.classList.contains("hidden")){
+		  nav_btn.classList.toggle("hidden");
 		}
+
+		var node = filter_maker(this.innerText, "category");
+		var check = filter_checker(this.innerText)
+		if (check == true){
+			nav_btn.appendChild(node);}
 });
 }
+tag_maker(tags)
 //-----------------------------------------------------------------------------------
-var tags = document.getElementById("tags");
-for (i in data){
-	tag_maker(data[i])
+//------------------------------------Functions--------------------------------------
+
+function filter_maker(text, class_value){
+    var node = document.createElement("a");
+    var textnode = document.createTextNode(text);
+    node.appendChild(textnode);
+    node.classList.add(class_value);
+    return node;
 }
+
+function filter_checker(text){
+    var filter_tags = document.getElementsByClassName("nav-btn")[0].children;
+	if (filter_tags == null){return true;}
+	for (i in filter_tags){
+		if (filter_tags[i].innerText == text){return false;}
+	}
+	return true;
+}
+
 function tag_maker(data){
-	var options = ["parody", "character", "tag", "artist", "group"];
-		for (i in options){
-			var i = options[i]
-			if (data[i] != null){
-				for (j in data[i]){
-					var node = document.createElement("button");                   // Create a <li> node
-					var textnode = document.createTextNode(data[i][j]);  					// Create a text node
-					node.appendChild(textnode);                             // Append the text to <li>
-					node.classList.add("btn-2");
-					node.classList.add("parody");
-					document.getElementById(i).appendChild(node);
-					console.log("teste");
-				}
-			}
+	for (i in data){
+		for (j in data[i]){
+			var node = document.createElement("button");
+			var textnode = document.createTextNode(data[i][j]);
+			node.appendChild(textnode);
+			node.classList.add("btn-2");
+			node.classList.add(i);
+			node.classList.add("hidden");
+			document.getElementById("tags").appendChild(node);
 		}
-}
\ No newline at end of file
+	}
+}
+
+var input = document.getElementById("tagfilter");
+
+input.addEventListener("input", function() {
+	var tags = document.querySelectorAll(".btn-2");
+	if (this.value.length > 0) {
+        for (var i = 0; i < tags.length; i++) {
+            var tag = tags[i];
+            var nome = tag.innerText;
+            var exp = new RegExp(this.value, "i");;
+            if (exp.test(nome)) {
+                tag.classList.remove("hidden");
+		    }
+			else {
+				tag.classList.add("hidden");
+            }
+        }
+    } else {
+        for (var i = 0; i < tags.length; i++) {
+            var tag = tags[i];
+				tag.classList.add('hidden');
+        }
+    }
+});
\ No newline at end of file

From c60f1f34d587a342b75240994c4a444da9b11fe1 Mon Sep 17 00:00:00 2001
From: Alocks <alocksmasao@gmail.com>
Date: Thu, 5 Dec 2019 18:02:03 -0300
Subject: [PATCH 04/10] main page filter(2/2)

---
 nhentai/viewer/main.css  |  26 ++-----
 nhentai/viewer/main.html |   8 +-
 nhentai/viewer/main.js   | 155 ++++++++++++++++++++++++++-------------
 3 files changed, 114 insertions(+), 75 deletions(-)

diff --git a/nhentai/viewer/main.css b/nhentai/viewer/main.css
index 2519d81..5e2ca2a 100644
--- a/nhentai/viewer/main.css
+++ b/nhentai/viewer/main.css
@@ -294,7 +294,7 @@ blockquote {
   font-size: 15px;
 }
 
-.nav-btn.hidden {
+.hidden {
   display:none;
 }
 
@@ -392,23 +392,23 @@ blockquote {
   transition: all 1s linear;
 }
 
-.btn-2.parody{
+.btn-2#parody{
   background-color: red;
 }
 
-.btn-2.character{
+.btn-2#character{
   background-color: blue;
 }
 
-.btn-2.tag{
+.btn-2#tag{
   background-color: green;
 }
 
-.btn-2.artist{
+.btn-2#artist{
   background-color: fuchsia;
 }
 
-.btn-2.group{
+.btn-2#group{
   background-color: teal;
 }
 
@@ -420,10 +420,6 @@ blockquote {
   display: none;
 }
 
-.btn-2.vhidden {
-  opacity: 0;
-}
-
 input,input:focus{
   border:none;
   outline:0;
@@ -459,14 +455,4 @@ html.theme-black code {
     color: #ed2553;
     border: none;
     background-color: #292929
-}
-.btn span.icon {
-    background: url(imgs/icon.png) no-repeat;
-    float: right;
-    width: 10px;
-    height: 40px;
-}
-.cross{
-	float:left
-	height: 5px;
 }
\ No newline at end of file
diff --git a/nhentai/viewer/main.html b/nhentai/viewer/main.html
index 73437a5..c99c696 100644
--- a/nhentai/viewer/main.html
+++ b/nhentai/viewer/main.html
@@ -18,7 +18,7 @@
         <nav class="sidenav">
 			<img src="logo.png">
 			<h1>nHentai Viewer</h1>
-            <button class="accordion">Language</button>
+                        <button class="accordion">Language</button>
             <div class="options" id="language">
                     <a>English</a>
                     <a>Japanese</a>
@@ -26,12 +26,12 @@
             </div>
 			<button class="accordion">Category</button>
             <div class="options" id ="category">
-                    <a>Doujinshi	</a>
+                    <a>Doujinshi</a>
                     <a>Manga</a>
             </div>
-			<button id="nav-btn" class="hidden">Filters</button>
+			<button class="nav-btn hidden">Filters</button>
 			<div class="search">
-				<input type="search" name="q" value="" autocapitalize="none" required="">
+				<input autocomplete="off" type="search" id="tagfilter" name="q" value="" autocapitalize="none" required="">
 				<button type="submit" class="btn btn-primary btn-square">
 				<i class="fa fa-search"></i></button>
 			</div>
diff --git a/nhentai/viewer/main.js b/nhentai/viewer/main.js
index 0e1ead3..f2db9e0 100644
--- a/nhentai/viewer/main.js
+++ b/nhentai/viewer/main.js
@@ -18,14 +18,7 @@ for (var i = 0; i < language.length; i++){
 		toggler = document.getElementById("language")
 		toggler.style.maxHeight = null;
 		document.getElementsByClassName("accordion")[0].classList.toggle("active");
-		var nav_btn = document.getElementsByClassName("nav-btn")[0];
-		if (nav_btn.classList.contains("hidden")){
-		  nav_btn.classList.toggle("hidden");
-		}
-		var node = filter_maker(this.innerText, "language");
-		var check = filter_checker(this.innerText)
-		if (check == true){
-			nav_btn.appendChild(node);}
+		filter_maker(this.innerText, "language");
 });
 }
 var category = document.getElementById("category").children;
@@ -33,55 +26,21 @@ for (var i = 0; i < category.length; i++){
 	category[i].addEventListener("click", function() {
 		document.getElementById("category").style.maxHeight = null;
 		document.getElementsByClassName("accordion")[1].classList.toggle("active");
-
-		var nav_btn = document.getElementsByClassName("nav-btn")[0];
-		if (nav_btn.classList.contains("hidden")){
-		  nav_btn.classList.toggle("hidden");
-		}
-
-		var node = filter_maker(this.innerText, "category");
-		var check = filter_checker(this.innerText)
-		if (check == true){
-			nav_btn.appendChild(node);}
+		filter_maker(this.innerText, "category");
 });
 }
-tag_maker(tags)
 //-----------------------------------------------------------------------------------
-//------------------------------------Functions--------------------------------------
+//----------------------------------Tags Script--------------------------------------
+tag_maker(tags);
 
-function filter_maker(text, class_value){
-    var node = document.createElement("a");
-    var textnode = document.createTextNode(text);
-    node.appendChild(textnode);
-    node.classList.add(class_value);
-    return node;
-}
-
-function filter_checker(text){
-    var filter_tags = document.getElementsByClassName("nav-btn")[0].children;
-	if (filter_tags == null){return true;}
-	for (i in filter_tags){
-		if (filter_tags[i].innerText == text){return false;}
-	}
-	return true;
-}
-
-function tag_maker(data){
-	for (i in data){
-		for (j in data[i]){
-			var node = document.createElement("button");
-			var textnode = document.createTextNode(data[i][j]);
-			node.appendChild(textnode);
-			node.classList.add("btn-2");
-			node.classList.add(i);
-			node.classList.add("hidden");
-			document.getElementById("tags").appendChild(node);
-		}
-	}
+var tag = document.getElementsByClassName("btn-2");
+for (var i = 0; i < tag.length; i++){
+	tag[i].addEventListener("click", function() {
+	filter_maker(this.innerText, this.id);
+});
 }
 
 var input = document.getElementById("tagfilter");
-
 input.addEventListener("input", function() {
 	var tags = document.querySelectorAll(".btn-2");
 	if (this.value.length > 0) {
@@ -102,4 +61,98 @@ input.addEventListener("input", function() {
 				tag.classList.add('hidden');
         }
     }
-});
\ No newline at end of file
+});
+//-----------------------------------------------------------------------------------
+//------------------------------------Functions--------------------------------------
+function filter_maker(text, class_value){
+    var check = filter_checker(text);
+	var nav_btn = document.getElementsByClassName("nav-btn")[0];
+	if (nav_btn.classList.contains("hidden")){
+	  nav_btn.classList.toggle("hidden");
+	}
+	if (check == true){
+		var node = document.createElement("a");
+		var textnode = document.createTextNode(text);
+		node.appendChild(textnode);
+		node.classList.add(class_value);	
+		nav_btn.appendChild(node);
+		filter_searcher();
+	}
+}
+
+function filter_searcher(){
+	var verifier = null;
+	var tags_filter = [];
+	var doujinshi_id = [];
+	var filter_tag = document.getElementsByClassName("nav-btn")[0].children;
+	filter_tag[filter_tag.length-1].addEventListener("click", function() {
+		this.remove();
+		try{
+			filter_searcher();
+		}
+		catch{
+			var gallery = document.getElementsByClassName("gallery");
+			for (var i = 0; i < gallery.length; i++){
+				gallery[i].classList.remove("hidden");
+			}
+		}
+	});
+	for (var i=0; i < filter_tag.length; i++){
+		var fclass = filter_tag[i].className;
+		var fname = filter_tag[i].innerText.toLowerCase();
+		tags_filter.push([fclass, fname])
+	}
+	for (var i=0; i < data.length; i++){
+		for (var j=0; j < tags_filter.length; j++){
+			try{
+				if(data[i][tags_filter[j][0]].includes(tags_filter[j][1])){
+					verifier = true;
+				}
+				else{
+					verifier = false;
+					break
+				}
+			}
+			catch{
+				verifier = false;
+					break
+			}
+		}
+		if (verifier){doujinshi_id.push(data[i].Folder);}
+	}
+	var gallery = document.getElementsByClassName("gallery");
+	for (var i = 0; i < gallery.length; i++){
+		gtext = gallery[i].children[0].children[1].innerText;
+		if(doujinshi_id.includes(gtext)){
+			gallery[i].classList.remove("hidden");
+		}
+		else{
+		gallery[i].classList.add("hidden");
+		}
+	}
+
+	console.log(doujinshi_id)
+}
+
+function filter_checker(text){
+    var filter_tags = document.getElementsByClassName("nav-btn")[0].children;
+	if (filter_tags == null){return true;}
+	for (var i=0; i < filter_tags.length; i++){
+		if (filter_tags[i].innerText == text){return false;}
+	}
+	return true;
+}
+
+function tag_maker(data){
+	for (i in data){
+		for (j in data[i]){
+			var node = document.createElement("button");
+			var textnode = document.createTextNode(data[i][j]);
+			node.appendChild(textnode);
+			node.classList.add("btn-2");
+			node.setAttribute('id', i);
+			node.classList.add("hidden");
+			document.getElementById("tags").appendChild(node);
+		}
+	}
+}
\ No newline at end of file

From 110a2acb7c81eb56339e84d211063352f0453ce0 Mon Sep 17 00:00:00 2001
From: Alocks <alocksmasao@gmail.com>
Date: Fri, 6 Dec 2019 13:08:16 -0300
Subject: [PATCH 05/10] main page filter fixes

---
 nhentai/viewer/main.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/nhentai/viewer/main.js b/nhentai/viewer/main.js
index f2db9e0..2ab1fb6 100644
--- a/nhentai/viewer/main.js
+++ b/nhentai/viewer/main.js
@@ -91,7 +91,7 @@ function filter_searcher(){
 			filter_searcher();
 		}
 		catch{
-			var gallery = document.getElementsByClassName("gallery");
+			var gallery = document.getElementsByClassName("gallery-favorite");
 			for (var i = 0; i < gallery.length; i++){
 				gallery[i].classList.remove("hidden");
 			}
@@ -120,9 +120,9 @@ function filter_searcher(){
 		}
 		if (verifier){doujinshi_id.push(data[i].Folder);}
 	}
-	var gallery = document.getElementsByClassName("gallery");
+	var gallery = document.getElementsByClassName("gallery-favorite");
 	for (var i = 0; i < gallery.length; i++){
-		gtext = gallery[i].children[0].children[1].innerText;
+		gtext = gallery	[i].children[0].children[0].children[1].innerText;
 		if(doujinshi_id.includes(gtext)){
 			gallery[i].classList.remove("hidden");
 		}

From e1556b09cc7b0af5d2565f26a3c0fac39ed8273a Mon Sep 17 00:00:00 2001
From: Alocks <alocksmasao@gmail.com>
Date: Sat, 7 Dec 2019 11:19:49 -0300
Subject: [PATCH 06/10] fixed unicode issues with japanese characters

---
 nhentai/serializer.py | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/nhentai/serializer.py b/nhentai/serializer.py
index 17c62b2..357da6c 100644
--- a/nhentai/serializer.py
+++ b/nhentai/serializer.py
@@ -22,7 +22,7 @@ def serialize(doujinshi, dir):
     metadata['category']      = doujinshi.info.categories
     metadata['URL']             = doujinshi.url
     metadata['Pages']           = doujinshi.pages
-    with open(os.path.join(dir, 'metadata.json'), 'w') as f:
+    with open(os.path.join(dir, 'metadata.json'), 'w', encoding="raw_unicode_escape") as f:
         json.dump(metadata, f, separators=','':')
 
 
@@ -32,13 +32,15 @@ def merge_json():
     os.chdir(output_dir)
     doujinshi_dirs = next(os.walk('.'))[1]
     for folder in doujinshi_dirs:
-        folder_json = ',"Folder":"' + folder + '"}'
         files = os.listdir(folder)
         if 'metadata.json' not in files:
             continue
         data_folder = output_dir + folder + '/' + 'metadata.json'
-        json_file = open(data_folder, encoding='raw_unicode_escape').read()[:-2]+folder_json
-        lst.append(json.loads(json_file.encode('raw_unicode_escape').decode()))
+        json_file = open(data_folder, 'r')
+        json_dict = {}
+        json_dict = json.load(json_file)
+        json_dict['Folder'] = folder
+        lst.append(json_dict)
     return lst
 
 
@@ -50,15 +52,15 @@ def serialize_unique(lst):
     artist = []
     group = []
     for dic in lst:
-        if dic['parody']:
+        if 'parody' in dic:
             parody.extend([i for i in dic['parody']])
-        if dic['character']:
+        if 'character' in dic:
             character.extend([i for i in dic['character']])
-        if dic['tag']:
+        if 'tag' in dic:
             tag.extend([i for i in dic['tag']])
-        if dic['artist']:
+        if 'artist' in dic:
             artist.extend([i for i in dic['artist']])
-        if dic['group']:
+        if 'group' in dic:
             group.extend([i for i in dic['group']])
     dictionary['parody'] = list(set(parody))
     dictionary['character'] = list(set(character))

From ff8af8279f8f9e27a8536820205e251b19220b65 Mon Sep 17 00:00:00 2001
From: Alocks <alocksmasao@gmail.com>
Date: Sat, 7 Dec 2019 12:58:19 -0300
Subject: [PATCH 07/10] fixed html and removed unused .css properties

---
 nhentai/viewer/main.css  | 152 ++++-----------------------------------
 nhentai/viewer/main.html |   4 +-
 2 files changed, 14 insertions(+), 142 deletions(-)

diff --git a/nhentai/viewer/main.css b/nhentai/viewer/main.css
index 5e2ca2a..b621234 100644
--- a/nhentai/viewer/main.css
+++ b/nhentai/viewer/main.css
@@ -1,74 +1,14 @@
 /*! normalize.css v5.0.0 | MIT License | github.com/necolas/normalize.css */
 /* Original from https://static.nhentai.net/css/main_style.9bb9b703e601.css */
-html {
-    line-height: 1.15;
-    -ms-text-size-adjust: 100%;
-    -webkit-text-size-adjust: 100%
-}
-
-body {
-    margin: 0
-}
-
-h1 {
-    font-size: 2em;
-    margin: .67em 0;
-}
-
 a {
     background-color: transparent;
     -webkit-text-decoration-skip: objects
 }
 
-abbr[title] {
-    border-bottom: none;
-    text-decoration: underline;
-    text-decoration: underline dotted
-}
-
-b,strong {
-    font-weight: inherit
-}
-
-b,strong {
-    font-weight: bolder
-}
-
-code,kbd,samp {
-    font-family: monospace,monospace;
-    font-size: 1em
-}
-
-small {
-    font-size: 80%
-}
-
-sub,sup {
-    font-size: 75%;
-    line-height: 0;
-    position: relative;
-    vertical-align: baseline
-}
-
-sub {
-    bottom: -.25em
-}
-
-sup {
-    top: -.5em
-}
-
 img {
     border-style: none
 }
 
-label {
-    display: block;
-    font-weight: 700;
-    text-align: justify;
-    white-space: nowrap
-}
-
 html {
     box-sizing: border-box
 }
@@ -77,10 +17,6 @@ html {
     box-sizing: inherit
 }
 
-h1,h2,h3,h4,h5,h6 {
-    font-weight: 700
-}
-
 body,html {
     font-family: 'Noto Sans',sans-serif;
     font-size: 14px;
@@ -99,20 +35,6 @@ a {
     color: #34495e
 }
 
-a.count {
-    color: #999
-}
-
-a.bold {
-    font-weight: 700
-}
-
-code {
-    color: #ed2553;
-    border: 1px solid #fbd3dd;
-    background-color: #fef0f3
-}
-
 blockquote {
     border: 0
 }
@@ -255,11 +177,6 @@ blockquote {
   background-color: #EC2754;
 }
 
-@media screen and (max-height: 450px) {
-  .sidenav {padding-top: 15px;}
-  .sidenav a {font-size: 15px;}
-}
-
 .accordion {
   font-weight: bold;
   background-color: #eee;
@@ -305,10 +222,8 @@ blockquote {
   cursor: crosshair
 }
 
-.nav-btn a.language{
-}
-
 .options {
+  display:block;
   padding: 0px 0px 0px 0px;
   background-color: #eee;
   max-height: 0;
@@ -317,10 +232,13 @@ blockquote {
   cursor:pointer;
 }
 
-.search{background-color: #eee;
-  padding-right:45px;
+.search{
+  background-color: #eee;
+  padding-right:40px;
   white-space: nowrap;
-  padding-top: 5px
+  padding-top: 5px;
+  height:43px;
+
 }
 
 .search input{
@@ -333,48 +251,22 @@ blockquote {
   vertical-align:top;
 }
 
-.search .btn.btn-square{
-  border-top-left-radius:10px;
-  border-bottom-left-radius:0px;
-}
-
-.fa{
-  font:normal normal normal 14px/1 FontAwesome;
-  font-size:1.33333333em;
-  line-height:.75em;
-}
-
-.fa-search:before{
-  content:"\f002";
-}
-
 .btn{
-  font-weight:700;
-  padding-right:12px;
-  padding-left:12px;
+  border-top-left-radius:10px;
   color:#fff;
-  border:0;
   font-size:100%;
-  height:38px;
-  line-height:40px;
-  outline: 0;
-}
-
-.btn.btn-primary{
+  padding: 8px;
+  width:38px;
   background-color:#ed2553;
 }
 
-.btn.btn-primary:active,.btn.btn-primary:focus,.btn.btn-primary:hover{
-  color:#fff;background:#f15478;
-}
-
 #tags{
     text-align:left;
-    display: block;
+    display: flex;
 	width:15rem;
-
     justify-content: start;
-	margin: 2px 2px 2px 0px
+	margin: 2px 2px 2px 0px;
+	flex-wrap: wrap;
 }
 
 .btn-2{
@@ -416,10 +308,6 @@ blockquote {
   filter: saturate(20%)
 }
 
-.btn-2.hidden{
-  display: none;
-}
-
 input,input:focus{
   border:none;
   outline:0;
@@ -434,14 +322,6 @@ html.theme-black #thumbnail-container,html.theme-black .container {
     background-color: #1f1f1f
 }
 
-html.theme-black #thumbnail-container .lazyload,html.theme-black .lazyload {
-    background-color: #262626
-}
-
-html.theme-black #thumbnail-container .lazyload-loading,html.theme-black .lazyload-loading {
-    background-color: #2e2e2e
-}
-
 html.theme-black .gallery:hover .caption {
     box-shadow: 0 10px 20px rgba(0,0,0,.5)
 }
@@ -449,10 +329,4 @@ html.theme-black .gallery:hover .caption {
 html.theme-black .caption {
     background-color: #404040;
     color: #d9d9d9
-}
-
-html.theme-black code {
-    color: #ed2553;
-    border: none;
-    background-color: #292929
 }
\ No newline at end of file
diff --git a/nhentai/viewer/main.html b/nhentai/viewer/main.html
index c99c696..020382c 100644
--- a/nhentai/viewer/main.html
+++ b/nhentai/viewer/main.html
@@ -32,9 +32,7 @@
 			<button class="nav-btn hidden">Filters</button>
 			<div class="search">
 				<input autocomplete="off" type="search" id="tagfilter" name="q" value="" autocapitalize="none" required="">
-				<button type="submit" class="btn btn-primary btn-square">
-				<i class="fa fa-search"></i></button>
-			</div>
+				<svg class="btn" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M505 442.7L405.3 343c-4.5-4.5-10.6-7-17-7H372c27.6-35.3 44-79.7 44-128C416 93.1 322.9 0 208 0S0 93.1 0 208s93.1 208 208 208c48.3 0 92.7-16.4 128-44v16.3c0 6.4 2.5 12.5 7 17l99.7 99.7c9.4 9.4 24.6 9.4 33.9 0l28.3-28.3c9.4-9.4 9.4-24.6.1-34zM208 336c-70.7 0-128-57.2-128-128 0-70.7 57.2-128 128-128 70.7 0 128 57.2 128 128 0 70.7-57.2 128-128 128z"/></svg>
 			<div id="tags">
 			</div>
 		</nav>

From 6156cf59145e30aef4399e216fa04e57215080a5 Mon Sep 17 00:00:00 2001
From: Alocks <alocksmasao@gmail.com>
Date: Sat, 7 Dec 2019 14:36:19 -0300
Subject: [PATCH 08/10] added zoom in index.html and some increments in
 main.html

---
 nhentai/viewer/main.html  |  2 +-
 nhentai/viewer/main.js    | 27 +++++++++++++++++++++++----
 nhentai/viewer/scripts.js | 12 ++++++------
 nhentai/viewer/styles.css |  3 ++-
 4 files changed, 32 insertions(+), 12 deletions(-)

diff --git a/nhentai/viewer/main.html b/nhentai/viewer/main.html
index 020382c..af911cb 100644
--- a/nhentai/viewer/main.html
+++ b/nhentai/viewer/main.html
@@ -32,7 +32,7 @@
 			<button class="nav-btn hidden">Filters</button>
 			<div class="search">
 				<input autocomplete="off" type="search" id="tagfilter" name="q" value="" autocapitalize="none" required="">
-				<svg class="btn" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M505 442.7L405.3 343c-4.5-4.5-10.6-7-17-7H372c27.6-35.3 44-79.7 44-128C416 93.1 322.9 0 208 0S0 93.1 0 208s93.1 208 208 208c48.3 0 92.7-16.4 128-44v16.3c0 6.4 2.5 12.5 7 17l99.7 99.7c9.4 9.4 24.6 9.4 33.9 0l28.3-28.3c9.4-9.4 9.4-24.6.1-34zM208 336c-70.7 0-128-57.2-128-128 0-70.7 57.2-128 128-128 70.7 0 128 57.2 128 128 0 70.7-57.2 128-128 128z"/></svg>
+				<svg class="btn" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path fill="white" d="M505 442.7L405.3 343c-4.5-4.5-10.6-7-17-7H372c27.6-35.3 44-79.7 44-128C416 93.1 322.9 0 208 0S0 93.1 0 208s93.1 208 208 208c48.3 0 92.7-16.4 128-44v16.3c0 6.4 2.5 12.5 7 17l99.7 99.7c9.4 9.4 24.6 9.4 33.9 0l28.3-28.3c9.4-9.4 9.4-24.6.1-34zM208 336c-70.7 0-128-57.2-128-128 0-70.7 57.2-128 128-128 70.7 0 128 57.2 128 128 0 70.7-57.2 128-128 128z"/></svg>
 			<div id="tags">
 			</div>
 		</nav>
diff --git a/nhentai/viewer/main.js b/nhentai/viewer/main.js
index 2ab1fb6..5a314fc 100644
--- a/nhentai/viewer/main.js
+++ b/nhentai/viewer/main.js
@@ -1,4 +1,4 @@
-//------------------------------------navbar script------------------------------------
+    //------------------------------------navbar script------------------------------------
 var menu = document.getElementsByClassName("accordion");
 for (var i = 0; i < menu.length; i++) {
   menu[i].addEventListener("click", function() {
@@ -62,8 +62,29 @@ input.addEventListener("input", function() {
         }
     }
 });
+input.addEventListener('keypress', function (e) {
+	enter_search(e, this.value);
+});
 //-----------------------------------------------------------------------------------
 //------------------------------------Functions--------------------------------------
+function enter_search(e, input){
+	var count = 0;
+	var key = e.which || e.keyCode;
+	if (key === 13 && input.length > 0) {
+	  var all_tags = document.getElementById("tags").children;
+	  for(i = 0; i < all_tags.length; i++){
+		if (!all_tags[i].classList.contains("hidden")){
+			count++;
+			var tag_name = all_tags[i].innerText;
+			var tag_id   = all_tags[i].id;
+			if (count>1){break}
+		}
+	  }
+	  if (count == 1){
+		filter_maker(tag_name, tag_id);
+	  }
+	}
+}
 function filter_maker(text, class_value){
     var check = filter_checker(text);
 	var nav_btn = document.getElementsByClassName("nav-btn")[0];
@@ -74,7 +95,7 @@ function filter_maker(text, class_value){
 		var node = document.createElement("a");
 		var textnode = document.createTextNode(text);
 		node.appendChild(textnode);
-		node.classList.add(class_value);	
+		node.classList.add(class_value);
 		nav_btn.appendChild(node);
 		filter_searcher();
 	}
@@ -130,8 +151,6 @@ function filter_searcher(){
 		gallery[i].classList.add("hidden");
 		}
 	}
-
-	console.log(doujinshi_id)
 }
 
 function filter_checker(text){
diff --git a/nhentai/viewer/scripts.js b/nhentai/viewer/scripts.js
index 8e3f8bf..6fea1c2 100644
--- a/nhentai/viewer/scripts.js
+++ b/nhentai/viewer/scripts.js
@@ -47,6 +47,9 @@ document.onkeypress = event => {
     switch (event.key.toLowerCase()) {
         // Previous Image
         case 'w':
+			document.getElementById("dest").style.height = "200%";
+			document.getElementById("list").style.height = "200%";
+            break;
         case 'a':
             changePage(currentPage - 1);
             break;
@@ -57,6 +60,9 @@ document.onkeypress = event => {
         // Next Image
         case ' ':
         case 's':
+			document.getElementById("dest").style.height = "100%";
+			document.getElementById("list").style.height = "100%";
+            break;
         case 'd':
             changePage(currentPage + 1);
             break;
@@ -68,14 +74,8 @@ document.onkeydown = event =>{
         case 37: //left
             changePage(currentPage - 1);
             break;
-        case 38: //up
-            changePage(currentPage - 1);
-            break;
         case 39: //right
             changePage(currentPage + 1);
             break;
-        case 40: //down
-            changePage(currentPage + 1);
-            break;
     }
 };
\ No newline at end of file
diff --git a/nhentai/viewer/styles.css b/nhentai/viewer/styles.css
index f9830dc..abc219a 100644
--- a/nhentai/viewer/styles.css
+++ b/nhentai/viewer/styles.css
@@ -38,7 +38,7 @@ html, body {
 #image-container {
     flex: auto;
     height: 100vh;
-    background: #222;
+    background: #000;
     color: #fff;
     text-align: center;
     cursor: pointer;
@@ -48,6 +48,7 @@ html, body {
 }
 
 #image-container #dest {
+    background: #000;
     height: 100%;
     width: 100%;
     background-size: contain;

From fe4fb46e30bc920d84110ad0c605f6c06663761c Mon Sep 17 00:00:00 2001
From: Alocks <alocksmasao@gmail.com>
Date: Sat, 7 Dec 2019 17:50:23 -0300
Subject: [PATCH 09/10] fixed language tag

---
 README.rst          | 6 +++---
 nhentai/command.py  | 2 +-
 nhentai/constant.py | 3 ++-
 nhentai/parser.py   | 2 +-
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/README.rst b/README.rst
index add2b63..e336720 100644
--- a/README.rst
+++ b/README.rst
@@ -90,13 +90,13 @@ Download by character name:
 
 .. code-block:: bash
 
-    nhentai --character kuro von einsbern --download
+    nhentai --character "kuro von einsbern" --download
 
 Download by parody name:
 
 .. code-block:: bash
 
-    nhentai --parody the idolmaster --download
+    nhentai --parody "the idolmaster" --download
 
 Download by group name:
 
@@ -108,7 +108,7 @@ Download using multiple tags (--tag, --character, --paordy and --group supported
 
 .. code-block:: bash
 
-    nhentai --tag lolicon, teasing --artist tamano kedama, atte nanakusa
+    nhentai --tag "lolicon, teasing" --artist "tamano kedama, atte nanakusa"
 
 Download your favorites with delay:
 
diff --git a/nhentai/command.py b/nhentai/command.py
index 2dad43f..41ba40e 100644
--- a/nhentai/command.py
+++ b/nhentai/command.py
@@ -71,7 +71,7 @@ def main():
             doujinshi_ids = [i['id'] for i in doujinshis]
 
     elif options.language:
-        doujinshis = tag_parser(options.group, max_page=options.max_page, index=5)
+        doujinshis = tag_parser(options.language, max_page=options.max_page, index=5)
         print_doujinshi(doujinshis)
         if options.is_download and doujinshis:
             doujinshi_ids = [i['id'] for i in doujinshis]
diff --git a/nhentai/constant.py b/nhentai/constant.py
index ecbee17..5641618 100644
--- a/nhentai/constant.py
+++ b/nhentai/constant.py
@@ -21,7 +21,8 @@ TAG_URL = ['%s/tag' % BASE_URL,
            '%s/artist' % BASE_URL,
            '%s/character' % BASE_URL,
            '%s/parody' % BASE_URL,
-           '%s/group' % BASE_URL]
+           '%s/group' % BASE_URL,
+           '%s/language' % BASE_URL]
 
 TAG_API_URL = '%s/api/galleries/tagged' % BASE_URL
 LOGIN_URL = '%s/login/' % BASE_URL
diff --git a/nhentai/parser.py b/nhentai/parser.py
index 081e85a..0024f55 100644
--- a/nhentai/parser.py
+++ b/nhentai/parser.py
@@ -198,7 +198,7 @@ def tag_parser(tag_name, sorting='date', max_page=1, index=0):
     if ',' in tag_name:
         tag_name = [i.strip().replace(' ', '-') for i in tag_name.split(',')]
     else:
-        tag_name = tag_name.replace(' ', '-')
+        tag_name = tag_name.strip().replace(' ', '-')
     if sorting == 'date':
         sorting = ''
 

From 1974644513e147e8f15a51b63141a8ff18a36583 Mon Sep 17 00:00:00 2001
From: Alocks <alocksmasao@gmail.com>
Date: Sun, 8 Dec 2019 20:59:37 -0300
Subject: [PATCH 10/10] download gif images

---
 nhentai/parser.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nhentai/parser.py b/nhentai/parser.py
index 0024f55..3c01af1 100644
--- a/nhentai/parser.py
+++ b/nhentai/parser.py
@@ -134,7 +134,7 @@ def doujinshi_parser(id_):
     doujinshi['subtitle'] = subtitle.text if subtitle else ''
 
     doujinshi_cover = html.find('div', attrs={'id': 'cover'})
-    img_id = re.search('/galleries/([\d]+)/cover\.(jpg|png)$', doujinshi_cover.a.img.attrs['data-src'])
+    img_id = re.search('/galleries/([\d]+)/cover\.(jpg|png|gif)$', doujinshi_cover.a.img.attrs['data-src'])
 
     ext = []
     for i in html.find_all('div', attrs={'class': 'thumb-container'}):