Compare commits
27 Commits
v4.3.1
...
240f380026
| Author | SHA1 | Date | |
|---|---|---|---|
| 240f380026 | |||
| 4e55f0521f | |||
| f95335e39f | |||
| 3ac2c59dcd | |||
| 5189898b6b | |||
| 76392863ad | |||
| 64bba311ae | |||
| d94318b3b9 | |||
| dad7043db7 | |||
| bbe244e125 | |||
| 12a8b3714c | |||
| 5ede789385 | |||
| d8a03ce0e7 | |||
| 2967b66bf8 | |||
| 9a1b04d3d5 | |||
| 99857387dc | |||
| d1aac65f25 | |||
| 08da529d84 | |||
| a47c00e991 | |||
| 8aae403c86 | |||
| 938f63a073 | |||
| 84ece943ee | |||
| 5a6e7651ed | |||
| aa5c31c257 | |||
| 7e30ddb51a | |||
| a7b76fb2fe | |||
| a237e3d73d |
3
.idea/NFLmusic.iml
generated
3
.idea/NFLmusic.iml
generated
@ -4,8 +4,9 @@
|
|||||||
<content url="file://$MODULE_DIR$">
|
<content url="file://$MODULE_DIR$">
|
||||||
<excludeFolder url="file://$MODULE_DIR$/.venv" />
|
<excludeFolder url="file://$MODULE_DIR$/.venv" />
|
||||||
<excludeFolder url="file://$MODULE_DIR$/venv" />
|
<excludeFolder url="file://$MODULE_DIR$/venv" />
|
||||||
|
<excludeFolder url="file://$MODULE_DIR$/.venv1" />
|
||||||
</content>
|
</content>
|
||||||
<orderEntry type="jdk" jdkName="Python 3.6 (NFLmusic)" jdkType="Python SDK" />
|
<orderEntry type="jdk" jdkName="Python 3.6" jdkType="Python SDK" />
|
||||||
<orderEntry type="sourceFolder" forTests="false" />
|
<orderEntry type="sourceFolder" forTests="false" />
|
||||||
</component>
|
</component>
|
||||||
</module>
|
</module>
|
||||||
2
.idea/misc.xml
generated
2
.idea/misc.xml
generated
@ -3,5 +3,5 @@
|
|||||||
<component name="Black">
|
<component name="Black">
|
||||||
<option name="sdkName" value="Python 3.6 (NFLmusic)" />
|
<option name="sdkName" value="Python 3.6 (NFLmusic)" />
|
||||||
</component>
|
</component>
|
||||||
<component name="ProjectRootManager" version="2" project-jdk-name="Python 3.6 (NFLmusic)" project-jdk-type="Python SDK" />
|
<component name="ProjectRootManager" version="2" project-jdk-name="Python 3.6" project-jdk-type="Python SDK" />
|
||||||
</project>
|
</project>
|
||||||
102
NFLmusic.py
102
NFLmusic.py
@ -1,5 +1,4 @@
|
|||||||
import time
|
import time
|
||||||
from functools import total_ordering
|
|
||||||
from tkinter import *
|
from tkinter import *
|
||||||
import threading
|
import threading
|
||||||
import pygame
|
import pygame
|
||||||
@ -91,7 +90,6 @@ def detect_change():
|
|||||||
jsondata["theme"] != tmla.get(la)[var1.get()] or
|
jsondata["theme"] != tmla.get(la)[var1.get()] or
|
||||||
jsondata["path"] != var2.get()
|
jsondata["path"] != var2.get()
|
||||||
):
|
):
|
||||||
|
|
||||||
changed = True
|
changed = True
|
||||||
|
|
||||||
|
|
||||||
@ -127,7 +125,7 @@ def download_check(*value):
|
|||||||
|
|
||||||
|
|
||||||
def download_music(song_name, choose):
|
def download_music(song_name, choose):
|
||||||
global progressbar, downloading
|
global progressbar, downloading, headers
|
||||||
|
|
||||||
def update_progressbar():
|
def update_progressbar():
|
||||||
while True:
|
while True:
|
||||||
@ -142,56 +140,38 @@ def download_music(song_name, choose):
|
|||||||
style='success.Striped.Horizontal.TProgressbar')
|
style='success.Striped.Horizontal.TProgressbar')
|
||||||
progressbar.place(x=10, y=300)
|
progressbar.place(x=10, y=300)
|
||||||
br = br_dict[var.get()]
|
br = br_dict[var.get()]
|
||||||
if choice == "KUWO":
|
if choice == "WANGYIYUN":
|
||||||
resp = requests.get(f"{url}?msg={song_name}&n={choose}&br={br}&num=60&type=json&key=Dragon5B887C2DC41AD03C93F06BAF4B7888C3")
|
resp = requests.get(f"{url}?name={song_name}&n={choose}&br={br}&limit=60&type=json&key=oiapi-e3329f47-ccbc-2279-14b6-eabd4c7286ac")
|
||||||
resp.close()
|
resp.close()
|
||||||
id = resp.json()["link"].rsplit("/", 1)[1]
|
songid = resp.json()["data"]["id"]
|
||||||
try:
|
try:
|
||||||
resp_lrc = requests.get(f"http://m.kuwo.cn/newh5/singles/songinfoandlrc?musicId={id}")
|
resp_lrc = requests.get(f"https://music.163.com/api/song/lyric?id={songid}&lv=-1&kv=-1&tv=-1")
|
||||||
resp_lrc.close()
|
|
||||||
lrc = ""
|
|
||||||
lrclist = resp_lrc.json()["data"]["lrclist"]
|
|
||||||
for i in lrclist:
|
|
||||||
total_time = i["time"]
|
|
||||||
min = float(total_time) // 60
|
|
||||||
sec = float(total_time) % 60
|
|
||||||
lrc += f'[{int(min)}:{sec}]{i["lineLyric"]}\n'
|
|
||||||
except Exception as e:
|
|
||||||
print(f"download_kw_lrc: {e}")
|
|
||||||
lrc = ""
|
|
||||||
music_name = resp.json()["song_name"]
|
|
||||||
singer = resp.json()["song_singer"]
|
|
||||||
music_url = resp.json()["flac_url"]
|
|
||||||
elif choice == "WANGYIYUN":
|
|
||||||
resp = requests.get(f"{url}?gm={song_name}&n={choose}&br={br}&num=60&type=json&key=Dragon5B887C2DC41AD03C93F06BAF4B7888C3")
|
|
||||||
resp.close()
|
|
||||||
id = resp.json()["link"].rsplit("=", 1)[1]
|
|
||||||
try:
|
|
||||||
resp_lrc = requests.get(f"https://music.163.com/api/song/lyric?id={id}&lv=-1&kv=-1&tv=-1")
|
|
||||||
resp_lrc.close()
|
resp_lrc.close()
|
||||||
lrc = resp_lrc.json()["lrc"]["lyric"]
|
lrc = resp_lrc.json()["lrc"]["lyric"]
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
print(f"download_wyy_lrc: {e}")
|
print(f"download_wyy_lrc: {e}")
|
||||||
lrc = ""
|
lrc = ""
|
||||||
music_name = resp.json()["title"]
|
music_name = resp.json()["data"]["name"]
|
||||||
singer = resp.json()["singer"]
|
singer = resp.json()["data"]["singers"][0]["name"]
|
||||||
music_url = resp.json()["music_url"]
|
music_url = resp.json()["data"]["url"]
|
||||||
elif choice == "QQ":
|
elif choice == "QQ":
|
||||||
resp = requests.get(f"{url}?msg={song_name}&n={choose}&num=60&type=json&br={br}&key=Dragon5B887C2DC41AD03C93F06BAF4B7888C3")
|
resp = requests.get(f"{url}?msg={song_name}&n={choose}&limit=60&type=json&br={br}&key=oiapi-e3329f47-ccbc-2279-14b6-eabd4c7286ac")
|
||||||
resp.close()
|
resp.close()
|
||||||
|
songid = resp.json()["data"]["songid"]
|
||||||
|
resp1 = requests.get(f"https://oiapi.net/api/QQMusicLyric?id={songid}")
|
||||||
try:
|
try:
|
||||||
lrc = resp.json()["data"]["lyric"]
|
lrc = resp1.json()["message"]
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
print(f"download_qq_lrc: {e}")
|
print(f"download_qq_lrc: {e}")
|
||||||
lrc = ""
|
lrc = ""
|
||||||
music_name = resp.json()["data"]["song_name"]
|
music_name = resp.json()["data"]["song"]
|
||||||
singer = resp.json()["data"]["song_singer"]
|
singer = resp.json()["data"]["singer"]
|
||||||
music_url = resp.json()["data"]["music_url"]
|
music_url = resp.json()["data"]["music"]
|
||||||
else:
|
else:
|
||||||
lrc = ""
|
lrc = ""
|
||||||
lrc = lrc.replace("\\n", "\n")
|
lrc = lrc.replace("\\n", "\n")
|
||||||
print("请求api:", url)
|
print("请求api:", url)
|
||||||
response = requests.get(music_url, stream=True)
|
response = requests.get(music_url, stream=True, headers=headers)
|
||||||
print("下载直链:", music_url)
|
print("下载直链:", music_url)
|
||||||
formated = music_url.split("?")[0].rsplit(".", 1)[1]
|
formated = music_url.split("?")[0].rsplit(".", 1)[1]
|
||||||
if formated not in ["m4a", "mp3", "ogg", "flac"]:
|
if formated not in ["m4a", "mp3", "ogg", "flac"]:
|
||||||
@ -250,7 +230,8 @@ def download_music(song_name, choose):
|
|||||||
{"_singer_": f"{singer}", "_music_": f"{music_name}"}))
|
{"_singer_": f"{singer}", "_music_": f"{music_name}"}))
|
||||||
downloading = False
|
downloading = False
|
||||||
|
|
||||||
except KeyError:
|
except KeyError as e:
|
||||||
|
print(e, type(e))
|
||||||
downloading = False
|
downloading = False
|
||||||
progressbar.destroy()
|
progressbar.destroy()
|
||||||
if song_name == "":
|
if song_name == "":
|
||||||
@ -293,29 +274,23 @@ def get_data_without_blocking(song_name):
|
|||||||
try:
|
try:
|
||||||
button0["state"] = "disabled"
|
button0["state"] = "disabled"
|
||||||
songlist.delete(*songlist.get_children())
|
songlist.delete(*songlist.get_children())
|
||||||
if choice == "KUWO":
|
if choice == "WANGYIYUN":
|
||||||
url1 = f"{url}?msg={song_name}&num=60&type=json&key=Dragon5B887C2DC41AD03C93F06BAF4B7888C3"
|
url1 = f"{url}?name={song_name}&limit=60&type=json&key=oiapi-e3329f47-ccbc-2279-14b6-eabd4c7286ac"
|
||||||
elif choice == "WANGYIYUN":
|
|
||||||
url1 = f"{url}?gm={song_name}&num=60&type=json&key=Dragon5B887C2DC41AD03C93F06BAF4B7888C3"
|
|
||||||
elif choice == "QQ":
|
elif choice == "QQ":
|
||||||
url1 = f"{url}?msg={song_name}&num=60&type=json&key=Dragon5B887C2DC41AD03C93F06BAF4B7888C3"
|
url1 = f"{url}?msg={song_name}&limit=60&type=json&key=oiapi-e3329f47-ccbc-2279-14b6-eabd4c7286ac"
|
||||||
resp = requests.get(url1)
|
resp = requests.get(url1)
|
||||||
jsondata = resp.json()["data"]
|
jsondata = resp.json()
|
||||||
resp.close()
|
resp.close()
|
||||||
last_search_target = song_name
|
last_search_target = song_name
|
||||||
for index in range(len(jsondata)):
|
for index in range(len(jsondata["data"] if isinstance(jsondata, dict) else jsondata)):
|
||||||
if choice == "KUWO":
|
if choice == "WANGYIYUN":
|
||||||
full_name = jsondata[index]["songname"]
|
full_name = jsondata["data"][index]["name"]
|
||||||
artist = jsondata[index]["singer"]
|
artist = jsondata["data"][index]["singers"][0]["name"]
|
||||||
album = jsondata[index]["song_rid"]
|
album = jsondata["data"][index]["id"]
|
||||||
elif choice == "WANGYIYUN":
|
|
||||||
full_name = jsondata[index]["title"]
|
|
||||||
artist = jsondata[index]["singer"]
|
|
||||||
album = jsondata[index]["songid"]
|
|
||||||
elif choice == "QQ":
|
elif choice == "QQ":
|
||||||
full_name = jsondata[index]["song_title"]
|
full_name = jsondata["data"][index]["song"]
|
||||||
artist = jsondata[index]["song_singer"]
|
artist = jsondata["data"][index]["singer"]
|
||||||
album = ""
|
album = jsondata["data"][index]["songid"]
|
||||||
songlist.insert("", "end", values=(full_name, artist, album))
|
songlist.insert("", "end", values=(full_name, artist, album))
|
||||||
except requests.exceptions.JSONDecodeError:
|
except requests.exceptions.JSONDecodeError:
|
||||||
resp_text = resp.text
|
resp_text = resp.text
|
||||||
@ -448,8 +423,8 @@ def playsound(*event):
|
|||||||
playmusic(abs_path)
|
playmusic(abs_path)
|
||||||
try:
|
try:
|
||||||
lyric = lyrics.load_lyrics(f"{path}/{music_file_without_endswith}.lrc")
|
lyric = lyrics.load_lyrics(f"{path}/{music_file_without_endswith}.lrc")
|
||||||
except:
|
except Exception as e:
|
||||||
pass
|
print(type(e), e)
|
||||||
|
|
||||||
|
|
||||||
def playmusic(music_path):
|
def playmusic(music_path):
|
||||||
@ -1279,7 +1254,7 @@ def search_local_song():
|
|||||||
time.sleep(1)
|
time.sleep(1)
|
||||||
|
|
||||||
|
|
||||||
version = "4.3.1"
|
version = "4.3.6"
|
||||||
poem = ""
|
poem = ""
|
||||||
appdata = os.getenv("APPDATA")
|
appdata = os.getenv("APPDATA")
|
||||||
make_resource()
|
make_resource()
|
||||||
@ -1384,6 +1359,14 @@ playingmode_dict = {
|
|||||||
1: "rand",
|
1: "rand",
|
||||||
2: "sequ"
|
2: "sequ"
|
||||||
}
|
}
|
||||||
|
headers = {
|
||||||
|
'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/91.0.4472.124 Safari/537.36',
|
||||||
|
'Accept': 'text/html,application/xhtml+xml,application/xml;q=0.9,image/webp,*/*;q=0.8',
|
||||||
|
'Accept-Language': 'en-US,en;q=0.5',
|
||||||
|
'Accept-Encoding': 'gzip, deflate',
|
||||||
|
'Connection': 'keep-alive',
|
||||||
|
'Upgrade-Insecure-Requests': '1',
|
||||||
|
}
|
||||||
|
|
||||||
if path == "./music":
|
if path == "./music":
|
||||||
if os.path.exists("./music"):
|
if os.path.exists("./music"):
|
||||||
@ -1640,9 +1623,8 @@ themeLabel.place(x=10, y=25)
|
|||||||
|
|
||||||
# 基本设置
|
# 基本设置
|
||||||
repo_dict = {
|
repo_dict = {
|
||||||
"酷我音乐": "KUWO",
|
|
||||||
"网易云音乐": "WANGYIYUN",
|
|
||||||
"QQ音乐": "QQ",
|
"QQ音乐": "QQ",
|
||||||
|
"网易云音乐": "WANGYIYUN",
|
||||||
}
|
}
|
||||||
repo_dict_reverse = {}
|
repo_dict_reverse = {}
|
||||||
for repo in repo_dict:
|
for repo in repo_dict:
|
||||||
|
|||||||
@ -3,41 +3,33 @@ usercache = {
|
|||||||
"theme": "sandstone",
|
"theme": "sandstone",
|
||||||
"path": "./music",
|
"path": "./music",
|
||||||
"br": {
|
"br": {
|
||||||
"QQ": "HQ高音质",
|
"QQ": "余韵绕梁",
|
||||||
"KUWO": "高品音质",
|
"WANGYIYUN": "默认音质",
|
||||||
"WANGYIYUN": "极高音质",
|
|
||||||
},
|
},
|
||||||
"choice": "KUWO",
|
"choice": "QQ",
|
||||||
"auto_update": True,
|
"auto_update": True,
|
||||||
"playing_mode": 0,
|
"playing_mode": 0,
|
||||||
"auto_play": False
|
"auto_play": False
|
||||||
}
|
}
|
||||||
|
|
||||||
api_data = {
|
api_data = {
|
||||||
"QQ": ["https://sdkapi.hhlqilongzhu.cn/api/QQmusic/",
|
"QQ": ["https://oiapi.net/api/QQ_Music",
|
||||||
{
|
{
|
||||||
"SQ无损": 1,
|
"天籁浑成": 1,
|
||||||
"HQ高音质": 2,
|
"珠玉清华": 3,
|
||||||
"标准音质": 10
|
"余韵绕梁": 4,
|
||||||
|
"清越穿云": 2,
|
||||||
|
"幽微入化": 5,
|
||||||
|
"淳和致厚": 6,
|
||||||
|
"浊滞暗哑": 7,
|
||||||
|
"呕哑嘲哳": 8
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"KUWO": ["https://sdkapi.hhlqilongzhu.cn/api/dgMusic_kuwo/",
|
"WANGYIYUN": ["https://oiapi.net/api/Music_163",
|
||||||
{
|
|
||||||
"无损音质": 1,
|
|
||||||
"高品音质": 2
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"WANGYIYUN": ["https://sdkapi.hhlqilongzhu.cn/api/dgMusic_wyy",
|
|
||||||
{
|
{
|
||||||
"标准音质": 1,
|
"默认音质": 1
|
||||||
"极高音质": 2,
|
|
||||||
"无损音质": 3,
|
|
||||||
"Hi-Res音质": 4,
|
|
||||||
"高清环绕声" :5,
|
|
||||||
"沉浸环绕声": 6,
|
|
||||||
"超清母带": 7
|
|
||||||
}
|
}
|
||||||
],
|
]
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@ -13,7 +13,6 @@ def load_lyrics(file):
|
|||||||
timestamp = f'{minutes:02}:{seconds:02}'
|
timestamp = f'{minutes:02}:{seconds:02}'
|
||||||
text = match.group(3)
|
text = match.group(3)
|
||||||
lyrics[timestamp] = text
|
lyrics[timestamp] = text
|
||||||
|
|
||||||
return lyrics
|
return lyrics
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
18
test.py
18
test.py
@ -1,4 +1,16 @@
|
|||||||
import os
|
import requests
|
||||||
|
|
||||||
audio_file = "C:/Users/Administrator/Music/国风堂#哦漏 - 知我.mp3"
|
url = "https://er-sycdn.kuwo.cn/5a1fdd7e1178a867af57c6b0ba576889/69468dc3/resource/30106/trackmedia/F000000bYDlc2XxKLs.flac"
|
||||||
os.startfile(audio_file)
|
|
||||||
|
headers = {
|
||||||
|
'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/91.0.4472.124 Safari/537.36',
|
||||||
|
'Accept': 'text/html,application/xhtml+xml,application/xml;q=0.9,image/webp,*/*;q=0.8',
|
||||||
|
'Accept-Language': 'en-US,en;q=0.5',
|
||||||
|
'Accept-Encoding': 'gzip, deflate',
|
||||||
|
'Connection': 'keep-alive',
|
||||||
|
'Upgrade-Insecure-Requests': '1',
|
||||||
|
}
|
||||||
|
|
||||||
|
total_length = int(requests.get(url, stream=True, headers=headers).headers.get('content-length'))
|
||||||
|
|
||||||
|
print(total_length)
|
||||||
@ -1,3 +1,3 @@
|
|||||||
4.3.1
|
4.3.6
|
||||||
http://pan.nanfengling.cn/f/4Qc2/update.exe
|
http://pan.nanfengling.cn/f/4Qc2/update.exe
|
||||||
http://pan.nanfengling.cn/f/ZD0U4/NFLmusicv4.3.1.exe
|
http://pan.nanfengling.cn/f/qVZTK/NFLmusicv4.3.6.exe
|
||||||
@ -1,6 +1,5 @@
|
|||||||
v4.3.1 - 2025.8.31
|
v4.3.6 - 2025.01.31
|
||||||
新增QQ音乐标准音质
|
修复了音乐搜索结果为空的问题
|
||||||
修复部分已知问题
|
|
||||||
|
|
||||||
本产品是南凤科技旗下的音乐下载器
|
本产品是南凤科技旗下的音乐下载器
|
||||||
旨在提升用户体验,
|
旨在提升用户体验,
|
||||||
|
|||||||
Reference in New Issue
Block a user