Merge flask framework and other stuff from master

1 files changed, 57 insertions, 58 deletions

diff --git a/youtube/local_playlist.py b/youtube/local_playlist.py
index d083e33..88d020f 100644
--- a/youtube/local_playlist.py
+++ b/youtube/local_playlist.py
@@ -1,5 +1,5 @@
-from youtube.template import Template
-from youtube import util, html_common
+from youtube import util, yt_data_extract
+from youtube import yt_app
 import settings
 
 import os
@@ -7,13 +7,14 @@ import json
 import html
 import gevent
 import urllib
+import math
+
+import flask
+from flask import request
 
 playlists_directory = os.path.join(settings.data_dir, "playlists")
 thumbnails_directory = os.path.join(settings.data_dir, "playlist_thumbnails")
 
-with open('yt_local_playlist_template.html', 'r', encoding='utf-8') as file:
-    local_playlist_template = Template(file.read())
-
 def video_ids_in_playlist(name):
     try:
         with open(os.path.join(playlists_directory, name + ".txt"), 'r', encoding='utf-8') as file:
@@ -36,36 +37,34 @@ def add_to_playlist(name, video_info_list):
     gevent.spawn(util.download_thumbnails, os.path.join(thumbnails_directory, name), missing_thumbnails)
         
 
-def get_local_playlist_page(name):
+def get_local_playlist_videos(name, offset=0, amount=50):
     try:
         thumbnails = set(os.listdir(os.path.join(thumbnails_directory, name)))
     except FileNotFoundError:
         thumbnails = set()
     missing_thumbnails = []
 
-    videos_html = ''
+    videos = []
     with open(os.path.join(playlists_directory, name + ".txt"), 'r', encoding='utf-8') as file:
-        videos = file.read()
-    videos = videos.splitlines()
-    for video in videos:
+        data = file.read()
+    videos_json = data.splitlines()
+    for video_json in videos_json:
         try:
-            info = json.loads(video)
+            info = json.loads(video_json)
             if info['id'] + ".jpg" in thumbnails:
                 info['thumbnail'] = "/youtube.com/data/playlist_thumbnails/" + name + "/" + info['id'] + ".jpg"
             else:
                 info['thumbnail'] = util.get_thumbnail_url(info['id'])
                 missing_thumbnails.append(info['id'])
-            videos_html += html_common.video_item_html(info, html_common.small_video_item_template)
+            info['item_size'] = 'small'
+            info['type'] = 'video'
+            yt_data_extract.add_extra_html_info(info)
+            videos.append(info)
         except json.decoder.JSONDecodeError:
-            pass
+            if not video_json.strip() == '':
+                print('Corrupt playlist video entry: ' + video_json)
     gevent.spawn(util.download_thumbnails, os.path.join(thumbnails_directory, name), missing_thumbnails)
-    return local_playlist_template.substitute(
-        page_title = name + ' - Local playlist',
-        header = html_common.get_header(),
-        videos = videos_html,
-        title = name,
-        page_buttons = ''
-    )
+    return videos[offset:offset+amount], len(videos)
 
 def get_playlist_names():
     try:
@@ -98,47 +97,47 @@ def remove_from_playlist(name, video_info_list):
         for file in to_delete:
             os.remove(os.path.join(thumbnails_directory, name, file))
 
-def get_playlists_list_page():
-    page = '''<ul>\n'''
-    list_item_template = Template('''    <li><a href="$url">$name</a></li>\n''')
-    for name in get_playlist_names():
-        page += list_item_template.substitute(url = html.escape(util.URL_ORIGIN + '/playlists/' + name), name = html.escape(name))
-    page += '''</ul>\n'''
-    return html_common.yt_basic_template.substitute(
-        page_title = "Local playlists",
-        header = html_common.get_header(),
-        style = '',
-        page = page,
-    )
-
-
-def get_playlist_page(env, start_response):
-    start_response('200 OK', [('Content-type','text/html'),])
-    path_parts = env['path_parts']
-    if len(path_parts) == 1:
-        return get_playlists_list_page().encode('utf-8')
-    else:
-        return get_local_playlist_page(path_parts[1]).encode('utf-8')
+    return len(videos_out)
 
-def path_edit_playlist(env, start_response):
-    '''Called when making changes to the playlist from that playlist's page'''
-    parameters = env['parameters']
-    if parameters['action'][0] == 'remove':
-        playlist_name = env['path_parts'][1]
-        remove_from_playlist(playlist_name, parameters['video_info_list'])
-        start_response('303 See Other', [('Location', util.URL_ORIGIN + env['PATH_INFO']),] )
-        return b''
 
+@yt_app.route('/playlists', methods=['GET'])
+@yt_app.route('/playlists/<playlist_name>', methods=['GET'])
+def get_local_playlist_page(playlist_name=None):
+    if playlist_name is None:
+        playlists = [(name, util.URL_ORIGIN + '/playlists/' + name) for name in get_playlist_names()]
+        return flask.render_template('local_playlists_list.html', playlists=playlists)
+    else:
+        page = int(request.args.get('page', 1))
+        offset = 50*(page - 1)
+        videos, num_videos = get_local_playlist_videos(playlist_name, offset=offset, amount=50)
+        return flask.render_template('local_playlist.html',
+            playlist_name = playlist_name,
+            videos = videos,
+            num_pages = math.ceil(num_videos/50),
+            parameters_dictionary = request.args,
+        )
+
+@yt_app.route('/playlists/<playlist_name>', methods=['POST'])
+def path_edit_playlist(playlist_name):
+    '''Called when making changes to the playlist from that playlist's page'''
+    if request.values['action'] == 'remove':
+        videos_to_remove = request.values.getlist('video_info_list')
+        number_of_videos_remaining = remove_from_playlist(playlist_name, videos_to_remove)
+        redirect_page_number = min(int(request.values.get('page', 1)), math.ceil(number_of_videos_remaining/50))
+        return flask.redirect(util.URL_ORIGIN + request.path + '?page=' + str(redirect_page_number))
     else:
-        start_response('400 Bad Request', [('Content-type', 'text/plain'),])
-        return b'400 Bad Request'
+        flask.abort(400)
 
-def edit_playlist(env, start_response):
+@yt_app.route('/edit_playlist', methods=['POST'])
+def edit_playlist():
     '''Called when adding videos to a playlist from elsewhere'''
-    parameters = env['parameters']
-    if parameters['action'][0] == 'add':
-        add_to_playlist(parameters['playlist_name'][0], parameters['video_info_list'])
-        start_response('204 No Content', ())
+    if request.values['action'] == 'add':
+        add_to_playlist(request.values['playlist_name'], request.values.getlist('video_info_list'))
+        return '', 204
     else:
-        start_response('400 Bad Request', [('Content-type', 'text/plain'),])
-        return b'400 Bad Request'
+        flask.abort(400)
+
+@yt_app.route('/data/playlist_thumbnails/<playlist_name>/<thumbnail>')
+def serve_thumbnail(playlist_name, thumbnail):
+    # .. is necessary because flask always uses the application directory at ./youtube, not the working directory
+    return flask.send_from_directory(os.path.join('..', thumbnails_directory, playlist_name), thumbnail)