From d5fa4c5138e8ee0fead51c96317ef51f005a9ba2 Mon Sep 17 00:00:00 2001
From: doubaniux <goodsir@vivaldi.net>
Date: Wed, 15 Jul 2020 17:07:02 +0800
Subject: [PATCH] update search method

---
 common/templates/partial/_navbar.html | 2 +-
 common/views.py                       | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/common/templates/partial/_navbar.html b/common/templates/partial/_navbar.html
index 9644d729..5f71471a 100644
--- a/common/templates/partial/_navbar.html
+++ b/common/templates/partial/_navbar.html
@@ -12,7 +12,7 @@
                 <form action="#" οnsubmit="" class="navbar__search-box">
                     <!-- <input type="search" class="" name="q" id="searchInput" required="true" value="{% for v in request.GET.values %}{{ v }}{% endfor %}" -->
                     <input type="search" class="" name="q" id="searchInput" required="true" value="{% if request.GET.q %}{{ request.GET.q }}{% endif %}"
-                        placeholder="搜索书影音，多个关键字以空格分割">
+                        placeholder="搜索书影音">
                 </form>
                 <button class="navbar__dropdown-btn">• • •</button>
                 <ul class="navbar__link-list">
diff --git a/common/views.py b/common/views.py
index aaa26e5c..1144fa37 100644
--- a/common/views.py
+++ b/common/views.py
@@ -64,10 +64,10 @@ def search(request):
         query_args = []
 
         # keywords
-        keywords = request.GET.get("q", default='').split()
-        for keyword in keywords:
+        keywords = request.GET.get("q", default='').strip()
+        for keyword in [keywords]:
             q = q | Q(title__icontains=keyword)
-            q = q | Q(subtitle__istartswith=keyword)
+            q = q | Q(subtitle__icontains=keyword)
             q = q | Q(orig_title__icontains=keyword)
 
         # tag