From 1156b0998758ee803c7e8ae0cc2beb5181c232a3 Mon Sep 17 00:00:00 2001
From: James Taylor <user234683@users.noreply.github.com>
Date: Fri, 21 Jun 2019 21:41:41 -0700
Subject: Refactor search page

---
 youtube/templates/common_elements.html | 152 +++++++++++++++++++++++++++++++++
 1 file changed, 152 insertions(+)
 create mode 100644 youtube/templates/common_elements.html

(limited to 'youtube/templates/common_elements.html')

diff --git a/youtube/templates/common_elements.html b/youtube/templates/common_elements.html
new file mode 100644
index 0000000..9f2aa3f
--- /dev/null
+++ b/youtube/templates/common_elements.html
@@ -0,0 +1,152 @@
+{% macro text_runs(runs) %}
+    {%- if runs[0] is mapping -%}
+        {%- for text_run in runs -%}
+            {%- if text_run.get("bold", false) -%}
+                <b>{{ text_run["text"] }}</b>
+            {%- elif text_run.get('italics', false) -%}
+                <i>{{ text_run["text"] }}</i>
+            {%- else -%}
+                {{ text_run["text"] }}
+            {%- endif -%}
+        {%- endfor -%}
+    {%- else -%}
+        {{ runs }}
+    {%- endif -%}
+{% endmacro %}
+
+{% macro small_item(info) %}
+    <div class="small-item-box">
+        <div class="small-item">
+            {% if info['type'] == 'video' %}
+                <a class="video-thumbnail-box" href="{{ info['url'] }}" title="{{ info['title'] }}">
+                    <img class="video-thumbnail-img" src="{{ info['thumbnail'] }}">
+                    <span class="video-duration">{{ info['duration'] }}</span>
+                </a>
+                <a class="title" href="{{ info['url'] }}" title="{{ info['title'] }}">{{ info['title'] }}</a>
+                
+                <address>{{ info['author'] }}</address>
+                <span class="views">{{ info['views'] }}</span>
+
+            {% elif info['type'] == 'playlist' %}
+                <a class="playlist-thumbnail-box" href="{{ info['url'] }}" title="{{ info['title'] }}">
+                    <img class="playlist-thumbnail-img" src="{{ info['thumbnail'] }}">
+                    <div class="playlist-thumbnail-info">
+                        <span>{{ info['size'] }}</span>
+                    </div>
+                </a>
+                <a class="title" href="{{ info['url'] }}" title="{{ info['title'] }}">{{ info['title'] }}</a>
+                
+                <address>{{ info['author'] }}</address>
+            {% else %}
+                Error: unsupported item type
+            {% endif %}
+        </div>
+        {% if info['type'] == 'video' %}
+            <input class="item-checkbox" type="checkbox" name="video_info_list" value="{{ info['video_info'] }}" form="playlist-edit">
+        {% endif %}
+    </div>
+{% endmacro %}
+
+{% macro get_stats(info) %}
+    {% if 'author_url' is in(info) %}
+        <address>By <a href="{{ info['author_url'] }}">{{ info['author'] }}</a></address>
+    {% else %}
+        <address><b>{{ info['author'] }}</b></address>
+    {% endif %}
+    {% if 'views' is in(info) %}
+        <span class="views">{{ info['views'] }}</span>
+    {% endif %}
+    {% if 'published' is in(info) %}
+        <time>{{ info['published'] }}</time>
+    {% endif %}
+{% endmacro %}
+
+
+
+{% macro medium_item(info) %}
+    <div class="medium-item-box">
+        <div class="medium-item">
+            {% if info['type'] == 'video' %}
+                <a class="video-thumbnail-box" href="{{ info['url'] }}" title="{{ info['title'] }}">
+                    <img class="video-thumbnail-img" src="{{ info['thumbnail'] }}">
+                    <span class="video-duration">{{ info['duration'] }}</span>
+                </a>
+
+                <a class="title" href="{{ info['url'] }}" title="{{ info['title'] }}">{{ info['title'] }}</a>
+                
+                <div class="stats">
+                    {{ get_stats(info) }}
+                </div>
+
+                <span class="description">{{ text_runs(info['description']) }}</span>
+                <span class="badges">{{ info['badges']|join(' | ') }}</span>
+            {% elif info['type'] == 'playlist' %}
+                <a class="playlist-thumbnail-box" href="{{ info['url'] }}" title="{{ info['title'] }}">
+                    <img class="playlist-thumbnail-img" src="{{ info['thumbnail'] }}">
+                    <div class="playlist-thumbnail-info">
+                        <span>{{ info['size'] }}</span>
+                    </div>
+                </a>
+
+                <a class="title" href="{{ info['url'] }}" title="{{ info['title'] }}">{{ info['title'] }}</a>
+                
+                <div class="stats">
+                    {{ get_stats(info) }}
+                </div>
+            {% elif info['type'] == 'channel' %}
+                <a class="video-thumbnail-box" href="{{ info['url'] }}" title="{{ info['title'] }}">
+                    <img class="video-thumbnail-img" src="{{ info['thumbnail'] }}">
+                </a>
+
+                <a class="title" href="{{ info['url'] }}">{{ info['title'] }}</a>
+                
+                <span>{{ info['subscriber_count'] }}</span>
+                <span>{{ info['size'] }}</span>
+
+                <span class="description">{{ text_runs(info['description']) }}</span>
+            {% else %}
+                Error: unsupported item type
+            {% endif %}
+        </div>
+        {% if info['type'] == 'video' %}
+            <input class="item-checkbox" type="checkbox" name="video_info_list" value="{{ info['video_info'] }}" form="playlist-edit">
+        {% endif %}
+    </div>
+{% endmacro %}
+
+
+{% macro item(info) %}
+    {% if info['item_size'] == 'small' %}
+        {{ small_item(info) }}
+    {% elif info['item_size'] == 'medium' %}
+        {{ medium_item(info) }}
+    {% else %}
+        Error: Unknown item size
+    {% endif %}
+{% endmacro %}
+
+
+
+{% macro page_buttons(estimated_pages, url, parameters_dictionary) %}
+    {% set current_page = parameters_dictionary.get('page', 1)|int %}
+    {% set parameters_dictionary = parameters_dictionary.to_dict() %}
+    {% if current_page is le(5) %}
+        {% set page_start = 1 %}
+        {% set page_end = [9, estimated_pages]|min %}
+    {% else %}
+        {% set page_start = current_page - 4 %}
+        {% set page_end = [current_page + 4, estimated_pages]|min %}
+    {% endif %}
+
+    {% for page in range(page_start, page_end+1) %}
+        {% if page == current_page %}
+            <div class="page-button">{{ page }}</div>
+        {% else %}
+            {# IMPORTANT: Jinja SUCKS #}
+            {# https://stackoverflow.com/questions/36886650/how-to-add-a-new-entry-into-a-dictionary-object-while-using-jinja2 #}
+            {% set _ = parameters_dictionary.__setitem__('page', page) %}
+            <a class="page-button" href="{{ url + '?' + parameters_dictionary|urlencode }}">{{ page }}</a>
+        {% endif %}
+    {% endfor %}
+
+{% endmacro %}
-- 
cgit v1.2.3


From 315039bebd8d47820e3c0baeb7ac258db6741582 Mon Sep 17 00:00:00 2001
From: James Taylor <user234683@users.noreply.github.com>
Date: Thu, 4 Jul 2019 18:20:51 -0700
Subject: common_elements.html: accept missing description as blank

---
 youtube/templates/common_elements.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'youtube/templates/common_elements.html')

diff --git a/youtube/templates/common_elements.html b/youtube/templates/common_elements.html
index 9f2aa3f..b140332 100644
--- a/youtube/templates/common_elements.html
+++ b/youtube/templates/common_elements.html
@@ -78,7 +78,7 @@
                     {{ get_stats(info) }}
                 </div>
 
-                <span class="description">{{ text_runs(info['description']) }}</span>
+                <span class="description">{{ text_runs(info.get('description', '')) }}</span>
                 <span class="badges">{{ info['badges']|join(' | ') }}</span>
             {% elif info['type'] == 'playlist' %}
                 <a class="playlist-thumbnail-box" href="{{ info['url'] }}" title="{{ info['title'] }}">
-- 
cgit v1.2.3


From 64434b02ca50c2a6324caa1355559bd881ba687e Mon Sep 17 00:00:00 2001
From: James Taylor <user234683@users.noreply.github.com>
Date: Sat, 6 Jul 2019 18:36:09 -0700
Subject: Convert channel page to flask framework

---
 youtube/templates/common_elements.html | 26 ++++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)

(limited to 'youtube/templates/common_elements.html')

diff --git a/youtube/templates/common_elements.html b/youtube/templates/common_elements.html
index b140332..0843c4b 100644
--- a/youtube/templates/common_elements.html
+++ b/youtube/templates/common_elements.html
@@ -14,7 +14,7 @@
     {%- endif -%}
 {% endmacro %}
 
-{% macro small_item(info) %}
+{% macro small_item(info, include_author=true) %}
     <div class="small-item-box">
         <div class="small-item">
             {% if info['type'] == 'video' %}
@@ -47,11 +47,13 @@
     </div>
 {% endmacro %}
 
-{% macro get_stats(info) %}
-    {% if 'author_url' is in(info) %}
-        <address>By <a href="{{ info['author_url'] }}">{{ info['author'] }}</a></address>
-    {% else %}
-        <address><b>{{ info['author'] }}</b></address>
+{% macro get_stats(info, include_author=true) %}
+    {% if include_author %}
+        {% if 'author_url' is in(info) %}
+            <address>By <a href="{{ info['author_url'] }}">{{ info['author'] }}</a></address>
+        {% else %}
+            <address><b>{{ info['author'] }}</b></address>
+        {% endif %}
     {% endif %}
     {% if 'views' is in(info) %}
         <span class="views">{{ info['views'] }}</span>
@@ -63,7 +65,7 @@
 
 
 
-{% macro medium_item(info) %}
+{% macro medium_item(info, include_author=true) %}
     <div class="medium-item-box">
         <div class="medium-item">
             {% if info['type'] == 'video' %}
@@ -75,7 +77,7 @@
                 <a class="title" href="{{ info['url'] }}" title="{{ info['title'] }}">{{ info['title'] }}</a>
                 
                 <div class="stats">
-                    {{ get_stats(info) }}
+                    {{ get_stats(info, include_author) }}
                 </div>
 
                 <span class="description">{{ text_runs(info.get('description', '')) }}</span>
@@ -91,7 +93,7 @@
                 <a class="title" href="{{ info['url'] }}" title="{{ info['title'] }}">{{ info['title'] }}</a>
                 
                 <div class="stats">
-                    {{ get_stats(info) }}
+                    {{ get_stats(info, include_author) }}
                 </div>
             {% elif info['type'] == 'channel' %}
                 <a class="video-thumbnail-box" href="{{ info['url'] }}" title="{{ info['title'] }}">
@@ -115,11 +117,11 @@
 {% endmacro %}
 
 
-{% macro item(info) %}
+{% macro item(info, include_author=true) %}
     {% if info['item_size'] == 'small' %}
-        {{ small_item(info) }}
+        {{ small_item(info, include_author) }}
     {% elif info['item_size'] == 'medium' %}
-        {{ medium_item(info) }}
+        {{ medium_item(info, include_author) }}
     {% else %}
         Error: Unknown item size
     {% endif %}
-- 
cgit v1.2.3


From 728b2b73d49d9112b8874783e038d901244dd7d8 Mon Sep 17 00:00:00 2001
From: James Taylor <user234683@users.noreply.github.com>
Date: Sun, 7 Jul 2019 17:32:11 -0700
Subject: common_elements.html: Accept missing channel description as blank

---
 youtube/templates/common_elements.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'youtube/templates/common_elements.html')

diff --git a/youtube/templates/common_elements.html b/youtube/templates/common_elements.html
index 0843c4b..a6921e1 100644
--- a/youtube/templates/common_elements.html
+++ b/youtube/templates/common_elements.html
@@ -105,7 +105,7 @@
                 <span>{{ info['subscriber_count'] }}</span>
                 <span>{{ info['size'] }}</span>
 
-                <span class="description">{{ text_runs(info['description']) }}</span>
+                <span class="description">{{ text_runs(info.get('description', '')) }}</span>
             {% else %}
                 Error: unsupported item type
             {% endif %}
-- 
cgit v1.2.3


From eb89c7426d8918332558aaba9ff4b7547c507f96 Mon Sep 17 00:00:00 2001
From: James Taylor <user234683@users.noreply.github.com>
Date: Wed, 24 Jul 2019 00:02:04 -0700
Subject: Add 'subscribers' and 'videos' after corresponding numbers in channel
 item in search results

---
 youtube/templates/common_elements.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'youtube/templates/common_elements.html')

diff --git a/youtube/templates/common_elements.html b/youtube/templates/common_elements.html
index a6921e1..49e2fad 100644
--- a/youtube/templates/common_elements.html
+++ b/youtube/templates/common_elements.html
@@ -102,8 +102,8 @@
 
                 <a class="title" href="{{ info['url'] }}">{{ info['title'] }}</a>
                 
-                <span>{{ info['subscriber_count'] }}</span>
-                <span>{{ info['size'] }}</span>
+                <span>{{ info['subscriber_count'] }} subscribers</span>
+                <span>{{ info['size'] }} videos</span>
 
                 <span class="description">{{ text_runs(info.get('description', '')) }}</span>
             {% else %}
-- 
cgit v1.2.3