From 498546ded8691ecfb699ab45e0e908206f23078e Mon Sep 17 00:00:00 2001 From: "Restyled.io" Date: Tue, 25 May 2021 04:53:22 +0000 Subject: [PATCH 1/4] Restyled by autopep8 --- examples/server/main.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/server/main.py b/examples/server/main.py index f7414c5..b20cf8b 100644 --- a/examples/server/main.py +++ b/examples/server/main.py @@ -92,7 +92,7 @@ def response(client: socket.socket, uri: str, header: dict, start = int(range_search.group("start")) end = int(range_search.group("end")) if int( range_search.group("end")) <= stream.input_stream.stream( - ).size() else stream.input_stream.stream().size() + ).size() else stream.input_stream.stream().size() stream.input_stream.stream().skip(start) client.send(b"HTTP/1.0 200 OK\r\n") client.send(b"Access-Control-Allow-Origin: *\r\n") From ac1e3dc95afcbcbef6d48c982a31959df94f4e5c Mon Sep 17 00:00:00 2001 From: "Restyled.io" Date: Tue, 25 May 2021 04:53:32 +0000 Subject: [PATCH 2/4] Restyled by black --- examples/server/main.py | 54 +++++++++++++++++++++++++---------------- 1 file changed, 33 insertions(+), 21 deletions(-) diff --git a/examples/server/main.py b/examples/server/main.py index b20cf8b..5b7aaa1 100644 --- a/examples/server/main.py +++ b/examples/server/main.py @@ -31,8 +31,9 @@ def handler(client: socket.socket, address: str): continue else: req_header[key.decode().lower()] = value.decode() - status, headers, content, manually = response(client, req_uri.decode(), - req_header, req_body_str) + status, headers, content, manually = response( + client, req_uri.decode(), req_header, req_body_str + ) if not manually: client.send(req_http_version + b" " + status.encode() + b"\r\n") client.send(b"Access-Control-Allow-Origin: *\r\n") @@ -73,40 +74,51 @@ def main(): threading.Thread(target=handler, args=sock.accept()).start() -def response(client: socket.socket, uri: str, header: dict, - body: bytes) -> tuple[str, list, bytes, bool]: +def response( + client: socket.socket, uri: str, header: dict, body: bytes +) -> tuple[str, list, bytes, bool]: if re.search(r"^/audio/track/([0-9a-zA-Z]{22})$", uri) is not None: - track_id_search = re.search( - r"^/audio/track/(?P[0-9a-zA-Z]{22})$", uri) + track_id_search = re.search(r"^/audio/track/(?P[0-9a-zA-Z]{22})$", uri) track_id_str = track_id_search.group("TrackID") track_id = TrackId.from_base62(track_id_str) - stream = session.content_feeder() \ - .load(track_id, VorbisOnlyAudioQuality(AudioQuality.VERY_HIGH), False, None) + stream = session.content_feeder().load( + track_id, VorbisOnlyAudioQuality(AudioQuality.VERY_HIGH), False, None + ) start = 0 end = stream.input_stream.stream().size() if header.get("range") is not None: range_search = re.search( - "^bytes=(?P[0-9]+?)-(?P[0-9]+?)$", - header.get("range")) + "^bytes=(?P[0-9]+?)-(?P[0-9]+?)$", header.get("range") + ) if range_search is not None: start = int(range_search.group("start")) - end = int(range_search.group("end")) if int( - range_search.group("end")) <= stream.input_stream.stream( - ).size() else stream.input_stream.stream().size() + end = ( + int(range_search.group("end")) + if int(range_search.group("end")) + <= stream.input_stream.stream().size() + else stream.input_stream.stream().size() + ) stream.input_stream.stream().skip(start) client.send(b"HTTP/1.0 200 OK\r\n") client.send(b"Access-Control-Allow-Origin: *\r\n") - client.send(b"Content-Length: " + - (str(stream.input_stream.stream().size()).encode() if - stream.input_stream.stream().size() == end else "{}-{}/{}" - .format(start, end, - stream.input_stream.stream().size()).encode()) + - b"\r\n") + client.send( + b"Content-Length: " + + ( + str(stream.input_stream.stream().size()).encode() + if stream.input_stream.stream().size() == end + else "{}-{}/{}".format( + start, end, stream.input_stream.stream().size() + ).encode() + ) + + b"\r\n" + ) client.send(b"Content-Type: audio/ogg\r\n") client.send(b"\r\n") while True: - if stream.input_stream.stream().pos( - ) >= stream.input_stream.stream().size(): + if ( + stream.input_stream.stream().pos() + >= stream.input_stream.stream().size() + ): break byte = stream.input_stream.stream().read() client.send(bytes([byte])) From 4da8f2ec56113e0814360b3a8dab614d1805c3f7 Mon Sep 17 00:00:00 2001 From: "Restyled.io" Date: Tue, 25 May 2021 04:53:36 +0000 Subject: [PATCH 3/4] Restyled by isort --- examples/server/main.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/examples/server/main.py b/examples/server/main.py index 5b7aaa1..92bb7eb 100644 --- a/examples/server/main.py +++ b/examples/server/main.py @@ -1,12 +1,13 @@ -from librespot.audio.decoders import AudioQuality -from librespot.core import Session -from librespot.metadata import TrackId -from librespot.player.codecs import VorbisOnlyAudioQuality import os import re import socket import threading +from librespot.audio.decoders import AudioQuality +from librespot.core import Session +from librespot.metadata import TrackId +from librespot.player.codecs import VorbisOnlyAudioQuality + session: Session sock: socket From 7b4fb2a82590921951d8153ad48d29fe1c0baecd Mon Sep 17 00:00:00 2001 From: "Restyled.io" Date: Tue, 25 May 2021 04:53:51 +0000 Subject: [PATCH 4/4] Restyled by yapf --- examples/server/main.py | 54 +++++++++++++++++------------------------ 1 file changed, 22 insertions(+), 32 deletions(-) diff --git a/examples/server/main.py b/examples/server/main.py index 92bb7eb..f026335 100644 --- a/examples/server/main.py +++ b/examples/server/main.py @@ -32,9 +32,8 @@ def handler(client: socket.socket, address: str): continue else: req_header[key.decode().lower()] = value.decode() - status, headers, content, manually = response( - client, req_uri.decode(), req_header, req_body_str - ) + status, headers, content, manually = response(client, req_uri.decode(), + req_header, req_body_str) if not manually: client.send(req_http_version + b" " + status.encode() + b"\r\n") client.send(b"Access-Control-Allow-Origin: *\r\n") @@ -75,51 +74,42 @@ def main(): threading.Thread(target=handler, args=sock.accept()).start() -def response( - client: socket.socket, uri: str, header: dict, body: bytes -) -> tuple[str, list, bytes, bool]: +def response(client: socket.socket, uri: str, header: dict, + body: bytes) -> tuple[str, list, bytes, bool]: if re.search(r"^/audio/track/([0-9a-zA-Z]{22})$", uri) is not None: - track_id_search = re.search(r"^/audio/track/(?P[0-9a-zA-Z]{22})$", uri) + track_id_search = re.search( + r"^/audio/track/(?P[0-9a-zA-Z]{22})$", uri) track_id_str = track_id_search.group("TrackID") track_id = TrackId.from_base62(track_id_str) stream = session.content_feeder().load( - track_id, VorbisOnlyAudioQuality(AudioQuality.VERY_HIGH), False, None - ) + track_id, VorbisOnlyAudioQuality(AudioQuality.VERY_HIGH), False, + None) start = 0 end = stream.input_stream.stream().size() if header.get("range") is not None: range_search = re.search( - "^bytes=(?P[0-9]+?)-(?P[0-9]+?)$", header.get("range") - ) + "^bytes=(?P[0-9]+?)-(?P[0-9]+?)$", + header.get("range")) if range_search is not None: start = int(range_search.group("start")) - end = ( - int(range_search.group("end")) - if int(range_search.group("end")) - <= stream.input_stream.stream().size() - else stream.input_stream.stream().size() - ) + end = (int(range_search.group("end")) + if int(range_search.group("end")) <= + stream.input_stream.stream().size() else + stream.input_stream.stream().size()) stream.input_stream.stream().skip(start) client.send(b"HTTP/1.0 200 OK\r\n") client.send(b"Access-Control-Allow-Origin: *\r\n") - client.send( - b"Content-Length: " - + ( - str(stream.input_stream.stream().size()).encode() - if stream.input_stream.stream().size() == end - else "{}-{}/{}".format( - start, end, stream.input_stream.stream().size() - ).encode() - ) - + b"\r\n" - ) + client.send(b"Content-Length: " + + (str(stream.input_stream.stream().size()).encode() if + stream.input_stream.stream().size() == end else "{}-{}/{}" + .format(start, end, + stream.input_stream.stream().size()).encode()) + + b"\r\n") client.send(b"Content-Type: audio/ogg\r\n") client.send(b"\r\n") while True: - if ( - stream.input_stream.stream().pos() - >= stream.input_stream.stream().size() - ): + if (stream.input_stream.stream().pos() >= + stream.input_stream.stream().size()): break byte = stream.input_stream.stream().read() client.send(bytes([byte]))