Merge branch 'master' into optional_proxy_images

2020-10-12 09:37:13 -07:00
parent 37d286fc7c 2cfc6dec39
commit fd253d9e07
12 changed files with 102 additions and 24 deletions
--- a/youtube/playlist.py
+++ b/youtube/playlist.py
@@ -1,4 +1,4 @@
-from youtube import util, yt_data_extract, proto
+from youtube import util, yt_data_extract, proto, local_playlist
 from youtube import yt_app
 import settings

@@ -115,6 +115,7 @@ def get_playlist_page():
        video_count = 40

    return flask.render_template('playlist.html',
+        header_playlist_names = local_playlist.get_playlist_names(),
        video_list = info.get('items', []),
        num_pages = math.ceil(video_count/20),
        parameters_dictionary = request.args,