From 6261add37de1800c90b0942a77cca99baf0b1973 Mon Sep 17 00:00:00 2001 From: James Taylor Date: Sat, 6 Jul 2019 23:08:04 -0700 Subject: Convert local_playlist to flask framework --- youtube/local_playlist.py | 106 +++++++++++++++++++++------------------------- 1 file changed, 48 insertions(+), 58 deletions(-) (limited to 'youtube/local_playlist.py') diff --git a/youtube/local_playlist.py b/youtube/local_playlist.py index e354013..8c673e9 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 @@ -8,12 +8,12 @@ import html import gevent import urllib +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: @@ -62,36 +62,34 @@ def download_thumbnails(playlist_name, ids): -def get_local_playlist_page(name): +def get_local_playlist_videos(name): 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(download_thumbnails, 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 def get_playlist_names(): try: @@ -124,47 +122,39 @@ 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 = '''\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') -def path_edit_playlist(env, start_response): +@yt_app.route('/playlists', methods=['GET']) +@yt_app.route('/playlists/', 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: + videos = get_local_playlist_videos(playlist_name) + return flask.render_template('local_playlist.html', + playlist_name = playlist_name, + videos = videos, + ) + +@yt_app.route('/playlists/', methods=['POST']) +def path_edit_playlist(playlist_name): '''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'' - + if request.values['action'] == 'remove': + remove_from_playlist(playlist_name, request.values.getlist('video_info_list')) + return flask.redirect(util.URL_ORIGIN + request.path) 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//') +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) -- cgit v1.2.3 From adc40bc760345a23678a01f27d7697dfd3811914 Mon Sep 17 00:00:00 2001 From: James Taylor Date: Fri, 9 Aug 2019 21:18:43 -0700 Subject: Add pagination for local playlists --- youtube/local_playlist.py | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) (limited to 'youtube/local_playlist.py') diff --git a/youtube/local_playlist.py b/youtube/local_playlist.py index 8c673e9..bb05d1a 100644 --- a/youtube/local_playlist.py +++ b/youtube/local_playlist.py @@ -7,6 +7,7 @@ import json import html import gevent import urllib +import math import flask from flask import request @@ -62,7 +63,7 @@ def download_thumbnails(playlist_name, ids): -def get_local_playlist_videos(name): +def get_local_playlist_videos(name, offset=0, amount=50): try: thumbnails = set(os.listdir(os.path.join(thumbnails_directory, name))) except FileNotFoundError: @@ -89,7 +90,7 @@ def get_local_playlist_videos(name): if not video_json.strip() == '': print('Corrupt playlist video entry: ' + video_json) gevent.spawn(download_thumbnails, name, missing_thumbnails) - return videos + return videos[offset:offset+amount], len(videos) def get_playlist_names(): try: @@ -122,6 +123,8 @@ def remove_from_playlist(name, video_info_list): for file in to_delete: os.remove(os.path.join(thumbnails_directory, name, file)) + return len(videos_out) + @yt_app.route('/playlists', methods=['GET']) @yt_app.route('/playlists/', methods=['GET']) @@ -130,18 +133,24 @@ def get_local_playlist_page(playlist_name=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: - videos = get_local_playlist_videos(playlist_name) + 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/', 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': - remove_from_playlist(playlist_name, request.values.getlist('video_info_list')) - return flask.redirect(util.URL_ORIGIN + request.path) + 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: flask.abort(400) -- cgit v1.2.3