cyonjan/PyWxDump
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix tag查询结果去重

Browse Source
This commit is contained in:
xaoyaoo 2024-10-09 15:15:39 +08:00
parent 9acdb94c07
commit 001364b3c6
1 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
pywxdump/db/dbFavorite.py
View File

@ -41,7 +41,8 @@ class FavoriteHandler(DatabaseBase):
""" """
return: [(FavLocalID, TagName)] 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) FavBindTags = self.execute(sql)
return FavBindTags return FavBindTags
@ -127,6 +128,18 @@ class FavoriteHandler(DatabaseBase):
FavTagsDict = {} FavTagsDict = {}
for FavLocalID, TagName in FavTags: for FavLocalID, TagName in FavTags:
FavTagsDict[FavLocalID] = FavTagsDict.get(FavLocalID, []) + [TagName] 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: try:
import pandas as pd import pandas as pd
except ImportError: except ImportError: