Moved the text search to the queryset, keep the search GET parameter …

…as the value of the search field after submitting.
dhedegaard · May 9, 2019 · bac7336 · bac7336
1 parent 57bab52
commit bac7336
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 20 deletions.
diff --git a/youtube/models.py b/youtube/models.py
@@ -138,6 +138,11 @@ class VideoQuerySet(models.QuerySet):
     def exclude_deleted(self):
         return self.exclude(deleted=True)
 
+    def text_search(self, search_query):
+        if search_query:
+            return self.filter(title__icontains=search_query)
+        return self
+
     def create_or_update(self, channel, data):
         '''
         Creates or updates a `Video` object with the data given, for the

diff --git a/youtube/templates/youtube/base.html b/youtube/templates/youtube/base.html
@@ -42,7 +42,7 @@
                     <div class="navbar-right">
                                 <form class="navbar-form navbar-left">
                                     <div class="input-group">
-                                        <input name="q" type="search" class="form-control" placeholder="Search..." />
+                                        <input name="q" type="search" class="form-control" placeholder="Search..." value="{{ request.GET.q|default:'' }}" />
                                         <span class="input-group-btn">
                                             <button type="submit" class="btn btn-default" type="button">
                                                 <span class="glyphicon glyphicon-search" aria-hidden="true" />

diff --git a/youtube/views.py b/youtube/views.py
@@ -13,19 +13,13 @@
 
 
 def index(request):
-    videos = (
-        Video.objects.
-        filter(uploader__hidden=False).
-        exclude_deleted().
-        prefetch_related('uploader'))
-
-    # Text search.
-    q = request.GET.get('q', '')
-    if q:
-        videos = videos.filter(title__icontains=q)
-
     return render(request, 'youtube/index.html', {
-        'videos': videos,
+        'videos': (
+            Video.objects.
+            filter(uploader__hidden=False).
+            exclude_deleted().
+            text_search(request.GET.get('q', '')).
+            prefetch_related('uploader')),
         'full_url': request.build_absolute_uri(request.get_full_path()),
     })
 
@@ -41,16 +35,14 @@ def channel(request, author):
     # Fetch the channel, or 404.
     channel = get_object_or_404(qs.filter(
         Q(Q(author=author) | Q(channelid=author))))
-    videos = channel.videos.exclude_deleted()
-
-    # Text search.
-    q = request.GET.get('q', '')
-    if q:
-        videos = videos.filter(title__icontains=q)
 
     # Render and return.
     return render(request, 'youtube/index.html', {
-        'videos': videos,
+        'videos': (
+            channel.videos.
+            exclude_deleted().
+            text_search(request.GET.get('q', ''))
+        ),
         'channel': channel,
         'full_url': request.build_absolute_uri(request.get_full_path()),
     })