Skip to content

Commit 93cf173

Browse files
committed
无感备份;备份不修改备份列表
1 parent ac74a9b commit 93cf173

5 files changed

+129
-6
lines changed

.gitignore

-1
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,6 @@ dmypy.json
130130
.tmp/
131131
*_result.json
132132
release/
133-
config.json
134133
dumped_pages/
135134
config_multi.json
136135
buffer_file/

api/notion_dump.py

+4-2
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
NotionDump.TMP_DIR = os.path.normpath(SEVER_ABS_PATH + "/buffer_file") + "/"
1515
NotionDump.BUFFER_FILE = os.path.normpath(NotionDump.TMP_DIR + "/notion_download_buffer.json")
1616

17-
VERSION = "3.0.0"
17+
VERSION = "3.0.1"
1818

1919

2020
class NotionBackup:
@@ -180,7 +180,9 @@ def start_dump_multi(self):
180180
dump_status = False
181181

182182
# 更新备份列表
183-
backup_handle.update_backup_list(success_back_list)
183+
auto_check_off = self.config.get_key("auto_check_off", "multi", default=True)
184+
if auto_check_off:
185+
backup_handle.update_backup_list(success_back_list)
184186

185187
# 新增备份日志
186188
if dump_log != "":

config.json

+72
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,72 @@
1+
{
2+
"*backup_type": "multi",
3+
"single": {
4+
"*backup_token": "secret_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx",
5+
"*page_id": "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx",
6+
"-page_type": "page",
7+
"-dump_path": "测试-功能测试2",
8+
"export_child_page": true,
9+
"page_parser_type": "md",
10+
"db_parser_type": "md",
11+
"db_insert_type": "content"
12+
},
13+
"multi": {
14+
"*backup_token": "secret_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx",
15+
"*backup_info_token": "secret_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx",
16+
"*backup_list_id": "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx",
17+
"*backup_log_id": "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx",
18+
"backup_list_map": {
19+
"page_id": "页面ID",
20+
"page_type": "页面类型",
21+
"dump_path": "备份位置",
22+
"dump_status": "备份",
23+
"db_insert_type": "数据库嵌入类型"
24+
},
25+
"backup_log_map": {
26+
"title": "时间戳",
27+
"date": "备份时间",
28+
"status": "备份状态",
29+
"log": "备注"
30+
},
31+
"auto_check_off": true
32+
},
33+
"use_buffer": true,
34+
"debug": false,
35+
"auto_close": true,
36+
"page_properties": true,
37+
"datetime_formate": "%Y/%m/%d-%H:%M:%S",
38+
"date_formate": "%Y/%m/%d",
39+
"file_with_link": false,
40+
"color_theme": "light",
41+
"your_color_theme": {
42+
"f_gray": "#787774",
43+
"f_brown": "#9F6B53",
44+
"f_orange": "#D9730D",
45+
"f_yellow": "#CB912F",
46+
"f_green": "#448361",
47+
"f_blue": "#337EA9",
48+
"f_purple": "#9065B0",
49+
"f_pink": "#C14C8A",
50+
"f_red": "#D44C47",
51+
"b_gray": "#F1F1EF",
52+
"b_brown": "#F4EEEE",
53+
"b_orange": "#FBECDD",
54+
"b_yellow": "#FBF3DB",
55+
"b_green": "#EDF3EC",
56+
"b_blue": "#E7F3F8",
57+
"b_purple": "#F4F0F7CC",
58+
"b_pink": "#F9EEF3CC",
59+
"b_red": "#FDEBEC",
60+
"d_light_gray": "#E3E2E080",
61+
"d_gray": "#E3E2E0",
62+
"d_brown": "#EEE0DA",
63+
"d_orange": "#FADEC9",
64+
"d_yellow": "#FDECC8",
65+
"d_green": "#DBEDDB",
66+
"d_blue": "#D3E5EF",
67+
"d_purple": "#E8DEEE",
68+
"d_pink": "#F5E0E9",
69+
"d_red": "#FFE2DD"
70+
},
71+
"backup_root_path": "G:\\Notion备份"
72+
}

notion_backup_background.spec

+45
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
# -*- mode: python ; coding: utf-8 -*-
2+
3+
4+
block_cipher = None
5+
6+
7+
a = Analysis(
8+
['notion_backup_terminal.py'],
9+
pathex=['api/notion_dump.py', 'api/notion_dump_api.py', 'api/backup_info.py'],
10+
binaries=[],
11+
datas=[],
12+
hiddenimports=[],
13+
hookspath=[],
14+
hooksconfig={},
15+
runtime_hooks=[],
16+
excludes=[],
17+
win_no_prefer_redirects=False,
18+
win_private_assemblies=False,
19+
cipher=block_cipher,
20+
noarchive=False,
21+
)
22+
pyz = PYZ(a.pure, a.zipped_data, cipher=block_cipher)
23+
24+
exe = EXE(
25+
pyz,
26+
a.scripts,
27+
a.binaries,
28+
a.zipfiles,
29+
a.datas,
30+
[],
31+
name='notion_backup_background',
32+
debug=False,
33+
bootloader_ignore_signals=False,
34+
strip=False,
35+
upx=True,
36+
upx_exclude=[],
37+
runtime_tmpdir=None,
38+
console=False,
39+
disable_windowed_traceback=False,
40+
argv_emulation=False,
41+
target_arch=None,
42+
codesign_identity=None,
43+
entitlements_file=None,
44+
icon=['notion-dump.ico'],
45+
)

notion_backup_terminal.py

+8-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
11
# author: delta1037
22
# Date: 2022/05/01
33
4-
# 打包代码 pyinstaller -F -c -i notion-dump.ico notion_backup_terminal.py -p api/notion_dump.py -p api/notion_dump_api.py -p api/backup_info.py
4+
# 终端-打包代码 pyinstaller -F -c -i notion-dump.ico notion_backup_terminal.py -p api/notion_dump.py -p api/notion_dump_api.py -p api/backup_info.py
5+
# 终端-打包代码 pyinstaller notion_backup_terminal.spec
6+
# 后台-打包代码 pyinstaller -F -i notion-dump.ico notion_backup_terminal.py -p api/notion_dump.py -p api/notion_dump_api.py -p api/backup_info.py
7+
# 后台-打包代码 pyinstaller notion_backup_background.spec
58
import os
69
import sys
710
import time
@@ -21,7 +24,8 @@ def __init__(self):
2124
self.__log = open(LOG_FILE, "a+", encoding='utf-8')
2225
# 输出备份的时间
2326
backup_time = time.strftime('backup_time: %Y-%m-%d %H:%M:%S\n', time.localtime(time.time()))
24-
self.terminal.write(backup_time)
27+
if self.terminal is not None:
28+
self.terminal.write(backup_time)
2529
self.__log.write("\n###################################################\n")
2630
self.__log.write(backup_time)
2731
self.__log.flush()
@@ -33,7 +37,8 @@ def log_info(self, message):
3337
self.log("[EXPORT KERNEL] " + str(message))
3438

3539
def log(self, message):
36-
self.terminal.write(message + "\n")
40+
if self.terminal is not None:
41+
self.terminal.write(message + "\n")
3742
self.__log.write(message + "\n")
3843
self.__log.flush()
3944

0 commit comments

Comments
 (0)