aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--generate_release.py2
-rw-r--r--server.py6
-rw-r--r--settings.py2
-rw-r--r--youtube/post_comment.py2
-rw-r--r--youtube/proto.py28
-rw-r--r--youtube/static/comments.css2
-rw-r--r--youtube/templates/channel.html6
-rw-r--r--youtube/templates/local_playlist.html2
-rw-r--r--youtube/templates/playlist.html6
-rw-r--r--youtube/templates/shared.css14
-rw-r--r--youtube/yt_data_extract/common.py2
-rw-r--r--youtube/yt_data_extract/everything_else.py2
-rw-r--r--youtube/yt_data_extract/watch_extraction.py2
13 files changed, 38 insertions, 38 deletions
diff --git a/generate_release.py b/generate_release.py
index 1a7e14b..ead2772 100644
--- a/generate_release.py
+++ b/generate_release.py
@@ -119,7 +119,7 @@ wine_run(['./python/python.exe', '-I', 'get-pip.py'])
## Isolated mode
We want to run in what is called isolated mode, given by the switch -I.
-This mode prevents the embedded python distribution from searching in
+This mode prevents the embedded python distribution from searching in
global directories for imports
For example, if a user has `C:\Python37` and the embedded distribution is
diff --git a/server.py b/server.py
index acce420..25d3990 100644
--- a/server.py
+++ b/server.py
@@ -66,7 +66,7 @@ def proxy_site(env, start_response, video=False):
# such as 8192 lest that causes the socket library to limit the
# TCP window size
# Might need fine-tuning, since this gives us 4*65536
- # The tradeoff is that larger values (such as 6 seconds) only
+ # The tradeoff is that larger values (such as 6 seconds) only
# allows video to buffer in those increments, meaning user must wait
# until the entire chunk is downloaded before video starts playing
content_part = response.read(32*8192)
@@ -95,9 +95,9 @@ def split_url(url):
match = re.match(r'(?:https?://)?([\w-]+(?:\.[\w-]+)+?)(/.*|$)', url)
if match is None:
raise ValueError('Invalid or unsupported url: ' + url)
-
+
return match.group(1), match.group(2)
-
+
def error_code(code, start_response):
diff --git a/settings.py b/settings.py
index 852310c..159a896 100644
--- a/settings.py
+++ b/settings.py
@@ -134,7 +134,7 @@ For security reasons, enabling this is not recommended.''',
'default': True,
'comment': '',
}),
-
+
('use_comments_js', {
'label': 'Enable comments.js',
'type': bool,
diff --git a/youtube/post_comment.py b/youtube/post_comment.py
index 78f080f..0bf0cf5 100644
--- a/youtube/post_comment.py
+++ b/youtube/post_comment.py
@@ -155,7 +155,7 @@ def get_delete_comment_page():
def get_post_comment_page():
video_id = request.args['video_id']
parent_id = request.args.get('parent_id', '')
-
+
if parent_id: # comment reply
form_action = util.URL_ORIGIN + '/comments?parent_id=' + parent_id + "&video_id=" + video_id
replying = True
diff --git a/youtube/proto.py b/youtube/proto.py
index d966455..5fd16d5 100644
--- a/youtube/proto.py
+++ b/youtube/proto.py
@@ -5,13 +5,13 @@ import io
def byte(n):
return bytes((n,))
-
+
def varint_encode(offset):
'''In this encoding system, for each 8-bit byte, the first bit is 1 if there are more bytes, and 0 is this is the last one.
The next 7 bits are data. These 7-bit sections represent the data in Little endian order. For example, suppose the data is
aaaaaaabbbbbbbccccccc (each of these sections is 7 bits). It will be encoded as:
1ccccccc 1bbbbbbb 0aaaaaaa
-
+
This encoding is used in youtube parameters to encode offsets and to encode the length for length-prefixed data.
See https://developers.google.com/protocol-buffers/docs/encoding#varints for more info.'''
needed_bytes = ceil(offset.bit_length()/7) or 1 # (0).bit_length() returns 0, but we need 1 in that case.
@@ -20,20 +20,20 @@ def varint_encode(offset):
encoded_bytes[i] = (offset & 127) | 128 # 7 least significant bits
offset = offset >> 7
encoded_bytes[-1] = offset & 127 # leave first bit as zero for last byte
-
+
return bytes(encoded_bytes)
-
+
def varint_decode(encoded):
decoded = 0
for i, byte in enumerate(encoded):
decoded |= (byte & 127) << 7*i
-
+
if not (byte & 128):
break
return decoded
-
+
def string(field_number, data):
data = as_bytes(data)
return _proto_field(2, field_number, varint_encode(len(data)) + data)
@@ -41,20 +41,20 @@ nested = string
def uint(field_number, value):
return _proto_field(0, field_number, varint_encode(value))
-
-
-
+
+
+
def _proto_field(wire_type, field_number, data):
''' See https://developers.google.com/protocol-buffers/docs/encoding#structure '''
return varint_encode( (field_number << 3) | wire_type) + data
-
+
def percent_b64encode(data):
return base64.urlsafe_b64encode(data).replace(b'=', b'%3D')
-
-
+
+
def unpadded_b64encode(data):
return base64.urlsafe_b64encode(data).replace(b'=', b'')
@@ -81,7 +81,7 @@ def read_varint(data):
i += 1
return result
-
+
def read_group(data, end_sequence):
start = data.tell()
index = data.original.find(end_sequence, start)
@@ -101,7 +101,7 @@ def read_protobuf(data):
break
wire_type = tag & 7
field_number = tag >> 3
-
+
if wire_type == 0:
value = read_varint(data)
elif wire_type == 1:
diff --git a/youtube/static/comments.css b/youtube/static/comments.css
index 8509e5d..b177a4f 100644
--- a/youtube/static/comments.css
+++ b/youtube/static/comments.css
@@ -1,4 +1,4 @@
-.video-metadata{
+.video-metadata{
display: grid;
grid-template-columns: auto 1fr;
grid-template-rows: auto auto 1fr auto;
diff --git a/youtube/templates/channel.html b/youtube/templates/channel.html
index a0cdff9..dddbff1 100644
--- a/youtube/templates/channel.html
+++ b/youtube/templates/channel.html
@@ -34,11 +34,11 @@
main .channel-tabs{
grid-row:2;
grid-column: 1 / span 2;
-
+
display:grid;
grid-auto-flow: column;
justify-content:start;
-
+
background-color: var(--interface-color);
padding: 3px;
padding-left: 6px;
@@ -103,7 +103,7 @@
}
{% endblock style %}
-{% block main %}
+{% block main %}
<img class="avatar" src="{{ avatar }}">
<div class="summary">
<h2 class="title">{{ channel_name }}</h2>
diff --git a/youtube/templates/local_playlist.html b/youtube/templates/local_playlist.html
index 7ba0642..803c4dc 100644
--- a/youtube/templates/local_playlist.html
+++ b/youtube/templates/local_playlist.html
@@ -25,7 +25,7 @@
}
{% endblock style %}
-{% block main %}
+{% block main %}
<div class="playlist-metadata">
<h2 class="playlist-title">{{ playlist_name }}</h2>
<input type="hidden" name="playlist_page" value="{{ playlist_name }}" form="playlist-edit">
diff --git a/youtube/templates/playlist.html b/youtube/templates/playlist.html
index f34f140..af86c82 100644
--- a/youtube/templates/playlist.html
+++ b/youtube/templates/playlist.html
@@ -6,7 +6,7 @@
width: 800px;
margin:auto;
}
-
+
.playlist-metadata{
display:grid;
grid-template-columns: 0fr 1fr;
@@ -44,7 +44,7 @@
display: grid;
grid-auto-rows: 0fr;
grid-row-gap: 10px;
-
+
}
{% endblock style %}
@@ -61,7 +61,7 @@
<div class="playlist-description">{{ common_elements.text_runs(description) }}</div>
</div>
- <div id="results">
+ <div id="results">
{% for info in video_list %}
{{ common_elements.item(info) }}
{% endfor %}
diff --git a/youtube/templates/shared.css b/youtube/templates/shared.css
index 8aaa706..2288a34 100644
--- a/youtube/templates/shared.css
+++ b/youtube/templates/shared.css
@@ -19,10 +19,10 @@ body{
margin:0;
padding: 0;
color:var(--text-color);
-
-
+
+
background-color:var(--background-color);
-
+
min-height:100vh;
display: flex;
flex-direction: column;
@@ -141,7 +141,7 @@ body{
.item-list{
display: grid;
grid-row-gap: 10px;
-
+
}
@@ -164,7 +164,7 @@ body{
.item-box{
display: inline-flex;
flex-direction: row;
- /* prevent overflow due to long titles with no spaces:
+ /* prevent overflow due to long titles with no spaces:
https://stackoverflow.com/a/43312314 */
min-width: 0;
}
@@ -185,7 +185,7 @@ body{
align-content: start;
grid-template-columns: auto 1fr;
grid-template-rows: auto auto auto auto 1fr;
- /* prevent overflow due to long titles with no spaces:
+ /* prevent overflow due to long titles with no spaces:
https://stackoverflow.com/a/43312314 */
min-width: 0;
}
@@ -308,7 +308,7 @@ body{
justify-content: center;
display: grid;
grid-auto-columns: 40px;
- grid-auto-flow: column;
+ grid-auto-flow: column;
height: 40px;
}
.next-previous-button-row{
diff --git a/youtube/yt_data_extract/common.py b/youtube/yt_data_extract/common.py
index 9610479..683b1c6 100644
--- a/youtube/yt_data_extract/common.py
+++ b/youtube/yt_data_extract/common.py
@@ -295,7 +295,7 @@ def extract_item_info(item, additional_info={}):
info['duration'] = extract_str(item.get('lengthText'))
# if it's an item in a playlist, get its index
- if 'index' in item: # url has wrong index on playlist page
+ if 'index' in item: # url has wrong index on playlist page
info['index'] = extract_int(item.get('index'))
elif 'indexText' in item:
# Current item in playlist has ▶ instead of the actual index, must
diff --git a/youtube/yt_data_extract/everything_else.py b/youtube/yt_data_extract/everything_else.py
index d91dad5..b4b612d 100644
--- a/youtube/yt_data_extract/everything_else.py
+++ b/youtube/yt_data_extract/everything_else.py
@@ -164,7 +164,7 @@ def extract_playlist_metadata(polymer_json):
metadata['video_count'] = extract_int(header.get('numVideosText'))
metadata['description'] = extract_str(header.get('descriptionText'), default='')
metadata['author'] = extract_str(header.get('ownerText'))
- metadata['author_id'] = multi_deep_get(header,
+ metadata['author_id'] = multi_deep_get(header,
['ownerText', 'runs', 0, 'navigationEndpoint', 'browseEndpoint', 'browseId'],
['ownerEndpoint', 'browseEndpoint', 'browseId'])
if metadata['author_id']:
diff --git a/youtube/yt_data_extract/watch_extraction.py b/youtube/yt_data_extract/watch_extraction.py
index f89cec1..5e57c15 100644
--- a/youtube/yt_data_extract/watch_extraction.py
+++ b/youtube/yt_data_extract/watch_extraction.py
@@ -172,7 +172,7 @@ def _extract_watch_info_mobile(top_level):
else:
info['playlist'] = {}
info['playlist']['title'] = playlist.get('title')
- info['playlist']['author'] = extract_str(multi_get(playlist,
+ info['playlist']['author'] = extract_str(multi_get(playlist,
'ownerName', 'longBylineText', 'shortBylineText', 'ownerText'))
author_id = deep_get(playlist, 'longBylineText', 'runs', 0,
'navigationEndpoint', 'browseEndpoint', 'browseId')
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-23 19:05:30 +0000