From d57f677bd367578989703b25822fb041b0f8e07e Mon Sep 17 00:00:00 2001
From: MassiveAtoms <s.ramsaransing.w@gmail.com>
Date: Wed, 15 Jul 2020 10:42:49 -0300
Subject: [PATCH] add ugly search form in base template

---
 .../library/__pycache__/forms.cpython-38.pyc  | Bin 1358 -> 1408 bytes
 .../library/__pycache__/urls.cpython-38.pyc   | Bin 1099 -> 1099 bytes
 .../library/__pycache__/views.cpython-38.pyc  | Bin 6165 -> 6252 bytes
 CalibreWebCompanion/library/forms.py          |   1 +
 .../library/templates/base.html               |  15 ++++++++++++++-
 CalibreWebCompanion/library/views.py          |  10 +++++++++-
 6 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/CalibreWebCompanion/library/__pycache__/forms.cpython-38.pyc b/CalibreWebCompanion/library/__pycache__/forms.cpython-38.pyc
index 81af47ab7da2805b75fd5f90ad882ee3fa4e9c75..cba4818f4920f67da7fe8262a0eeaee8f723700b 100644
GIT binary patch
delta 382
zcmX@d)xgag%FD~e00d3U{P6)3c~@|;0yz#qT<kV+zo}R%a~4YqM+$2SX9`y@a}-Ak
zcQAt{&%|Hp^0$~Bb8_4?nTyzgii<da#4V1Z)WXutqSO>WP0q<FjQ&Em*wa(<Qj0Q^
zS27fdfs~0&-oseQ4pPj)$T!)FDT}Fycd{ds$mIP@>D+uE75pGVV6q{zga$+hSR05C
z2NJhfd{avj1%a$$79hdF$ii48H@T2Gj!|;*1!gr9NuZ!6^DUO*)SR>;d9a4k;?$y*
zjJG)B<CAj|i;LsqAua)#R-_0dL?>&p=!YZO4U%92Y2|XwP0Y-3%S_ElDFPW>BnKiu
pdT#MTO-oMA$$^;&cCIQ&3D|6AAd7GE29^Q=bbm}XV3lR$000mmP@4b%

delta 375
zcmZqRKF7ry%FD~e00ev`eDSOkc~@|;067joTx>RRzbRV^M=*mX=VUI%bY?$Ij>!`k
z{W(`M6bS?6i-aeCWUORm12Q=#7cymW-Qp-pEiBC}N==#kfT_Zp2c(7<MDT$Kkg>N|
zbMsSDb8fMvWv1q&6hn;x$$||O0V!eeO)W_j0J4ffIye|v7>i^kFJ_Ko6raq*qGlov
z6x3wC#ZsJ_lU5`P)=*lUTC|e!7H52Xa!z7#aeO?&v?6(+3X#b%Ec)SS&S3&+<#NqU
z%*=5EIi?6?aFGm%0O`5K3pFh{H75sVBG{42ASED|7BK?}-pP+x3iKes0TM&_gTn^s
W*V3F+J4T>*F$a*~VFW^EA$9<e)=i24

diff --git a/CalibreWebCompanion/library/__pycache__/urls.cpython-38.pyc b/CalibreWebCompanion/library/__pycache__/urls.cpython-38.pyc
index 1462ae7dbc7ee11704ffdb7b8b832f8889d0ec68..e3f0bc47493e391d8e9bb0acb59ea92ca015fa04 100644
GIT binary patch
delta 19
ZcmX@jahiiGl$V!_0SMOAZRB!f0RS$91XKV3

delta 19
ZcmX@jahiiGl$V!_0SMHzHgY+#001ex19|`e

diff --git a/CalibreWebCompanion/library/__pycache__/views.cpython-38.pyc b/CalibreWebCompanion/library/__pycache__/views.cpython-38.pyc
index d6d40ff4f1a2e755bf61f3242ef7f118a13b2a50..3bc74bcf0c17aedba7ba65b76d345bd259d4a9ed 100644
GIT binary patch
delta 444
zcmW-by-Va!6vcBg?<JXN5;J4gLRc(B6dkZ|98d&57Ayo^5ETSbAu0w7c{2_u83s|T
z{DO;x7BX7dN)W89lwDZ%AF!|zY%H|0Q(y8f=iK{)^WJ?Y-LKvDlx3NUJh#l5|I>JF
z|KqkMG1iDw@seJ6t{N(V5}>B~>;e^5N(HROeeP=)YK4ao(;*ME5Wao@$*NdRSoMvB
zQ=*)3%1<ZE#CgbTT1gLCd?V>HIjkg;%nU1X3lI6E(qWE2^3p2JX-!-(`5!82zhTgW
zR`@AA$sO7wD=w`qi%tomE4Ey0j2iSVy<Lt9Y#P$N1_lNL#+RxZpXwLmG_5~lfclNU
z_(d$e=nTnhG2UT-siKdz%^tc+k7A78(z}?T4Rafl(TAA_7ARMLhgo{9uV5w$tQ%m3
zTAT{}=-kPpt}0&<qtdo|>D|fFq3hDT*Gg^fAU0{mEu$Pgxt+j1nb{-k(OI^Loycx%
f2TrNr?StsvTgP#f|M4H$<_yc2QgK<CjFj~af!J*2

delta 350
zcmaE3Fx7xBl$V!_0SN9_@Wme#-pF^Fm5&w3WdUMmATG|C{G3(SrGz<)WdUmnOA6~k
zrdpO7#v+dzmMpd!#uT<*Mj)T5C<4r9N?`}{nTs;OeC8AmFrOuuL6dWGADhhN^=tu*
z?338dMKoD&u@tA~q!nocZ7I?L5xSE@*>$AEfJ_EPJ}6{i<Y9#2$!po4Fq%!C#BqYr
zW^y!VBCi!tWiiO596&XbPjc2WI!|`zYGHJre1@x$(R;HWw<#lI#N-y9eT+eqKMIRX
z4(H8e^xu4tcPk@f{N!@}TE>{oU-^M*$|q|JPGT$ssu7-iQ81Y?Z?mb8HX~!p<V4|q
z#yX&IF=O@SR1pnE#)*^rM0*&!!7BB{Vi`L&_lTWk6c!O;5#j`55abmS0%BeOTw_+F

diff --git a/CalibreWebCompanion/library/forms.py b/CalibreWebCompanion/library/forms.py
index 7a28e4c..910d3b0 100644
--- a/CalibreWebCompanion/library/forms.py
+++ b/CalibreWebCompanion/library/forms.py
@@ -7,6 +7,7 @@ class SearchForm(forms.Form):
     title = forms.CharField(label="Title", max_length=200)
     author = forms.CharField(label='Author', max_length=100)
     identifier = forms.CharField(label='Identifier(ISBN, Google-id, amazon id)', max_length=20)
+    generic = forms.CharField(label='All', max_length=100, required=False)
 
 
 
diff --git a/CalibreWebCompanion/library/templates/base.html b/CalibreWebCompanion/library/templates/base.html
index f56ba71..02f5c14 100644
--- a/CalibreWebCompanion/library/templates/base.html
+++ b/CalibreWebCompanion/library/templates/base.html
@@ -58,7 +58,6 @@
         </ul>
 
         <ul class="left">
-          <li><a href="{% url 'search' %}">Search</a></li>
           <li><a href="{% url 'books' %}">Books</a></li>
           <li><a class="dropdown-trigger" href="#!" data-target="dropdown-authors">Authors<i
                 class="material-icons right">arrow_drop_down</i></a></li>
@@ -66,6 +65,18 @@
                 class="material-icons right">arrow_drop_down</i></a></li>
           <li><a class="dropdown-trigger" href="#!" data-target="dropdown-tags">Tags<i
                 class="material-icons right">arrow_drop_down</i></a></li>
+          <li><a href="{% url 'search' %}">Advanced search</a></li>
+          <li>
+            <!-- stefan, this div. can we have this int the navbar? -->
+            <div class="container">
+              <form action="{% url 'results' %}" method="get" style="padding-top:2em">
+                <label for="generic"></label>
+                <input id="generic" type="text" name="generic" value="">
+                <button class="waves-effect waves-light btn green accent-4" type="submit">search</button>
+              </form>
+            </div>
+            <!-- this is the end of the div, stefan -->
+          </li>
         </ul>
         <ul id="dropdown-authors" class="dropdown-content">
           {% for author in unique_authors %}
@@ -89,6 +100,8 @@
         </ul>
         {% endif %}
       </div>
+
+
     </nav>
   </div>
   <script>
diff --git a/CalibreWebCompanion/library/views.py b/CalibreWebCompanion/library/views.py
index 23a0c49..271e4be 100644
--- a/CalibreWebCompanion/library/views.py
+++ b/CalibreWebCompanion/library/views.py
@@ -41,13 +41,20 @@ class ResultsView(generic.ListView):  # no clue if this is secure.
         title = self.request.GET.get('title')
         author = self.request.GET.get('author')
         identifier = self.request.GET.get("identifier")
+        generic = self.request.GET.get("generic")
         books = Book.objects.prefetch_related("tags", "ratings")
         if title:
-            books =books.filter(sort__icontains=title)
+            books = books.filter(sort__icontains=title)
         if author:
             books = books.filter(author_sort__icontains=author)
         if identifier:
             books = books.filter(identifier__val=identifier)
+        if generic:
+            books = books.filter(
+                Q(sort__icontains=generic) | 
+                Q(author_sort__icontains=generic) | 
+                Q(identifier__val=generic)
+            )
         return books
 
 
@@ -57,6 +64,7 @@ class AuthorListView(generic.ListView):
 
 class BookListView(generic.ListView):
     model = Book
+
     def get_queryset(self):
         # Annotate the books with ratings, tags, etc
         # books = Book.objects.annotate(