Restyled by black
This commit is contained in:
@@ -31,14 +31,18 @@ def client():
|
|||||||
return
|
return
|
||||||
if (args[0] == "p" or args[0] == "play") and len(args) == 2:
|
if (args[0] == "p" or args[0] == "play") and len(args) == 2:
|
||||||
track_uri_search = re.search(
|
track_uri_search = re.search(
|
||||||
r"^spotify:track:(?P<TrackID>[0-9a-zA-Z]{22})$", args[1])
|
r"^spotify:track:(?P<TrackID>[0-9a-zA-Z]{22})$", args[1]
|
||||||
|
)
|
||||||
track_url_search = re.search(
|
track_url_search = re.search(
|
||||||
r"^(https?://)?open.spotify.com/track/(?P<TrackID>[0-9a-zA-Z]{22})(\?si=.+?)?$",
|
r"^(https?://)?open.spotify.com/track/(?P<TrackID>[0-9a-zA-Z]{22})(\?si=.+?)?$",
|
||||||
args[1])
|
args[1],
|
||||||
|
)
|
||||||
if track_uri_search is not None or track_url_search is not None:
|
if track_uri_search is not None or track_url_search is not None:
|
||||||
track_id_str = (track_uri_search
|
track_id_str = (
|
||||||
if track_uri_search is not None else
|
track_uri_search
|
||||||
track_url_search).group("TrackID")
|
if track_uri_search is not None
|
||||||
|
else track_url_search
|
||||||
|
).group("TrackID")
|
||||||
play(track_id_str)
|
play(track_id_str)
|
||||||
wait()
|
wait()
|
||||||
if args[0] == "q" or args[0] == "quality":
|
if args[0] == "q" or args[0] == "quality":
|
||||||
@@ -56,18 +60,22 @@ def client():
|
|||||||
wait()
|
wait()
|
||||||
if (args[0] == "s" or args[0] == "search") and len(args) >= 2:
|
if (args[0] == "s" or args[0] == "search") and len(args) >= 2:
|
||||||
token = session.tokens().get("user-read-email")
|
token = session.tokens().get("user-read-email")
|
||||||
resp = requests.get("https://api.spotify.com/v1/search", {
|
resp = requests.get(
|
||||||
"limit": "5",
|
"https://api.spotify.com/v1/search",
|
||||||
"offset": "0",
|
{"limit": "5", "offset": "0", "q": cmd[2:], "type": "track"},
|
||||||
"q": cmd[2:],
|
headers={"Authorization": "Bearer %s" % token},
|
||||||
"type": "track"
|
)
|
||||||
},
|
|
||||||
headers={"Authorization": "Bearer %s" % token})
|
|
||||||
i = 1
|
i = 1
|
||||||
tracks = resp.json()["tracks"]["items"]
|
tracks = resp.json()["tracks"]["items"]
|
||||||
for track in tracks:
|
for track in tracks:
|
||||||
print("%d, %s | %s" % (i, track["name"], ",".join(
|
print(
|
||||||
[artist["name"] for artist in track["artists"]])))
|
"%d, %s | %s"
|
||||||
|
% (
|
||||||
|
i,
|
||||||
|
track["name"],
|
||||||
|
",".join([artist["name"] for artist in track["artists"]]),
|
||||||
|
)
|
||||||
|
)
|
||||||
i += 1
|
i += 1
|
||||||
position = -1
|
position = -1
|
||||||
while True:
|
while True:
|
||||||
@@ -105,11 +113,14 @@ def login():
|
|||||||
def play(track_id_str: str):
|
def play(track_id_str: str):
|
||||||
track_id = TrackId.from_base62(track_id_str)
|
track_id = TrackId.from_base62(track_id_str)
|
||||||
stream = session.content_feeder().load(
|
stream = session.content_feeder().load(
|
||||||
track_id, VorbisOnlyAudioQuality(AudioQuality.VERY_HIGH), False, None)
|
track_id, VorbisOnlyAudioQuality(AudioQuality.VERY_HIGH), False, None
|
||||||
ffplay = subprocess.Popen(["ffplay", "-"],
|
)
|
||||||
stdin=subprocess.PIPE,
|
ffplay = subprocess.Popen(
|
||||||
stdout=subprocess.DEVNULL,
|
["ffplay", "-"],
|
||||||
stderr=subprocess.DEVNULL)
|
stdin=subprocess.PIPE,
|
||||||
|
stdout=subprocess.DEVNULL,
|
||||||
|
stderr=subprocess.DEVNULL,
|
||||||
|
)
|
||||||
while True:
|
while True:
|
||||||
byte = stream.input_stream.stream().read()
|
byte = stream.input_stream.stream().read()
|
||||||
if byte == -1:
|
if byte == -1:
|
||||||
@@ -118,11 +129,13 @@ def play(track_id_str: str):
|
|||||||
|
|
||||||
|
|
||||||
def splash():
|
def splash():
|
||||||
print("=================================\n"
|
print(
|
||||||
"| Librespot-Python Player |\n"
|
"=================================\n"
|
||||||
"| |\n"
|
"| Librespot-Python Player |\n"
|
||||||
"| by kokarare1212 |\n"
|
"| |\n"
|
||||||
"=================================\n\n\n")
|
"| by kokarare1212 |\n"
|
||||||
|
"=================================\n\n\n"
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
def main():
|
def main():
|
||||||
|
|||||||
Reference in New Issue
Block a user