html_common: remove x_item_html functions

2 files changed, 6 insertions, 52 deletions

diff --git a/youtube/html_common.py b/youtube/html_common.py
index 27a582b..8e65a1f 100644
--- a/youtube/html_common.py
+++ b/youtube/html_common.py
@@ -103,56 +103,6 @@ medium_channel_item_template = Template('''
 
 
 
-# -----
-# HTML
-# -----
-
-def small_video_item_html(item):
-    video_info = json.dumps({key: item[key] for key in ('id', 'title', 'author', 'duration')})
-    return small_video_item_template.substitute(
-        title       = html.escape(item["title"]),
-        views       = item["views"],
-        author      = html.escape(item["author"]),
-        duration    = item["duration"],
-        url         = util.URL_ORIGIN + "/watch?v=" + item["id"],
-        thumbnail   = util.get_thumbnail_url(item['id']),
-        video_info  = html.escape(video_info),
-    )
-
-def small_playlist_item_html(item):
-    return small_playlist_item_template.substitute(
-        title=html.escape(item["title"]),
-        size = item['size'],
-        author="",
-        url = util.URL_ORIGIN + "/playlist?list=" + item["id"],
-        thumbnail= util.get_thumbnail_url(item['first_video_id']),
-    )
-
-def medium_playlist_item_html(item):
-    return medium_playlist_item_template.substitute(
-        title=html.escape(item["title"]),
-        size = item['size'],
-        author=item['author'],
-        author_url= util.URL_ORIGIN + item['author_url'],
-        url = util.URL_ORIGIN + "/playlist?list=" + item["id"],
-        thumbnail= item['thumbnail'],
-    )
-
-def medium_video_item_html(medium_video_info):
-    info = medium_video_info
-       
-    return medium_video_item_template.substitute(
-            title=html.escape(info["title"]),
-            views=info["views"],
-            published = info["published"],
-            description = yt_data_extract.format_text_runs(info["description"]),
-            author=html.escape(info["author"]),
-            author_url=info["author_url"],
-            duration=info["duration"],
-            url = util.URL_ORIGIN + "/watch?v=" + info["id"],
-            thumbnail=info['thumbnail'],
-            datetime='', # TODO
-        )
 
 
 header_template = Template('''
diff --git a/youtube/watch.py b/youtube/watch.py
index e8c10a2..06b525a 100644
--- a/youtube/watch.py
+++ b/youtube/watch.py
@@ -127,9 +127,11 @@ def get_related_items_html(info):
     result = ""
     for item in info['related_vids']:
         if 'list' in item:  # playlist:
-            result += html_common.small_playlist_item_html(watch_page_related_playlist_info(item))
+            item = watch_page_related_playlist_info(item)
+            result += html_common.playlist_item_html(item, html_common.small_playlist_item_template)
         else:
-            result += html_common.small_video_item_html(watch_page_related_video_info(item))
+            item = watch_page_related_video_info(item)
+            result += html_common.video_item_html(item, html_common.small_video_item_template)
     return result
 
     
@@ -142,6 +144,7 @@ def watch_page_related_video_info(item):
         result['views'] = item['short_view_count_text']
     except KeyError:
         result['views'] = ''
+    result['thumbnail'] = util.get_thumbnail_url(item['id'])
     return result
     
 def watch_page_related_playlist_info(item):
@@ -150,6 +153,7 @@ def watch_page_related_playlist_info(item):
         'title': item['playlist_title'],
         'id': item['list'],
         'first_video_id': item['video_id'],
+        'thumbnail': util.get_thumbnail_url(item['video_id']),
     }