Skip to content

Commit c428309

Browse files
committed
新增错误处理部分
1 parent 4d5f396 commit c428309

File tree

2 files changed

+10
-5
lines changed

2 files changed

+10
-5
lines changed

api/notion_dump.py

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -146,6 +146,7 @@ def start_dump_multi(self):
146146
print("没有需要备份的内容")
147147
return
148148

149+
dump_status = True
149150
dump_log = ""
150151
success_back_list = []
151152
# 逐个解析需要备份的内容
@@ -203,16 +204,20 @@ def start_dump_multi(self):
203204
dump_log += "id:" + _page_id + " backup success "
204205
else:
205206
dump_log += "id:" + _page_id + " backup fail "
207+
dump_status = False
206208

207209
# 更新备份列表
208210
backup_handle.update_backup_list(success_back_list)
209211

210212
# 新增备份日志
211213
if dump_log != "":
212214
dump_log += "\n"
213-
dump_log += "备份成功"
215+
if dump_status:
216+
dump_log += "备份成功"
217+
else:
218+
dump_log += "部分备份失败"
214219
print(dump_log)
215-
backup_handle.add_backup_log(status=True, log=dump_log)
220+
backup_handle.add_backup_log(status=dump_status, log=dump_log)
216221

217222
def start_dump_single(self):
218223
print("server version: " + VERSION + "(s)\n")

api/notion_dump_api.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
from NotionDump.Notion.Notion import NotionQuery
1313
from NotionDump.utils import common_op
1414

15-
VERSION = "0.1.13"
15+
KERNEL_VERSION = NotionDump.__version__
1616
# 子目录的定制
1717
CHILD_PAGES_PATH = "./child_pages/"
1818
DATABASE_PATH = "./databases/"
@@ -183,7 +183,7 @@ def start_dump(
183183
return self.__start_export()
184184

185185
def show_param(self):
186-
self.show_log("kernel version:" + VERSION, level=LOG_INFO)
186+
self.show_log("kernel version:" + KERNEL_VERSION, level=LOG_INFO)
187187
self.show_log(" token:" + self.__token)
188188
self.show_log("page_id:" + self.__page_id, level=LOG_INFO)
189189
type_str = "unknown"
@@ -263,7 +263,7 @@ def __start_export(self):
263263
self.show_log("file link relocate success, check path :" + self.__dump_path, level=LOG_INFO)
264264

265265
# 显示kernel中出现的错误
266-
if len(page_detail_json["errors"]) > 0:
266+
if "errors" in page_detail_json and len(page_detail_json["errors"]) > 0:
267267
self.show_log("kernel dump error list:", level=LOG_INFO)
268268
self.show_log(page_detail_json["errors"], level=LOG_INFO)
269269
return True

0 commit comments

Comments
 (0)