From a27b575380378f1b490dcabb8cc67f05adee5daa Mon Sep 17 00:00:00 2001 From: zrose584 <57181548+zrose584@users.noreply.github.com> Date: Wed, 21 Oct 2020 10:35:01 +0200 Subject: remove trailing whitespaces --- generate_release.py | 2 +- server.py | 6 +++--- settings.py | 2 +- youtube/post_comment.py | 2 +- youtube/proto.py | 28 ++++++++++++++-------------- youtube/static/comments.css | 2 +- youtube/templates/channel.html | 6 +++--- youtube/templates/local_playlist.html | 2 +- youtube/templates/playlist.html | 6 +++--- youtube/templates/shared.css | 14 +++++++------- youtube/yt_data_extract/common.py | 2 +- youtube/yt_data_extract/everything_else.py | 2 +- youtube/yt_data_extract/watch_extraction.py | 2 +- 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 %}