diff --git a/NFLmusic.py b/NFLmusic.py index a424f13..da60205 100644 --- a/NFLmusic.py +++ b/NFLmusic.py @@ -198,6 +198,18 @@ def download_music(song_name, choose): music_name = resp.json()["title"] singer = resp.json()["singer"] music_url = resp.json()["music_url"] + elif choice == "JUHE": + song_name = song_name.replace(" ", "") + resp = requests.get(f"{url}?msg={song_name}&n={choose}&num=60&type=json&key=Dragon5B887C2DC41AD03C93F06BAF4B7888C3") + resp.close() + try: + lrc = resp.json()["data"]["lyric"] + except Exception as e: + print(f"download_kg_lrc: {e}") + lrc = "" + music_name = resp.json()["data"]["title"] + singer = resp.json()["data"]["singer"] + music_url = resp.json()["data"]["url"] else: lrc = "" lrc = lrc.replace("\\n", "\n") @@ -312,27 +324,33 @@ def get_data_without_blocking(song_name): url1 = f"{url}?msg={song_name}&num=60&type=json&key=Dragon5B887C2DC41AD03C93F06BAF4B7888C3" elif choice == "KUGOU": url1 = f"{url}?msg={song_name.replace(' ', '')}&num=60&type=json&key=Dragon5B887C2DC41AD03C93F06BAF4B7888C3" + elif choice == "JUHE": + url1 = f"{url}?msg={song_name.replace(' ', '')}&num=60&type=json&key=Dragon5B887C2DC41AD03C93F06BAF4B7888C3" resp = requests.get(url1) - jsondata = resp.json()["data"] + jsondata = resp.json() resp.close() last_search_target = song_name - for index in range(len(jsondata)): + for index in range(len(jsondata["data"])): if choice == "KUWO": - full_name = jsondata[index]["songname"] - artist = jsondata[index]["singer"] - album = jsondata[index]["song_rid"] + full_name = jsondata["data"][index]["songname"] + artist = jsondata["data"][index]["singer"] + album = jsondata["data"][index]["song_rid"] elif choice == "WANGYIYUN": - full_name = jsondata[index]["title"] - artist = jsondata[index]["singer"] - album = jsondata[index]["songid"] + full_name = jsondata["data"][index]["title"] + artist = jsondata["data"][index]["singer"] + album = jsondata["data"][index]["songid"] elif choice == "QQ": - full_name = jsondata[index]["song_title"] - artist = jsondata[index]["song_singer"] + full_name = jsondata["data"][index]["song_title"] + artist = jsondata["data"][index]["song_singer"] album = "" elif choice == "KUGOU": + full_name = jsondata["data"][index]["title"] + artist = jsondata["data"][index]["singer"] + album = "" + elif choice == "JUHE": full_name = jsondata[index]["title"] artist = jsondata[index]["singer"] - album = "" + album = jsondata[index]["app"] songlist.insert("", "end", values=(full_name, artist, album)) except requests.exceptions.JSONDecodeError: resp_text = resp.text @@ -1296,7 +1314,7 @@ def search_local_song(): time.sleep(1) -version = "4.3.2" +version = "4.3.3" poem = "" appdata = os.getenv("APPDATA") make_resource() @@ -1661,6 +1679,7 @@ repo_dict = { "QQ音乐": "QQ", "网易云音乐": "WANGYIYUN", "酷狗音乐": "KUGOU", + "聚合搜索": "JUHE" } repo_dict_reverse = {} for repo in repo_dict: