mirror of
https://github.com/THIS-IS-NOT-A-BACKUP/zspotify.git
synced 2024-11-29 19:24:34 +01:00
Rewrote the search function
It still works in the same way and no other functions need to be changed. Just changed it to store needed data about each track/album/playlist in a dictionary so tracking it in the end is simpler.
This commit is contained in:
parent
3c3a2acf27
commit
7d81eb5cc6
129
zspotify.py
129
zspotify.py
@ -351,20 +351,32 @@ def search(search_term):
|
||||
""" Searches Spotify's API for relevant data """
|
||||
token = SESSION.tokens().get("user-read-email")
|
||||
|
||||
params = {
|
||||
"limit" : "10",
|
||||
"q" : search_term,
|
||||
"type" : ["track","album","playlist"]
|
||||
}
|
||||
|
||||
# ADD BLOCK FOR READING OPTIONS AND CLEAN SEARCH_TERM
|
||||
|
||||
resp = requests.get(
|
||||
"https://api.spotify.com/v1/search",
|
||||
{
|
||||
"limit": "10",
|
||||
"limit": params["limit"],
|
||||
"offset": "0",
|
||||
"q": search_term,
|
||||
"type": "track,album,playlist"
|
||||
"q": params["q"],
|
||||
"type": ",".join(params["type"])
|
||||
},
|
||||
headers={"Authorization": "Bearer %s" % token},
|
||||
)
|
||||
|
||||
# print(resp.json())
|
||||
|
||||
i = 1
|
||||
enum = 1
|
||||
dics = []
|
||||
|
||||
# add all returned tracks to dics
|
||||
if "track" in params["type"]:
|
||||
tracks = resp.json()["tracks"]["items"]
|
||||
if len(tracks) > 0:
|
||||
print("### TRACKS ###")
|
||||
@ -373,65 +385,108 @@ def search(search_term):
|
||||
explicit = "[E]"
|
||||
else:
|
||||
explicit = ""
|
||||
print("%d, %s %s | %s" % (
|
||||
i,
|
||||
track["name"],
|
||||
# collect needed data
|
||||
dic = {
|
||||
"id" : track["id"],
|
||||
"name" : track["name"],
|
||||
"artists/owner" : [artist["name"] for artist in track["artists"]],
|
||||
"type" : "track",
|
||||
}
|
||||
dics.append(dic)
|
||||
|
||||
print("{}, {} {} | {}".format(
|
||||
enum,
|
||||
dic["name"],
|
||||
explicit,
|
||||
",".join([artist["name"] for artist in track["artists"]]),
|
||||
",".join(dic["artists/owner"]),
|
||||
))
|
||||
i += 1
|
||||
total_tracks = i - 1
|
||||
enum += 1
|
||||
total_tracks = enum - 1
|
||||
print("\n")
|
||||
# free up memory
|
||||
del tracks
|
||||
else:
|
||||
total_tracks = 0
|
||||
|
||||
if "album" in params["type"]:
|
||||
albums = resp.json()["albums"]["items"]
|
||||
if len(albums) > 0:
|
||||
print("### ALBUMS ###")
|
||||
for album in albums:
|
||||
print("%d, %s | %s" % (
|
||||
i,
|
||||
album["name"],
|
||||
",".join([artist["name"] for artist in album["artists"]]),
|
||||
# collect needed data
|
||||
dic = {
|
||||
"id" : album["id"],
|
||||
"name" : album["name"],
|
||||
"artists/owner" : [artist["name"] for artist in album["artists"]],
|
||||
"type" : "album",
|
||||
}
|
||||
dics.append(dic)
|
||||
|
||||
print("{}, {} | {}".format(
|
||||
enum,
|
||||
dic["name"],
|
||||
",".join(dic["artists/owner"]),
|
||||
))
|
||||
i += 1
|
||||
total_albums = i - total_tracks - 1
|
||||
enum += 1
|
||||
total_albums = enum - total_tracks - 1
|
||||
print("\n")
|
||||
# free up memory
|
||||
del albums
|
||||
else:
|
||||
total_albums = 0
|
||||
|
||||
if "playlist" in params["type"]:
|
||||
playlists = resp.json()["playlists"]["items"]
|
||||
print("### PLAYLISTS ###")
|
||||
if len(playlists) > 0:
|
||||
for playlist in playlists:
|
||||
print("%d, %s | %s" % (
|
||||
i,
|
||||
playlist["name"],
|
||||
playlist['owner']['display_name'],
|
||||
))
|
||||
i += 1
|
||||
print("\n")
|
||||
# collect needed data
|
||||
dic = {
|
||||
"id" : playlist["id"],
|
||||
"name" : playlist["name"],
|
||||
"artists/owner" : [playlist["owner"]["display_name"]],
|
||||
"type" : "playlist",
|
||||
}
|
||||
dics.append(dic)
|
||||
|
||||
if len(tracks) + len(albums) + len(playlists) == 0:
|
||||
print("{}, {} | {}".format(
|
||||
enum,
|
||||
dic["name"],
|
||||
",".join(dic['artists/owner']),
|
||||
))
|
||||
|
||||
enum += 1
|
||||
total_playlists = enum - total_tracks - total_albums - 1
|
||||
print("\n")
|
||||
# free up memory
|
||||
del playlists
|
||||
else:
|
||||
total_playlists = 0
|
||||
|
||||
if total_tracks + total_albums + total_playlists == 0:
|
||||
print("NO RESULTS FOUND - EXITING...")
|
||||
else:
|
||||
selection = str(input("SELECT ITEM(S) BY ID: "))
|
||||
inputs = split_input(selection)
|
||||
for pos in inputs:
|
||||
position = int(pos)
|
||||
if position <= total_tracks:
|
||||
track_id = tracks[position - 1]["id"]
|
||||
download_track(track_id)
|
||||
elif position <= total_albums + total_tracks:
|
||||
download_album(albums[position - total_tracks - 1]["id"])
|
||||
else:
|
||||
playlist_choice = playlists[position -
|
||||
total_tracks - total_albums - 1]
|
||||
playlist_songs = get_playlist_songs(
|
||||
token, playlist_choice['id'])
|
||||
for dic in dics:
|
||||
# find dictionary
|
||||
print_pos = dics.index(dic) + 1
|
||||
if print_pos == position:
|
||||
# if request is for track
|
||||
if dic["type"] == "track":
|
||||
download_track(dic["id"])
|
||||
# if request is for album
|
||||
if dic["type"] == "album":
|
||||
download_album(dic["id"])
|
||||
# if request is for playlist
|
||||
if dic["type"] == "playlist":
|
||||
playlist_songs = get_playlist_songs(token, dic["id"])
|
||||
for song in playlist_songs:
|
||||
if song['track']['id'] is not None:
|
||||
download_track(song['track']['id'], sanitize_data(
|
||||
playlist_choice['name'].strip()) + "/")
|
||||
if song["track"]["id"] is not None:
|
||||
download_track(song["track"]["id"],
|
||||
sanitize_data(dic["name"].strip()) + "/")
|
||||
print("\n")
|
||||
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user