From 001364b3c6a2ea22e7475d2987e8679559b6e600 Mon Sep 17 00:00:00 2001 From: xaoyaoo Date: Wed, 9 Oct 2024 15:15:39 +0800 Subject: [PATCH] =?UTF-8?q?fix=20tag=E6=9F=A5=E8=AF=A2=E7=BB=93=E6=9E=9C?= =?UTF-8?q?=E5=8E=BB=E9=87=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pywxdump/db/dbFavorite.py | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/pywxdump/db/dbFavorite.py b/pywxdump/db/dbFavorite.py index 677c64f..388f5ce 100644 --- a/pywxdump/db/dbFavorite.py +++ b/pywxdump/db/dbFavorite.py @@ -41,7 +41,8 @@ class FavoriteHandler(DatabaseBase): """ return: [(FavLocalID, TagName)] """ - sql = "select A.FavLocalID, B.TagName from FavBindTagDatas A, FavTagDatas B where A.TagLocalID = B.LocalID" + sql = ("select DISTINCT A.FavLocalID, B.TagName " + "from FavBindTagDatas A, FavTagDatas B where A.TagLocalID = B.LocalID") FavBindTags = self.execute(sql) return FavBindTags @@ -127,6 +128,18 @@ class FavoriteHandler(DatabaseBase): FavTagsDict = {} for FavLocalID, TagName in FavTags: FavTagsDict[FavLocalID] = FavTagsDict.get(FavLocalID, []) + [TagName] + + rdata = [] + for item in FavItemsList: + processed_item = { + key: item[i] for i, key in enumerate(FavItemsFields.keys()) + } + processed_item['UpdateTime'] = timestamp2str(processed_item['UpdateTime']) + processed_item['XmlBuf'] = xml2dict(processed_item['XmlBuf']) + processed_item['TypeName'] = Favorite_type_converter(processed_item['Type']) + processed_item['FavData'] = FavDataDict.get(processed_item['FavLocalID'], []) + processed_item['Tags'] = FavTagsDict.get(processed_item['FavLocalID'], []) + rdata.append(processed_item) try: import pandas as pd except ImportError: