Format code with yapf
This commit fixes the style issues introduced in 4635bf8
according to the output
from yapf.
Details: https://deepsource.io/gh/kokarare1212/librespot-python/transform/556eb7b2-7632-467e-b1b4-8e463d91a708/
This commit is contained in:
parent
4635bf8d24
commit
fc57a76aa0
|
@ -30,10 +30,15 @@ def client():
|
|||
if args[0] == "exit" or args[0] == "quit":
|
||||
return
|
||||
if (args[0] == "p" or args[0] == "play") and len(args) == 2:
|
||||
track_uri_search = re.search(r"^spotify:track:(?P<TrackID>[0-9a-zA-Z]{22})$", args[1])
|
||||
track_url_search = re.search(r"^(https?://)?open.spotify.com/track/(?P<TrackID>[0-9a-zA-Z]{22})(\?si=.+?)?$", args[1])
|
||||
track_uri_search = re.search(
|
||||
r"^spotify:track:(?P<TrackID>[0-9a-zA-Z]{22})$", args[1])
|
||||
track_url_search = re.search(
|
||||
r"^(https?://)?open.spotify.com/track/(?P<TrackID>[0-9a-zA-Z]{22})(\?si=.+?)?$",
|
||||
args[1])
|
||||
if track_uri_search is not None or track_url_search is not None:
|
||||
track_id_str = (track_uri_search if track_uri_search is not None else track_url_search).group("TrackID")
|
||||
track_id_str = (track_uri_search
|
||||
if track_uri_search is not None else
|
||||
track_url_search).group("TrackID")
|
||||
play(track_id_str)
|
||||
wait()
|
||||
if args[0] == "q" or args[0] == "quality":
|
||||
|
@ -51,11 +56,18 @@ def client():
|
|||
wait()
|
||||
if (args[0] == "s" or args[0] == "search") and len(args) <= 2:
|
||||
token = session.tokens().get("user-read-email")
|
||||
resp = requests.get("https://api.spotify.com/v1/search", {"limit": "5", "offset": "0", "q": cmd[2:], "type": "track"}, headers={"Authorization": "Bearer %s" % token})
|
||||
resp = requests.get("https://api.spotify.com/v1/search", {
|
||||
"limit": "5",
|
||||
"offset": "0",
|
||||
"q": cmd[2:],
|
||||
"type": "track"
|
||||
},
|
||||
headers={"Authorization": "Bearer %s" % token})
|
||||
i = 1
|
||||
tracks = resp.json()["tracks"]["items"]
|
||||
for track in tracks:
|
||||
print("%d, %s | %s" % (i, track["name"], ",".join([artist["name"] for artist in track["artists"]])))
|
||||
print("%d, %s | %s" % (i, track["name"], ",".join(
|
||||
[artist["name"] for artist in track["artists"]])))
|
||||
i += 1
|
||||
position = -1
|
||||
while True:
|
||||
|
@ -92,11 +104,11 @@ def login():
|
|||
|
||||
def play(track_id_str: str):
|
||||
track_id = TrackId.from_base62(track_id_str)
|
||||
stream = session.content_feeder().load(track_id,
|
||||
VorbisOnlyAudioQuality(AudioQuality.VERY_HIGH),
|
||||
False,
|
||||
None)
|
||||
ffplay = subprocess.Popen(["ffplay", "-"], stdin=subprocess.PIPE, stdout=subprocess.DEVNULL,
|
||||
stream = session.content_feeder().load(
|
||||
track_id, VorbisOnlyAudioQuality(AudioQuality.VERY_HIGH), False, None)
|
||||
ffplay = subprocess.Popen(["ffplay", "-"],
|
||||
stdin=subprocess.PIPE,
|
||||
stdout=subprocess.DEVNULL,
|
||||
stderr=subprocess.DEVNULL)
|
||||
while True:
|
||||
byte = stream.input_stream.stream().read()
|
||||
|
@ -107,12 +119,11 @@ def play(track_id_str: str):
|
|||
|
||||
|
||||
def splash():
|
||||
print(
|
||||
"=================================\n"
|
||||
"| Librespot-Python Player |\n"
|
||||
"| |\n"
|
||||
"| by kokarare1212 |\n"
|
||||
"=================================\n\n\n")
|
||||
print("=================================\n"
|
||||
"| Librespot-Python Player |\n"
|
||||
"| |\n"
|
||||
"| by kokarare1212 |\n"
|
||||
"=================================\n\n\n")
|
||||
|
||||
|
||||
def main():
|
||||
|
|
|
@ -63,8 +63,7 @@ class AbsChunkedInputStream(InputStream, HaltListener):
|
|||
raise IOError("Stream is closed!")
|
||||
self._pos = where
|
||||
|
||||
self.check_availability(int(self._pos / (128 * 1024)),
|
||||
False, False)
|
||||
self.check_availability(int(self._pos / (128 * 1024)), False, False)
|
||||
|
||||
def skip(self, n: int) -> int:
|
||||
if n < 0:
|
||||
|
|
|
@ -31,7 +31,8 @@ class CdnFeedHelper:
|
|||
|
||||
streamer = session.cdn().stream_file(file, key, url, halt_listener)
|
||||
input_stream = streamer.stream()
|
||||
normalization_data = NormalizationData.NormalizationData.read(input_stream)
|
||||
normalization_data = NormalizationData.NormalizationData.read(
|
||||
input_stream)
|
||||
if input_stream.skip(0xa7) != 0xa7:
|
||||
raise IOError("Couldn't skip 0xa7 bytes!")
|
||||
return PlayableContentFeeder.PlayableContentFeeder.LoadedStream(
|
||||
|
|
|
@ -159,7 +159,8 @@ class CdnManager:
|
|||
else:
|
||||
self._expiration = -1
|
||||
|
||||
class Streamer(GeneralAudioStream.GeneralAudioStream, GeneralWritableStream.GeneralWritableStream):
|
||||
class Streamer(GeneralAudioStream.GeneralAudioStream,
|
||||
GeneralWritableStream.GeneralWritableStream):
|
||||
_session: Session = None
|
||||
_streamId: StreamId = None
|
||||
_executorService = concurrent.futures.ThreadPoolExecutor()
|
||||
|
|
|
@ -245,7 +245,8 @@ class Session(Closeable, SubListener, DealerClient.MessageListener):
|
|||
self._channelManager = ChannelManager(self)
|
||||
self._api = ApiClient.ApiClient(self)
|
||||
self._cdnManager = CdnManager(self)
|
||||
self._contentFeeder = PlayableContentFeeder.PlayableContentFeeder(self)
|
||||
self._contentFeeder = PlayableContentFeeder.PlayableContentFeeder(
|
||||
self)
|
||||
self._cacheManager = CacheManager(self)
|
||||
self._dealer = DealerClient(self)
|
||||
self._search = SearchManager.SearchManager(self)
|
||||
|
|
Loading…
Reference in New Issue