From aba5e4ef3e28a58434b393b2b135a6011d2d5a1b Mon Sep 17 00:00:00 2001 From: xaoyaoo Date: Tue, 4 Jun 2024 10:53:34 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=AE=B9=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pywxdump/dbpreprocess/__init__.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pywxdump/dbpreprocess/__init__.py b/pywxdump/dbpreprocess/__init__.py index 407e461..e0128d7 100644 --- a/pywxdump/dbpreprocess/__init__.py +++ b/pywxdump/dbpreprocess/__init__.py @@ -40,7 +40,7 @@ def get_user_list(MicroMsg_db_path, OpenIMContact_db_path=None, word=None): return users -def get_recent_user_list(MicroMsg_db_path, OpenIMContact_db_path=None,limit=200): +def get_recent_user_list(MicroMsg_db_path, OpenIMContact_db_path=None, limit=200): """ 获取联系人列表 :param MicroMsg_db_path: MicroMsg.db 文件路径 @@ -54,7 +54,8 @@ def get_recent_user_list(MicroMsg_db_path, OpenIMContact_db_path=None,limit=200) parsing_micromsg = ParsingMicroMsg(MicroMsg_db_path) recent_users = parsing_micromsg.recent_chat_wxid() # [{"wxid": username, "LastReadedCreateTime": LastReadedCreateTime, "LastReadedSvrId": LastReadedSvrId},] recent_users = pd.DataFrame(recent_users) - recent_users = recent_users.sort_values(by="LastReadedCreateTime", ascending=False) + recent_users = recent_users.sort_values(by="LastReadedCreateTime", + ascending=False) if not recent_users.empty else recent_users recent_users = recent_users.drop_duplicates(subset=["wxid"], keep="first").head(limit) users = get_user_list(MicroMsg_db_path, OpenIMContact_db_path) @@ -62,7 +63,7 @@ def get_recent_user_list(MicroMsg_db_path, OpenIMContact_db_path=None,limit=200) users = pd.merge(users, recent_users, on="wxid", how="right") # users = users.drop_duplicates(subset=["wxid"], keep="last") # 保留最新的 - users = users.sort_values(by="LastReadedCreateTime", ascending=False) # 按照最新的排序 + users = users.sort_values(by="LastReadedCreateTime", ascending=False) if not users.empty else users users = users.drop_duplicates(subset=["wxid"], keep="first") # 保留最新的 users = users.fillna("") users = users.to_dict(orient="records")