14 Commits

Author SHA1 Message Date
bbe244e125 fix(NFLmusic):优化歌词时间戳格式转换与异常处理
- 新增正则表达式匹配并转换 [mm:ss] 时间戳为 [mm:ss.0] 格式
- 在下载酷狗歌词时增加时间戳标准化处理逻辑
- 打印原始歌词内容以便调试
- 修改异常捕获方式,明确打印异常类型和信息- 更新版本号从4.3.3 到4.3.4
2025-10-03 17:07:50 +08:00
12a8b3714c style(lyrics): 移除多余的空行
- 删除解析歌词时不必要的空行- 保持代码整洁一致的格式
2025-10-03 17:07:35 +08:00
5ede789385 fix(download):修复聚合搜索下载的歌词无法读取问题
- 修复了聚合音乐搜索下载源的歌词解析错误
- 确保歌词文件能被正常读取和显示
-优化了下载流程中的数据处理逻辑
2025-10-03 17:07:23 +08:00
d8a03ce0e7 fix(version): 更新音乐播放器下载链接
-修正了版本信息文件中的音乐播放器下载地址
- 将旧的下载链接替换为新的直链地址
- 确保用户能够正常下载最新版本的音乐播放器
2025-10-03 17:07:15 +08:00
2967b66bf8 fix(version): 更新音乐播放器下载链接
-修正了版本信息文件中的音乐播放器下载地址
- 将旧的下载链接替换为新的直链地址
- 确保用户能够正常下载最新版本的音乐播放器
2025-10-03 16:35:13 +08:00
9a1b04d3d5 fix(NFLmusic):修复聚合搜索接口参数及数据解析问题
- 移除歌曲名中的空格替换逻辑,保留原始输入
- 增强JSON数据解析的健壮性,避免因数据结构异常导致的程序崩溃- 确保搜索目标正确传递至后续处理流程
2025-10-03 16:33:46 +08:00
99857387dc feat(music): 新增聚合音乐搜索下载源
- 添加了酷狗音乐下载源
-修复了部分已知问题- 提升了音乐搜索的准确性和下载速度
-优化了用户界面的交互体验- 增强了对不同音频格式的支持
- 改进了错误处理机制,提高稳定性
2025-10-03 16:18:49 +08:00
d1aac65f25 chore(version): 更新版本信息至4.3.3
- 将版本号从4.3.2更新到4.3.3
- 更新了主程序更新包的下载链接
- 更新了完整安装包的下载链接至新版本
2025-10-03 16:18:38 +08:00
08da529d84 feat(NFLmusic): 添加聚合搜索功能支持- 新增 JUHE 搜索选项,支持通过聚合接口获取音乐数据
- 调整歌词下载逻辑以适配新接口返回结构
- 修改歌曲列表展示逻辑,兼容不同平台的数据字段
- 更新版本号至4.3.3
- 在搜索菜单中增加“聚合搜索”入口并映射为 JUHE 标识
2025-10-03 16:16:23 +08:00
a47c00e991 chore(env): 更新Python SDK配置
- 调整项目模块配置中的Python SDK引用名称
- 移除虚拟环境目录的重复排除配置
- 统一Python运行环境的命名规范
2025-10-03 16:16:13 +08:00
8aae403c86 chore(project): 更新项目JDK配置- 将项目JDK名称从"Python 3.6 (NFLmusic)"简化为"Python3.6"- 保持JDK类型为"Python SDK"不变
- 确保项目根管理器版本号仍为2
2025-10-03 16:16:00 +08:00
938f63a073 feat(config): 更新音乐源配置并调整默认选择
- 添加聚合音乐源及其默认音质配置
- 将默认音乐源从酷我调整为QQ音乐
- 更新音乐源配置结构以支持新选项
2025-10-03 16:15:52 +08:00
84ece943ee fix(KUGOU): 修复酷狗音乐搜索时的空格问题
- 在发送请求前,移除歌曲名称中的空格
- 提高了酷狗音乐搜索的准确性
2025-09-06 22:28:40 +08:00
5a6e7651ed fix(version_info): 更新 NFLmusic v4.3.2 版本下载链接
- 修改了版本信息文件中的下载链接地址
-从旧链接 http://pan.nanfengling.cn/f/pvdsV/NFLmusicv4.3.2.exe
- 更新为新链接 http://pan.nanfengling.cn/f/gj0UE/NFLmusicv4.3.2.exe
2025-09-06 22:28:32 +08:00
7 changed files with 61 additions and 24 deletions

2
.idea/NFLmusic.iml generated
View File

@ -5,7 +5,7 @@
<excludeFolder url="file://$MODULE_DIR$/.venv" /> <excludeFolder url="file://$MODULE_DIR$/.venv" />
<excludeFolder url="file://$MODULE_DIR$/venv" /> <excludeFolder url="file://$MODULE_DIR$/venv" />
</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
View File

@ -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>

View File

@ -198,6 +198,32 @@ def download_music(song_name, choose):
music_name = resp.json()["title"] music_name = resp.json()["title"]
singer = resp.json()["singer"] singer = resp.json()["singer"]
music_url = resp.json()["music_url"] 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"]
print(lrc)
# 正则表达式匹配 [mm:ss]
def convert_timestamp(match):
mm_ss = match.group(1)
minutes, seconds = mm_ss.split(':')
# 转换为浮点秒数并保留一位小数(虽然这里是整数)
total_seconds = int(minutes) * 60 + int(seconds)
# 格式化回 mm:ss.s 形式
new_minutes = total_seconds // 60
new_seconds = total_seconds % 60
return f"[{new_minutes:02d}:{new_seconds:02d}.0]"
# 替换所有 [mm:ss] 为 [mm:ss.0]
lrc = re.sub(r'\[(\d{2}:\d{2})\]', convert_timestamp, lrc)
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: else:
lrc = "" lrc = ""
lrc = lrc.replace("\\n", "\n") lrc = lrc.replace("\\n", "\n")
@ -311,28 +337,34 @@ def get_data_without_blocking(song_name):
elif choice == "QQ": elif choice == "QQ":
url1 = f"{url}?msg={song_name}&num=60&type=json&key=Dragon5B887C2DC41AD03C93F06BAF4B7888C3" url1 = f"{url}?msg={song_name}&num=60&type=json&key=Dragon5B887C2DC41AD03C93F06BAF4B7888C3"
elif choice == "KUGOU": 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}&num=60&type=json&key=Dragon5B887C2DC41AD03C93F06BAF4B7888C3" url1 = f"{url}?msg={song_name}&num=60&type=json&key=Dragon5B887C2DC41AD03C93F06BAF4B7888C3"
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 == "KUWO":
full_name = jsondata[index]["songname"] full_name = jsondata["data"][index]["songname"]
artist = jsondata[index]["singer"] artist = jsondata["data"][index]["singer"]
album = jsondata[index]["song_rid"] album = jsondata["data"][index]["song_rid"]
elif choice == "WANGYIYUN": elif choice == "WANGYIYUN":
full_name = jsondata[index]["title"] full_name = jsondata["data"][index]["title"]
artist = jsondata[index]["singer"] artist = jsondata["data"][index]["singer"]
album = jsondata[index]["songid"] album = jsondata["data"][index]["songid"]
elif choice == "QQ": elif choice == "QQ":
full_name = jsondata[index]["song_title"] full_name = jsondata["data"][index]["song_title"]
artist = jsondata[index]["song_singer"] artist = jsondata["data"][index]["song_singer"]
album = "" album = ""
elif choice == "KUGOU": elif choice == "KUGOU":
full_name = jsondata["data"][index]["title"]
artist = jsondata["data"][index]["singer"]
album = ""
elif choice == "JUHE":
full_name = jsondata[index]["title"] full_name = jsondata[index]["title"]
artist = jsondata[index]["singer"] artist = jsondata[index]["singer"]
album = "" album = jsondata[index]["app"]
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
@ -465,8 +497,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):
@ -1296,7 +1328,7 @@ def search_local_song():
time.sleep(1) time.sleep(1)
version = "4.3.2" version = "4.3.4"
poem = "" poem = ""
appdata = os.getenv("APPDATA") appdata = os.getenv("APPDATA")
make_resource() make_resource()
@ -1661,6 +1693,7 @@ repo_dict = {
"QQ音乐": "QQ", "QQ音乐": "QQ",
"网易云音乐": "WANGYIYUN", "网易云音乐": "WANGYIYUN",
"酷狗音乐": "KUGOU", "酷狗音乐": "KUGOU",
"聚合搜索": "JUHE"
} }
repo_dict_reverse = {} repo_dict_reverse = {}
for repo in repo_dict: for repo in repo_dict:

View File

@ -6,9 +6,10 @@ usercache = {
"QQ": "HQ高音质", "QQ": "HQ高音质",
"KUWO": "高品音质", "KUWO": "高品音质",
"WANGYIYUN": "极高音质", "WANGYIYUN": "极高音质",
"KUGOU": "高品音质" "KUGOU": "高品音质",
"JUHE": "默认音质"
}, },
"choice": "KUWO", "choice": "QQ",
"auto_update": True, "auto_update": True,
"playing_mode": 0, "playing_mode": 0,
"auto_play": False "auto_play": False
@ -43,6 +44,11 @@ api_data = {
{ {
"高品音质": 1 "高品音质": 1
} }
],
"JUHE": ["https://sdkapi.hhlqilongzhu.cn/api/juhe_dgmusic/",
{
"默认音质": 1
}
] ]
} }

View File

@ -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

View File

@ -1,3 +1,3 @@
4.3.2 4.3.4
http://pan.nanfengling.cn/f/4Qc2/update.exe http://pan.nanfengling.cn/f/4Qc2/update.exe
http://pan.nanfengling.cn/f/pvdsV/NFLmusicv4.3.2.exe http://pan.nanfengling.cn/f/ye5cZ/NFLmusicv4.3.4.exe

View File

@ -1,6 +1,5 @@
v4.3.2 - 2025.9.6 v4.3.4 - 2025.10.3
新增酷狗音乐下载源 修复了聚合搜索下载的歌词无法被正常读取的问题
修复部分已知问题
本产品是南凤科技旗下的音乐下载器 本产品是南凤科技旗下的音乐下载器
旨在提升用户体验, 旨在提升用户体验,