diff --git a/app/DataBase/micro_msg.py b/app/DataBase/micro_msg.py index 043cfce..0cd7e52 100644 --- a/app/DataBase/micro_msg.py +++ b/app/DataBase/micro_msg.py @@ -47,7 +47,7 @@ class MicroMsg: sql = '''SELECT UserName, Alias, Type, Remark, NickName, PYInitial, RemarkPYInitial, ContactHeadImgUrl.smallHeadImgUrl, ContactHeadImgUrl.bigHeadImgUrl FROM Contact INNER JOIN ContactHeadImgUrl ON Contact.UserName = ContactHeadImgUrl.usrName - WHERE Type % 2 = 1 + WHERE (Type % 2 = 1 OR Type=2) AND NickName != '' ORDER BY CASE diff --git a/app/DataBase/output_pc.py b/app/DataBase/output_pc.py index 0330610..e9f026a 100644 --- a/app/DataBase/output_pc.py +++ b/app/DataBase/output_pc.py @@ -4,7 +4,7 @@ import os from re import findall from PyQt5.QtCore import pyqtSignal, QThread from PyQt5.QtWidgets import QFileDialog -from eyed3 import load +# from eyed3 import load from . import msg_db, micro_msg_db from .package_msg import PackageMsg @@ -139,6 +139,7 @@ class Output(QThread): def modify_audio_metadata(audiofile, new_artist): # 修改音频元数据中的“创作者”标签 + return audiofile = load(audiofile) # 检查文件是否有标签