From ee0a118a6c7ed0e371fed18dcdace1f18a3cabf6 Mon Sep 17 00:00:00 2001
From: James Taylor <user234683@users.noreply.github.com>
Date: Tue, 17 Dec 2019 21:52:31 -0800
Subject: Extraction: Fix thumbnail and remove badges on related videos

---
 youtube/templates/common_elements.html | 6 ++++--
 1 file changed, 4 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 67655b3..1a417ae 100644
--- a/youtube/templates/common_elements.html
+++ b/youtube/templates/common_elements.html
@@ -14,7 +14,7 @@
     {%- endif -%}
 {% endmacro %}
 
-{% macro item(info, description=false, horizontal=true, include_author=true) %}
+{% macro item(info, description=false, horizontal=true, include_author=true, include_badges=true) %}
     <div class="item-box {{ info['type'] + '-item-box' }} {{'horizontal-item-box' if horizontal else 'vertical-item-box'}} {{'has-description' if description else 'no-description'}}">
         <div class="item {{ info['type'] + '-item' }}">
             <a class="thumbnail-box" href="{{ info['url'] }}" title="{{ info['title'] }}">
@@ -52,7 +52,9 @@
             {% if description %}
                 <span class="description">{{ text_runs(info.get('description', '')) }}</span>
             {% endif %}
-            <span class="badges">{{ info['badges']|join(' | ') }}</span>
+            {% if include_badges %}
+                <span class="badges">{{ info['badges']|join(' | ') }}</span>
+            {% endif %}
         </div>
         {% if info['type'] == 'video' %}
             <input class="item-checkbox" type="checkbox" name="video_info_list" value="{{ info['video_info'] }}" form="playlist-edit">
-- 
cgit v1.2.3


From 98777ee82561ae205f156a7f8497728aecfa080c Mon Sep 17 00:00:00 2001
From: James Taylor <user234683@users.noreply.github.com>
Date: Wed, 18 Dec 2019 19:39:16 -0800
Subject: Extraction: Rewrite item_extraction for better error handling and
 readability, rename extracted names for more consistency

---
 youtube/templates/common_elements.html | 78 ++++++++++++++++++----------------
 1 file changed, 41 insertions(+), 37 deletions(-)

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

diff --git a/youtube/templates/common_elements.html b/youtube/templates/common_elements.html
index 1a417ae..4c776b6 100644
--- a/youtube/templates/common_elements.html
+++ b/youtube/templates/common_elements.html
@@ -9,55 +9,59 @@
                 {{ text_run["text"] }}
             {%- endif -%}
         {%- endfor -%}
-    {%- else -%}
+    {%- elif runs -%}
         {{ runs }}
     {%- endif -%}
 {% endmacro %}
 
 {% macro item(info, description=false, horizontal=true, include_author=true, include_badges=true) %}
     <div class="item-box {{ info['type'] + '-item-box' }} {{'horizontal-item-box' if horizontal else 'vertical-item-box'}} {{'has-description' if description else 'no-description'}}">
-        <div class="item {{ info['type'] + '-item' }}">
-            <a class="thumbnail-box" href="{{ info['url'] }}" title="{{ info['title'] }}">
-                <img class="thumbnail-img" src="{{ info['thumbnail'] }}">
-                {% if info['type'] != 'channel' %}
-                    <div class="thumbnail-info">
-                        <span>{{ info['size'] if info['type'] == 'playlist' else info['duration'] }}</span>
-                    </div>
-                {% endif %}
-            </a>
+        {% if info['error'] %}
+            {{ info['error'] }}
+        {% else %}
+            <div class="item {{ info['type'] + '-item' }}">
+                <a class="thumbnail-box" href="{{ info['url'] }}" title="{{ info['title'] }}">
+                    <img class="thumbnail-img" src="{{ info['thumbnail'] }}">
+                    {% if info['type'] != 'channel' %}
+                        <div class="thumbnail-info">
+                            <span>{{ (info['video_count']|string + ' videos') if info['type'] == 'playlist' else info['duration'] }}</span>
+                        </div>
+                    {% endif %}
+                </a>
 
-            <div class="title"><a class="title" href="{{ info['url'] }}" title="{{ info['title'] }}">{{ info['title'] }}</a></div>
+                <div class="title"><a class="title" href="{{ info['url'] }}" title="{{ info['title'] }}">{{ info['title'] }}</a></div>
 
-            <ul class="stats {{'vertical-stats' if horizontal and not description and include_author else 'horizontal-stats'}}">
-                {% if info['type'] == 'channel' %}
-                    <li><span>{{ info['subscriber_count'] }} subscribers</span></li>
-                    <li><span>{{ info['size'] }} videos</span></li>
-                {% else %}
-                    {% if include_author %}
-                        {% if 'author_url' is in(info) %}
-                            <li><address title="{{ info['author'] }}">By <a href="{{ info['author_url'] }}">{{ info['author'] }}</a></address></li>
-                        {% else %}
-                            <li><address title="{{ info['author'] }}"><b>{{ info['author'] }}</b></address></li>
+                <ul class="stats {{'vertical-stats' if horizontal and not description and include_author else 'horizontal-stats'}}">
+                    {% if info['type'] == 'channel' %}
+                        <li><span>{{ info['approx_subscriber_count'] }} subscribers</span></li>
+                        <li><span>{{ info['video_count'] }} videos</span></li>
+                    {% else %}
+                        {% if include_author %}
+                            {% if info.get('author_url') %}
+                                <li><address title="{{ info['author'] }}">By <a href="{{ info['author_url'] }}">{{ info['author'] }}</a></address></li>
+                            {% else %}
+                                <li><address title="{{ info['author'] }}"><b>{{ info['author'] }}</b></address></li>
+                            {% endif %}
+                        {% endif %}
+                        {% if info.get('approx_view_count') %}
+                            <li><span class="views">{{ info['approx_view_count'] }} views</span></li>
+                        {% endif %}
+                        {% if info.get('time_published') %}
+                            <li><time>{{ info['time_published'] }}</time></li>
                         {% endif %}
                     {% endif %}
-                    {% if 'views' is in(info) %}
-                        <li><span class="views">{{ info['views'] }}</span></li>
-                    {% endif %}
-                    {% if 'published' is in(info) %}
-                        <li><time>{{ info['published'] }}</time></li>
-                    {% endif %}
-                {% endif %}
-            </ul>
+                </ul>
 
-            {% if description %}
-                <span class="description">{{ text_runs(info.get('description', '')) }}</span>
-            {% endif %}
-            {% if include_badges %}
-                <span class="badges">{{ info['badges']|join(' | ') }}</span>
+                {% if description %}
+                    <span class="description">{{ text_runs(info.get('description', '')) }}</span>
+                {% endif %}
+                {% if include_badges %}
+                    <span class="badges">{{ info['badges']|join(' | ') }}</span>
+                {% 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>
-        {% if info['type'] == 'video' %}
-            <input class="item-checkbox" type="checkbox" name="video_info_list" value="{{ info['video_info'] }}" form="playlist-edit">
         {% endif %}
     </div>
 
-- 
cgit v1.2.3


From 02848a1a3213bb4ad872865768a7b97f663a24ed Mon Sep 17 00:00:00 2001
From: James Taylor <user234683@users.noreply.github.com>
Date: Thu, 19 Dec 2019 15:46:16 -0800
Subject: Extraction: Adjust related videos box to fit new time_published
 information well time_published will be put to the right of the view_count in
 related videos Author will now always be above the other stats, since it
 doesn't make a difference in the big search result boxes since the
 description snippet is always very short (However, it's important the author
 isn't inline with the other stats in related video boxes since those are so
 narrow and the author name can be very long)

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

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

diff --git a/youtube/templates/common_elements.html b/youtube/templates/common_elements.html
index 4c776b6..7914c08 100644
--- a/youtube/templates/common_elements.html
+++ b/youtube/templates/common_elements.html
@@ -31,18 +31,18 @@
 
                 <div class="title"><a class="title" href="{{ info['url'] }}" title="{{ info['title'] }}">{{ info['title'] }}</a></div>
 
-                <ul class="stats {{'vertical-stats' if horizontal and not description and include_author else 'horizontal-stats'}}">
+                {% if include_author %}
+                    {% if info.get('author_url') %}
+                        <address title="{{ info['author'] }}">By <a href="{{ info['author_url'] }}">{{ info['author'] }}</a></address>
+                    {% else %}
+                        <address title="{{ info['author'] }}"><b>{{ info['author'] }}</b></address>
+                    {% endif %}
+                {% endif %}
+                <ul class="stats {{'horizontal-stats' if horizontal else 'vertical-stats'}}">
                     {% if info['type'] == 'channel' %}
                         <li><span>{{ info['approx_subscriber_count'] }} subscribers</span></li>
                         <li><span>{{ info['video_count'] }} videos</span></li>
                     {% else %}
-                        {% if include_author %}
-                            {% if info.get('author_url') %}
-                                <li><address title="{{ info['author'] }}">By <a href="{{ info['author_url'] }}">{{ info['author'] }}</a></address></li>
-                            {% else %}
-                                <li><address title="{{ info['author'] }}"><b>{{ info['author'] }}</b></address></li>
-                            {% endif %}
-                        {% endif %}
                         {% if info.get('approx_view_count') %}
                             <li><span class="views">{{ info['approx_view_count'] }} views</span></li>
                         {% endif %}
-- 
cgit v1.2.3