heckyel/yt-local
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

front-end support for adding to playlists

Browse Source
This commit is contained in:
James Taylor 2018-07-08 02:56:54 -07:00
parent 6ad09eb53a
commit 26620cbac8
15 changed files with 110 additions and 283 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
youtube/channel.py
View File

@ -156,6 +156,7 @@ def channel_videos_html(polymer_json, current_page=1, number_of_videos = 1000, c
items_html = grid_items_html(items, {'author': microformat['title']}) items_html = grid_items_html(items, {'author': microformat['title']})
return yt_channel_items_template.substitute( return yt_channel_items_template.substitute(
header = common.get_header(),
channel_title = microformat['title'], channel_title = microformat['title'],
channel_tabs = channel_tabs_html(channel_id, 'Videos'), channel_tabs = channel_tabs_html(channel_id, 'Videos'),
avatar = '/' + microformat['thumbnail']['thumbnails'][0]['url'], avatar = '/' + microformat['thumbnail']['thumbnails'][0]['url'],
@ -190,6 +191,7 @@ def channel_playlists_html(polymer_json):
items_html = grid_items_html(items, {'author': microformat['title']}) items_html = grid_items_html(items, {'author': microformat['title']})
return yt_channel_items_template.substitute( return yt_channel_items_template.substitute(
header = common.get_header(),
channel_title = microformat['title'], channel_title = microformat['title'],
channel_tabs = channel_tabs_html(channel_id, 'Playlists'), channel_tabs = channel_tabs_html(channel_id, 'Playlists'),
avatar = '/' + microformat['thumbnail']['thumbnails'][0]['url'], avatar = '/' + microformat['thumbnail']['thumbnails'][0]['url'],
@ -227,6 +229,7 @@ def channel_about_page(polymer_json):
except KeyError: except KeyError:
description = '' description = ''
return yt_channel_about_template.substitute( return yt_channel_about_template.substitute(
header = common.get_header(),
page_title = common.get_plain_text(channel_metadata['title']) + ' - About', page_title = common.get_plain_text(channel_metadata['title']) + ' - About',
channel_title = common.get_plain_text(channel_metadata['title']), channel_title = common.get_plain_text(channel_metadata['title']),
avatar = html.escape(avatar), avatar = html.escape(avatar),

7
youtube/comments.py
View File

@ -1,5 +1,5 @@
import json import json
import youtube.proto as proto from youtube import proto, common
import base64 import base64
from youtube.common import uppercase_escape, default_multi_get, format_text_runs, URL_ORIGIN, fetch_url from youtube.common import uppercase_escape, default_multi_get, format_text_runs, URL_ORIGIN, fetch_url
from string import Template from string import Template
@ -98,8 +98,8 @@ def request_comments(ctoken, replies=False):
print("got <!DOCTYPE>, retrying") print("got <!DOCTYPE>, retrying")
continue continue
break break
'''with open('debug/comments_debug', 'wb') as f: with open('debug/comments_debug', 'wb') as f:
f.write(content)''' f.write(content)
return content return content
def parse_comments(content, replies=False): def parse_comments(content, replies=False):
@ -181,6 +181,7 @@ def get_comments_page(query_string):
more_comments_button = more_comments_template.substitute(url = URL_ORIGIN + '/comments?ctoken=' + ctoken) more_comments_button = more_comments_template.substitute(url = URL_ORIGIN + '/comments?ctoken=' + ctoken)
return yt_comments_template.substitute( return yt_comments_template.substitute(
header = common.get_header(),
comments = comments_html, comments = comments_html,
page_title = 'Comments', page_title = 'Comments',
more_comments_button=more_comments_button, more_comments_button=more_comments_button,

30
youtube/common.py
View File

@ -1,4 +1,5 @@
from youtube.template import Template from youtube.template import Template
from youtube import local_playlist
import html import html
import json import json
import re import re
@ -280,8 +281,33 @@ def medium_video_item_html(medium_video_info):
) )
header_template = Template('''
<header>
<div id="header-left">
<form id="site-search" action="/youtube.com/search">
<input type="search" name="query" class="search-box">
<button type="submit" value="Search" class="search-button">Search</button>
</form>
</div>
<div id="header-right">
<form id="playlist-add" action="/youtube.com/edit_playlist" method="post" target="_self">
<input type="hidden" name="action" value="add">
<input name="playlist_name" id="playlist-name-selection" list="playlist-options" type="text">
<datalist id="playlist-options">
$playlists
</datalist>
<button type="submit" id="playlist-add-button">Add to playlist</button>
<button type="reset" id="item-selection-reset">Clear selection</button>
</form>
</div>
</header>
''')
playlist_option_template = Template('''<option value="$name">$name</option>''')
def get_header():
playlists = ''
for name in local_playlist.get_playlist_names():
playlists += playlist_option_template.substitute(name = name)
return header_template.substitute(playlists=playlists)

12
youtube/local_playlist.py
View File

@ -1,13 +1,19 @@
import os.path import os
import json import json
playlists_directory = os.path.normpath("data/playlists") playlists_directory = os.path.normpath("data/playlists")
def add_to_playlist(name, video_info_list): def add_to_playlist(name, video_info_list):
with open(os.path.join(playlists_directory, name), "a", encoding='utf-8') as file: with open(os.path.join(playlists_directory, name + ".txt"), "a", encoding='utf-8') as file:
for info in video_info_list: for info in video_info_list:
file.write(info + "\n") file.write(info + "\n")
def get_playlist_page(name): def get_playlist_page(name):
pass pass
def get_playlist_names():
for item in os.listdir(playlists_directory):
name, ext = os.path.splitext(item)
if ext == '.txt':
yield name

1
youtube/playlist.py
View File

@ -115,6 +115,7 @@ def get_playlist_page(query_string):
stats += playlist_stat_template.substitute(stat=html_ready['size'] + ' videos') stats += playlist_stat_template.substitute(stat=html_ready['size'] + ' videos')
stats += playlist_stat_template.substitute(stat=html_ready['views']) stats += playlist_stat_template.substitute(stat=html_ready['views'])
return yt_playlist_template.substitute( return yt_playlist_template.substitute(
header = common.get_header(),
videos = videos_html, videos = videos_html,
page_buttons = page_buttons, page_buttons = page_buttons,
stats = stats, stats = stats,

1
youtube/search.py
View File

@ -129,6 +129,7 @@ def get_search_page(query_string, parameters=()):
result = Template(yt_search_results_template).substitute( result = Template(yt_search_results_template).substitute(
header = common.get_header(),
results = result_list_html, results = result_list_html,
page_title = query + " - Search", page_title = query + " - Search",
search_box_value = html.escape(query), search_box_value = html.escape(query),

77
youtube/shared.css
View File

@ -23,6 +23,9 @@ body{
background-color:#333333; background-color:#333333;
grid-row: 1; grid-row: 1;
display:grid;
grid-template-columns: 3fr 2fr;
} }
main{ main{
@ -35,28 +38,62 @@ button{
address{ address{
font-style:normal; font-style:normal;
} }
#site-search{
display: grid;
grid-template-columns: 1fr 0fr;
} #header-left{
grid-column:1;
#site-search .search-box{
align-self:center;
height:25px;
border:0;
grid-column: 1;
}
#site-search .search-button{
grid-column: 2;
align-self:center;
height:25px;
border-style:solid;
border-width:1px;
}
display:grid;
grid-template-columns: 1fr 640px;
}
#site-search{
grid-column: 2;
display: grid;
grid-template-columns: 1fr 0fr;
}
#site-search .search-box{
align-self:center;
height:25px;
border:0;
grid-column: 1;
}
#site-search .search-button{
grid-column: 2;
align-self:center;
height:25px;
border-style:solid;
border-width:1px;
}
#header-right{
grid-column:2;
display:grid;
grid-template-columns:40px 400px 100px 1fr;
grid-template-rows: 1fr 1fr;
}
#playlist-add{
display:contents;
}
#playlist-name-selection{
grid-column:2;
grid-row:1;
justify-self:start;
}
#playlist-add-button{
grid-column:2;
grid-row:2;
justify-self:start;
}
#item-selection-reset{
grid-column:3;
grid-row:2;
justify-self:center;
}
.item-list{ .item-list{
display: grid; display: grid;
grid-auto-rows: 138px; grid-auto-rows: 138px;

1
youtube/watch.py
View File

@ -278,6 +278,7 @@ def get_watch_page(query_string):
page = yt_watch_template.substitute( page = yt_watch_template.substitute(
video_title=html.escape(info["title"]), video_title=html.escape(info["title"]),
page_title=html.escape(info["title"]), page_title=html.escape(info["title"]),
header=common.get_header(),
uploader=html.escape(info["uploader"]), uploader=html.escape(info["uploader"]),
uploader_channel_url='/' + info["uploader_url"], uploader_channel_url='/' + info["uploader_url"],
#upload_date=datetime.datetime.fromtimestamp(info["timestamp"]).strftime("%d %b %Y %H:%M:%S"), #upload_date=datetime.datetime.fromtimestamp(info["timestamp"]).strftime("%d %b %Y %H:%M:%S"),

57
yt_channel_about_template.html
View File

@ -5,44 +5,6 @@
<title>$page_title</title> <title>$page_title</title>
<link href="/youtube.com/shared.css" type="text/css" rel="stylesheet"> <link href="/youtube.com/shared.css" type="text/css" rel="stylesheet">
<style type="text/css"> <style type="text/css">
header{
display:grid;
grid-template-columns: 3fr 2fr;
}
#header-left{
grid-column:1;
display:grid;
grid-template-columns: 1fr 640px;
}
#site-search{
grid-column: 2;
}
#header-right{
grid-column:2;
display:grid;
grid-template-columns:40px 400px 100px 1fr;
grid-template-rows: 1fr 1fr;
}
#playlist-add{
display:contents;
}
#playlist-name-selection{
grid-column:2;
grid-row:1;
justify-self:start;
}
#playlist-add-button{
grid-column:2;
grid-row:2;
justify-self:start;
}
#item-selection-reset{
grid-column:3;
grid-row:2;
justify-self:center;
}
main{ main{
display:grid; display:grid;
grid-template-rows: 0fr 0fr 1fr; grid-template-rows: 0fr 0fr 1fr;
@ -82,24 +44,7 @@
</style> </style>
</head> </head>
<body> <body>
<header> $header
<div id="header-left">
<form id="site-search" action="/youtube.com/search">
<input type="search" name="query" class="search-box">
<button type="submit" value="Search" class="search-button">Search</button>
</form>
</div>
<div id="header-right">
<form id="playlist-add" action="/youtube.com/edit_playlist" method="post" target="_self">
<input type="hidden" name="action" value="add">
<select name="playlist_name" id="playlist-name-selection">
<option value="watch_later">watch_later</option>
</select>
<button type="submit" id="playlist-add-button">Add to playlist</button>
<button type="reset" id="item-selection-reset">Clear selection</button>
</form>
</div>
</header>
<main> <main>
<img class="avatar" src="$avatar"> <img class="avatar" src="$avatar">
<h2 class="title">$channel_title</h2> <h2 class="title">$channel_title</h2>

57
yt_channel_items_template.html
View File

@ -5,44 +5,6 @@
<title>$page_title</title> <title>$page_title</title>
<link href="/youtube.com/shared.css" type="text/css" rel="stylesheet"> <link href="/youtube.com/shared.css" type="text/css" rel="stylesheet">
<style type="text/css"> <style type="text/css">
header{
display:grid;
grid-template-columns: 3fr 2fr;
}
#header-left{
grid-column:1;
display:grid;
grid-template-columns: 1fr 640px;
}
#site-search{
grid-column: 2;
}
#header-right{
grid-column:2;
display:grid;
grid-template-columns:40px 400px 100px 1fr;
grid-template-rows: 1fr 1fr;
}
#playlist-add{
display:contents;
}
#playlist-name-selection{
grid-column:2;
grid-row:1;
justify-self:start;
}
#playlist-add-button{
grid-column:2;
grid-row:2;
justify-self:start;
}
#item-selection-reset{
grid-column:3;
grid-row:2;
justify-self:center;
}
main{ main{
display:grid; display:grid;
grid-template-rows: 0fr 0fr 0fr 1fr; grid-template-rows: 0fr 0fr 0fr 1fr;
@ -86,24 +48,7 @@
</style> </style>
</head> </head>
<body> <body>
<header> $header
<div id="header-left">
<form id="site-search" action="/youtube.com/search">
<input type="search" name="query" class="search-box">
<button type="submit" value="Search" class="search-button">Search</button>
</form>
</div>
<div id="header-right">
<form id="playlist-add" action="/youtube.com/edit_playlist" method="post" target="_self">
<input type="hidden" name="action" value="add">
<select name="playlist_name" id="playlist-name-selection">
<option value="watch_later">watch_later</option>
</select>
<button type="submit" id="playlist-add-button">Add to playlist</button>
<button type="reset" id="item-selection-reset">Clear selection</button>
</form>
</div>
</header>
<main> <main>
<img class="avatar" src="$avatar"> <img class="avatar" src="$avatar">
<h2 class="title">$channel_title</h2> <h2 class="title">$channel_title</h2>

23
yt_comments_template.html
View File

@ -10,20 +10,6 @@
display:grid; display:grid;
grid-template-columns: 3fr 2fr; grid-template-columns: 3fr 2fr;
} }
header{
display:grid;
grid-template-columns: 3fr 2fr;
}
#header-left{
grid-column:1;
display:grid;
grid-template-columns: 1fr 640px;
}
#site-search{
grid-column: 2;
}
#left{ #left{
background-color:#bcbcbc; background-color:#bcbcbc;
@ -42,14 +28,7 @@
</style> </style>
</head> </head>
<body> <body>
<header> $header
<div id="header-left">
<form id="site-search" action="/youtube.com/search">
<input type="search" name="query" class="search-box">
<button type="submit" value="Search" class="search-button">Search</button>
</form>
</div>
</header>
<main> <main>
<div id="left"> <div id="left">
<section class="comments"> <section class="comments">

19
yt_playlist_template.html
View File

@ -11,18 +11,8 @@
} }
header{ header{
display:grid;
grid-template-columns: 3fr 1fr; grid-template-columns: 3fr 1fr;
} }
#header-left{
grid-column:1;
display:grid;
grid-template-columns: 1fr 800px;
}
#site-search{
grid-column: 2;
}
#left{ #left{
grid-column: 1; grid-column: 1;
@ -91,14 +81,7 @@
</style> </style>
</head> </head>
<body> <body>
<header> $header
<div id="header-left">
<form id="site-search" action="/youtube.com/search">
<input type="search" name="query" class="search-box">
<button type="submit" value="Search" class="search-button">Search</button>
</form>
</div>
</header>
<main> <main>
<div id="left"> <div id="left">
<div class="playlist-metadata"> <div class="playlist-metadata">

19
yt_search_results_template.html
View File

@ -11,18 +11,8 @@
} }
header{ header{
display:grid;
grid-template-columns: 3fr 1fr; grid-template-columns: 3fr 1fr;
} }
#header-left{
grid-column:1;
display:grid;
grid-template-columns: 1fr 800px;
}
#site-search{
grid-column: 2;
}
#left{ #left{
grid-column: 1; grid-column: 1;
@ -63,14 +53,7 @@
</style> </style>
</head> </head>
<body> <body>
<header> $header
<div id="header-left">
<form id="site-search" action="/youtube.com/search">
<input type="search" name="query" class="search-box" value="$search_box_value">
<button type="submit" value="Search" class="search-button">Search</button>
</form>
</div>
</header>
<main> <main>
<div id="left"> <div id="left">
<div id="result-info"> <div id="result-info">

29
yt_search_template.html
View File

@ -24,9 +24,6 @@
margin:0; margin:0;
} }
#header{ #header{
background-color:#333333;
display: grid;
grid-column: 1 / span 3; grid-column: 1 / span 3;
grid-row: 1; grid-row: 1;
@ -39,33 +36,7 @@
grid-template-columns: 1fr 800px; grid-template-columns: 1fr 800px;
} }
#search-form{
grid-column: 2;
display: grid;
grid-template-columns: 1fr 0fr;
}
#search-box{
grid-column: 1;
align-self:center;
height:25px;
padding:0;
margin:0;
border:0;
}
#search-button{
grid-column: 2;
align-self:center;
height:25px;
padding-top:0;
padding-bottom:0;
border-style:solid;
border-width:1px;
}
#left{ #left{
grid-column: 1; grid-column: 1;

57
yt_watch_template.html
View File

@ -11,44 +11,6 @@
grid-template-columns: 3fr 2fr; grid-template-columns: 3fr 2fr;
} }
header{
display:grid;
grid-template-columns: 3fr 2fr;
}
#header-left{
grid-column:1;
display:grid;
grid-template-columns: 1fr 640px;
}
#site-search{
grid-column: 2;
}
#header-right{
grid-column:2;
display:grid;
grid-template-columns:40px 400px 100px 1fr;
grid-template-rows: 1fr 1fr;
}
#playlist-add{
display:contents;
}
#playlist-name-selection{
grid-column:2;
grid-row:1;
justify-self:start;
}
#playlist-add-button{
grid-column:2;
grid-row:2;
justify-self:start;
}
#item-selection-reset{
grid-column:3;
grid-row:2;
justify-self:center;
}
#left{ #left{
background-color:#bcbcbc; background-color:#bcbcbc;
@ -88,24 +50,7 @@
</style> </style>
</head> </head>
<body> <body>
<header> $header
<div id="header-left">
<form id="site-search" action="/youtube.com/search">
<input type="search" name="query" class="search-box">
<button type="submit" value="Search" class="search-button">Search</button>
</form>
</div>
<div id="header-right">
<form id="playlist-add" action="/youtube.com/edit_playlist" method="post" target="_self">
<input type="hidden" name="action" value="add">
<select name="playlist_name" id="playlist-name-selection">
<option value="watch_later">watch_later</option>
</select>
<button type="submit" id="playlist-add-button">Add to playlist</button>
<button type="reset" id="item-selection-reset">Clear selection</button>
</form>
</div>
</header>
<main> <main>
<div id="left"> <div id="left">
<article class="full-item"> <article class="full-item">