Skip to content

Commit c8c0e6c

Browse files
committed
修复出现空数据库时不显示,聊天显示不全的问题
1 parent 75058b2 commit c8c0e6c

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

pkg/wechat/wechatDataProvider.go

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -260,7 +260,8 @@ func CreateWechatDataProvider(resPath string, prefixRes string) (*WechatDataProv
260260
msgDB, err := wechatOpenMsgDB(msgDBPath)
261261
if err != nil {
262262
log.Printf("open db %s error: %v", msgDBPath, err)
263-
break
263+
index += 1
264+
continue
264265
}
265266
provider.msgDBs = append(provider.msgDBs, msgDB)
266267
log.Printf("MSG%d.db start %d - %d end\n", index, msgDB.startTime, msgDB.endTime)
@@ -1080,13 +1081,15 @@ func wechatOpenMsgDB(path string) (*wechatMsgDB, error) {
10801081
err = msgDB.db.QueryRow(querySql).Scan(&msgDB.startTime)
10811082
if err != nil {
10821083
log.Println("select DB startTime failed:", path, ":", err)
1084+
msgDB.db.Close()
10831085
return nil, err
10841086
}
10851087

10861088
querySql = "select CreateTime from MSG order by CreateTime desc limit 1;"
10871089
err = msgDB.db.QueryRow(querySql).Scan(&msgDB.endTime)
10881090
if err != nil {
10891091
log.Println("select DB endTime failed:", path, ":", err)
1092+
msgDB.db.Close()
10901093
return nil, err
10911094
}
10921095

0 commit comments

Comments
 (0)