From 6b24b7416c70b73c5ea4709da96cc63015b267b6 Mon Sep 17 00:00:00 2001
From: Ethan Dalool <git@voussoir.net>
Date: Fri, 25 Jan 2019 15:54:31 -0800
Subject: [PATCH] Modifying search box reapplies download filter, removes
 cards.

Example: If you are using the /pending filter, and use the search
box to find some videos and ignore them, then those videos will
be removed from the DOM. That way they aren't still there when you
clear the text box to see the other pending videos.
---
 frontends/ycdl_flask/templates/channel.html   | 19 +++++++++++++++----
 frontends/ycdl_flask/ycdl_flask/ycdl_flask.py |  1 +
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/frontends/ycdl_flask/templates/channel.html b/frontends/ycdl_flask/templates/channel.html
index 329fa59..1f59714 100644
--- a/frontends/ycdl_flask/templates/channel.html
+++ b/frontends/ycdl_flask/templates/channel.html
@@ -88,7 +88,6 @@
     <span><a href="/videos/ignored">Ignored</a> <a href="/videos/ignored{{query_string}}">(?q)</a></span>
     <span><a href="/videos/downloaded">Downloaded</a> <a href="/videos/downloaded{{query_string}}">(?q)</a></span>
     {% endif %}
-    <span>{{videos|length}} items</span>
     
     <center><input type="text" id="search_filter"/></center>
     <center><span id="search_filter_count">{{videos|length}}</span> items</center>
@@ -147,6 +146,7 @@
 
 
 <script type="text/javascript">
+var DOWNLOAD_FILTER = "{{download_filter if download_filter else ""}}";
 var video_card_first_selected = null;
 var video_card_selections = [];
 
@@ -159,16 +159,27 @@ search_filter_box.addEventListener("keyup", search_filter_hook);
 
 function filter_video_cards(search_term)
 {
+    /*
+    Apply the current download filter (pending, ignored, downloaded) by removing
+    mismatched cards from the dom.
+    Apply the search filter textbox by hiding the mismatched cards.
+    */
     var count = 0;
     video_cards = document.getElementById("video_cards");
     video_cards.classList.add("hidden");
     search_term = search_term.toLocaleLowerCase();
     var cards = video_cards.children;
-    for (var index = 0; index < cards.length; index += 1)
+    var download_filter_class = "video_card_" + DOWNLOAD_FILTER;
+    for (var index = 0; index < video_cards.children.length; index += 1)
     {
-        var video_card = cards[index];
+        var video_card = video_cards.children[index];
         var title = video_card.getElementsByClassName("video_title")[0].innerText.toLocaleLowerCase();
-        if (search_term !== "" && title.indexOf(search_term) == -1)
+        if (DOWNLOAD_FILTER && !video_card.classList.contains(download_filter_class))
+        {
+            video_cards.removeChild(video_card);
+            index -= 1;
+        }
+        else if (search_term !== "" && title.indexOf(search_term) == -1)
         {
             video_card.classList.add("hidden");
         }
diff --git a/frontends/ycdl_flask/ycdl_flask/ycdl_flask.py b/frontends/ycdl_flask/ycdl_flask/ycdl_flask.py
index d18b537..619bc31 100644
--- a/frontends/ycdl_flask/ycdl_flask/ycdl_flask.py
+++ b/frontends/ycdl_flask/ycdl_flask/ycdl_flask.py
@@ -181,6 +181,7 @@ def get_channel(channel_id=None, download_filter=None):
     return flask.render_template(
         'channel.html',
         channel=channel,
+        download_filter=download_filter,
         videos=videos,
         query_string='?' + request.query_string.decode('utf-8'),
     )