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

import 优化

Browse Source
This commit is contained in:
xaoyaoo 2024-08-18 13:33:08 +08:00
parent b799cb1384
commit 799b28a668
4 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pywxdump/db/dbFavorite.py
View File

@ -5,8 +5,6 @@
# Author: xaoyaoo # Author: xaoyaoo
# Date: 2024/05/18 # Date: 2024/05/18
# ------------------------------------------------------------------------------- # -------------------------------------------------------------------------------
import pandas as pd
from .dbbase import DatabaseBase from .dbbase import DatabaseBase
from .utils import timestamp2str, xml2dict from .utils import timestamp2str, xml2dict
@ -127,7 +125,10 @@ 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]
try:
import pandas as pd
except ImportError:
return False
pf = pd.DataFrame(FavItemsList) pf = pd.DataFrame(FavItemsList)
pf.columns = FavItemsFields.keys() # set column names pf.columns = FavItemsFields.keys() # set column names
pf["UpdateTime"] = pf["UpdateTime"].apply(timestamp2str) # 处理时间 pf["UpdateTime"] = pf["UpdateTime"].apply(timestamp2str) # 处理时间

10
pywxdump/db/dbMSG.py
View File

@ -8,16 +8,12 @@
import json import json
import os import os
import re import re
# import time
# import pandas as pd
from .dbbase import DatabaseBase
from .utils import db_error, timestamp2str, xml2dict, match_BytesExtra, type_converter, \
get_md5, name2typeid, db_loger
import lz4.block import lz4.block
import blackboxprotobuf import blackboxprotobuf
from .dbbase import DatabaseBase
from .utils import db_error, timestamp2str, xml2dict, match_BytesExtra, type_converter
class MsgHandler(DatabaseBase): class MsgHandler(DatabaseBase):
_class_name = "MSG" _class_name = "MSG"

1
requirements.txt
View File

@ -9,7 +9,6 @@ pyahocorasick
lz4 lz4
blackboxprotobuf blackboxprotobuf
lxml lxml
pandas
dbutils dbutils
psutil psutil
pymem pymem

1
setup.py
View File

@ -24,7 +24,6 @@ install_requires = [
"lz4", "lz4",
"blackboxprotobuf", "blackboxprotobuf",
"lxml", "lxml",
"pandas",
"dbutils", "dbutils",
"fastapi", "fastapi",