-
Notifications
You must be signed in to change notification settings - Fork 0
/
Copy pathdiff1.py
609 lines (505 loc) · 20.1 KB
/
diff1.py
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
import sys, time
import hashlib
import sqlite3
import json
import streamlit as st
# local package
import _difflines as df # type: ignore
DB_FILE = "diff1.db"
# difflib information resources:
# difflib ranference
# https://docs.python.org/3/library/difflib.html#difflib.SequenceMatcher
# nice example
# https://coderzcolumn.com/tutorials/python/difflib-simple-way-to-find-out-differences-between-sequences-file-contents-using-python#google_vignette
# define global data in session_state
if 'run_cnt' not in st.session_state:
st.session_state.run_cnt = 0
else:
st.session_state.run_cnt += 1
print(f"run_cnt = {st.session_state.run_cnt}")
# global environment store into st.session_state
class Env:
def __init__(self):
if "env" not in st.session_state:
st.session_state.env = {}
def __getitem__(self, key):
return st.session_state.env[key]
# return st.session_state.env.get(key, None) # return None if key not exists
def __setitem__(self, key, value):
st.session_state.env[key] = value
def __len__(self):
return len(st.session_state.env)
def has(self, key):
if key not in st.session_state.env:
return False
else:
return True
env = Env()
if not env.has("working_step"):
env["working_step"] = 0 # 0 prepare, 1 revice, 2 finish revice, ony refined text editable
if "is_file_ready" not in st.session_state:
st.session_state.is_file_ready = False
if "is_workspace_ready" not in st.session_state:
st.session_state.is_workspace_ready = False
if "is_changed" not in st.session_state:
st.session_state.is_changed = False
if "refined_text" not in st.session_state: # !! refined_text bind with refined_area, shoud never move to env[]
st.session_state.refined_text = ""
if "inline" not in st.session_state:
st.session_state.inline = False # inline working data
if "op_inline" not in st.session_state:
st.session_state.op_inline = [] # inline op list
if "pos_inline" not in st.session_state:
st.session_state.pos_inline = 0 # inline position
# mix use session_state variable, not good, just easy
if not env.has("workspace_id"):
env["workspace_id"] = None
if not env.has("refined_text_changed_only"):
env["refined_text_changed_only"] = False
if not env.has("last_save_time"):
env["last_save_time"] = None
#CRLF更换为\n\n;单\n也优化为\n\n,支持st.write换行
def format_crlf(s:str) -> str:
s = s.replace(" ","")
s = s.replace("\r\n","\n")
s = s.replace("\n","\n\n")
s = s.replace("\n\n\n\n","\n\n")
return s
def hint(msg:str):
hint_area.empty()
hint_area.warning(msg)
# 应用标题
col1, col2 = st.columns(2)
header = col1.markdown("**选择文本文档(不要Word哦)**")
last_save_time = col2.empty()
def show_last_save(t):
last_save_time.write(f"最后保存时间:{time.strftime('%Y-%m-%d %H:%M:%S', time.localtime(t))}")
#side bar for debug message output and other
with st.sidebar:
st.subheader("帮助信息:")
st.markdown("""
- 只支持文本文件的比较
- 系统每分钟自动保存,不必担心内容丢失
- 保存以段落为单位,段落校对完成才会被保存
- 每次加载同样的文件会可以继续之前的工作
- 你上传的文件将被保留在服务器端,请不要上传你认为需要保密的文件
- 我们不保证你的文件会永久保留,超过一段时间未访问的文件可能会被清除
""")
# place for file uploader
file_area = st.empty()
fe = file_area.container()
f_area1 = fe.container(border = True)
f_area2 = fe.container(border = True)
# hint area
hint_container = st.container(border = True) # for hint message
hint_area = hint_container.empty()
# setup file uploader
if not st.session_state.is_file_ready:
file1 = f_area1.file_uploader("选择一个文档", type = ["txt"])
file2 = f_area2.file_uploader("另一个文档(AI)", type = ["txt"])
hint("开始吧,选择两个文件开始校对...") # will create hint area when first time run
### read data from files
#
if not env.has("filename1"):
env["filename1"] = ""
if not env.has("filename2"):
env["filename2"] = ""
if not env.has("filesize1"):
env["filesize1"] = 0
if not env.has("filesize2"):
env["filensize2"] = 0
if not env.has("f1_md5"):
env["f1_md5"] = None
if not env.has("f2_md5"):
env["f2_md5"] = None
if not env.has("f1_md5_hex"):
env["f1_md5_hex"] = None
if not env.has("f2_md5_hex"):
env["f2_md5_hex"] = None
if not env.has("bytes1"):
env["bytes1"] = None
if not env.has("bytes2"):
env["bytes2"] = None
if not env.has("content1"):
env["content1"] = None
if not env.has("content2"):
env["content2"] = None
if not st.session_state.is_file_ready:
# Preliminary file check
if file1 is not None:
if file1.type.startswith('text'):
env["filename1"] = file1.name
env["filesize1"] = file1.size
env["bytes1"] = file1.read()
env["content1"] = env["bytes1"].decode('utf-8')
env["f1_md5"] = hashlib.md5()
env["f1_md5"].update(env["bytes1"])
env["f1_md5_hex"] = env["f1_md5"].hexdigest()
f_area1.success(f"原始文件:{file1.name}: 文件大小: {file1.size} 字节,文件类型: {file1.type}")
else:
f_area1.warning("出错了:需要校对的应该是一个文本文件")
if file2 is not None:
if file2.type.startswith('text'):
env["filename2"] = file2.name
env["filesize2"] = file2.size
env["bytes2"] = file2.read()
env["content2"] = env["bytes2"].decode('utf-8')
env["f2_md5"] = hashlib.md5()
env["f2_md5"].update(env["bytes2"])
env["f2_md5_hex"] = env["f2_md5"].hexdigest()
f_area2.success(f"更新文件:{file2.name}: 文件大小: {file2.size} 字节,文件类型: {file2.type}")
else:
f_area2.warning("出错了:需要校对的应该是一个文本文件")
# end of file load
if file1 is None or file2 is None:
hint("请先选择需要比对的两个文档")
st.stop()
if env["f1_md5"].hexdigest() == env["f2_md5"].hexdigest():
hint("你选择了两个同样的文件 !")
st.stop()
hint("文件就绪,请确认开始校对...")
st.session_state.is_file_ready = True
#end of file reading
# show [开始人工校对] button, goto next step
if env["working_step"] == 0: # prepare
bu = st.empty()
if bu.button("开始人工校对"):
bu.empty() # we don't need the button any more
env["working_step"] = 1
else:
st.stop()
# replace file uploader with file information
if env["working_step"] == 1 or env["working_step"] == 2:
fe.empty() # clear file uploader
fe.markdown("**校对文件:**\n\n" +
f"**原始文件**: {env["filename1"]} ({env["filesize1"]} 字节)"+ "\n\n" +
f"**更新文件**: {env["filename2"]} ({env["filesize2"]} 字节)")
### setup new workspace or restore workspace data from db
if not st.session_state.is_workspace_ready:
# 连接到数据库
conn = sqlite3.connect(DB_FILE)
if conn is None:
print("error")
exit
cursor = conn.cursor()
# 创建 files 表(如果不存在)
cursor.execute('''
CREATE TABLE IF NOT EXISTS files (
id INTEGER PRIMARY KEY AUTOINCREMENT,
filename TEXT NOT NULL,
filesize INTEGER NOT NULL,
content TEXT NOT NULL,
md5 TEXT NOT NULL
)
''')
# 检查文件1的MD5是否已存在
cursor.execute('SELECT * FROM files WHERE md5 = ?', (env["f1_md5_hex"],))
if cursor.fetchone() is None:
# 如果MD5不存在,则插入文件1的信息
cursor.execute('''
INSERT INTO files (filename, filesize, content, md5)
VALUES (?, ?, ?, ?)
''', (env["filename1"], env["filesize1"], env["content1"], env["f1_md5_hex"]))
# 检查文件2的MD5是否已存在
cursor.execute('SELECT * FROM files WHERE md5 = ?', (env["f2_md5_hex"],))
if cursor.fetchone() is None:
# 如果MD5不存在,则插入文件2的信息
cursor.execute('''
INSERT INTO files (filename, filesize, content, md5)
VALUES (?, ?, ?, ?)
''', (env["filename2"], env["filesize2"], env["content2"], env["f2_md5_hex"]))
# 创建 workspace 表(如果不存在)
cursor.execute('''
CREATE TABLE IF NOT EXISTS workspace (
id INTEGER PRIMARY KEY AUTOINCREMENT,
filename1 TEXT NOT NULL,
filename2 TEXT NOT NULL,
f1MD5 TEXT NOT NULL,
f2MD5 TEXT NOT NULL,
text_refined TEXT,
last_save_time INTEGER
)
''')
# 创建 op_list 表(如果不存在)
cursor.execute('''
CREATE TABLE IF NOT EXISTS op_list (
workspace_id INTEGER,
op TEXT,
line TEXT,
inline_ops TEXT,
FOREIGN KEY (workspace_id) REFERENCES workspace (id)
)
''')
# 检查workspace中是否有包含前面两个MD5的项
cursor.execute('''
SELECT id, filename1, filename2, text_refined, last_save_time FROM workspace
WHERE (f1MD5 = ? AND f2MD5 = ?)
''', (env["f1_md5_hex"], env["f2_md5_hex"]))
existing_workspace = cursor.fetchone()
# setup work space
#
if existing_workspace is None:
env["last_save_time"] = time.time()
# new work space
r = cursor.execute('''
INSERT INTO workspace (filename1, filename2, f1MD5, f2MD5, text_refined, last_save_time)
VALUES (?, ?, ?, ?, ?, ?)
''', (env["filename1"], env["filename2"], env["f1_md5_hex"], env["f2_md5_hex"], "", env["last_save_time"]))
if r.rowcount <= 0:
raise RuntimeError("Error operate database")
env["workspace_id"] = cursor.lastrowid
env["content1"] = format_crlf(env["content1"])
env["content2"] = format_crlf(env["content2"])
aa = env["content1"].split("\n")
bb = env["content2"].split("\n")
# 务必去掉空行
aa = [s for s in aa if s.strip()]
bb = [s for s in bb if s.strip()]
diff_ab = df.diff_lines(aa, bb)
op_list = df.combine_changed_lines(aa, bb, diff_ab)
# 将op_list内容插入到数据库op_list表中
for item in op_list:
j_op = json.dumps(item[2]) # dump to json format save to db
cursor.execute('''
INSERT INTO op_list (workspace_id, op, line, inline_ops)
VALUES (?, ?, ?, ?)
''', (env["workspace_id"], item[0], item[1], j_op))
st.session_state.refined_text = ""
st.session_state.op_list = op_list
hint(f"已建立新的工作环境:{env['filename1']} : {env['filename2']}")
else:
# 如果找到匹配的workspace,恢复原来的工作环境
env["workspace_id"], env["filename1"], env["filename2"], refined_text, env["last_save_time"] = existing_workspace
# 从op_list表中恢复op_list数据
cursor.execute('''
SELECT op, line, inline_ops FROM op_list
WHERE workspace_id = ?
ORDER BY rowid
''', (env["workspace_id"],))
op_list = []
for row in cursor.fetchall():
op, line, j_op = row
s_op = json.loads(j_op)
op_list.append([op, line, s_op])
st.session_state.op_list = op_list
st.session_state.refined_text = refined_text
hint(f"已恢复工作环境:{env["filename1"]} -- {env["filename2"]},\
最后保存时间{time.strftime('%Y-%m-%d %H:%M:%S', time.localtime(env["last_save_time"]))}")
# 提交更改并关闭连接
conn.commit()
conn.close()
st.session_state.is_workspace_ready = True
# end restore workspace from db
# auto save workspace every 60 seconds
AUTO_SAVE_INTERVAL = 60
@st.fragment(run_every = AUTO_SAVE_INTERVAL)
def save_workspace():
print(f"inside save workspace: working_step={env["working_step"]} : changed={st.session_state.is_changed}")
if env["working_step"] == 0:
return
if not st.session_state.is_changed:
return
# 连接到数据库
conn = sqlite3.connect(DB_FILE)
cursor = conn.cursor()
if not env["refined_text_changed_only"]:
# delete old op_list in db, insert new
cursor.execute('''
DELETE FROM op_list
WHERE workspace_id = ?
''', (env["workspace_id"],))
for item in op_list:
j_op = json.dumps(item[2]) # dump to json format save to db
cursor.execute('''
INSERT INTO op_list (workspace_id, op, line, inline_ops)
VALUES (?, ?, ?, ?)
''', (env["workspace_id"], item[0], item[1], j_op))
# update refined_text to db
env["last_save_time"] = time.time()
cursor.execute('''
UPDATE workspace
SET text_refined = ?, last_save_time = ?
WHERE id = ?
''', (st.session_state.refined_text, env["last_save_time"], env["workspace_id"]))
# 提交更改
conn.commit()
conn.close()
show_last_save(env["last_save_time"])
st.session_state.is_changed = False
env["refined_text_changed_only"] = False
#end of save_workspace
save_workspace() # active auto save
# constructe working area, restore from session_state
op_list = st.session_state.op_list # recove op_list from session
op_num = len(op_list)
if op_num == 0: # empty
hint("好像是一个空文件哦。")
st.stop()
pos = 0
while pos < op_num:
if op_list[pos][0] == "e":
pos += 1
else:
break
if pos == op_num: # touch the end, the file processed
env["working_step"] = 2 # revice finish, only refined-text editable
hint("文件已经完成校对。")
# recove working data
inline = st.session_state.inline # inline working or not
op_inline = st.session_state.op_inline # inline op list
pos_inline = st.session_state.pos_inline # inline position
refined_text = st.session_state.refined_text
op_list = st.session_state.op_list
### start to layout and process confirm activate
###
# user changed the text, update to refined_text
def ref_edited():
global refined_text
refined_text = st.session_state.refined_text
st.session_state.is_changed = True
env["refined_text_changed_only"] = True
# construction refined_text area
rac = st.container(height = 300, border = True) # refined_text area
rae = rac.empty()
rae.text_area(label = "**已确认校对的文字:**", height = 240, key = "refined_text", on_change = ref_edited)
# update to text_area, called as refined-text changed cause "accept" or "reject"
def refresh_refined_textarea():
st.session_state.refined_text = refined_text
rae.empty()
rae.text_area(label = "**已确认校对的文字:**", height = 240, key = "refined_text", on_change = ref_edited)
@st.fragment
def show_revice_button(): # accept and reject button
if env["working_step"] == 0: #do not show the button when prepare
return
col1, col2 = st.columns(2)
if env["working_step"] == 1:
col1.button("确认修改", on_click = on_accept)
col2.button("拒绝修改", on_click = on_reject)
elif env["working_step"] == 2:
col1.button("确认修改", on_click = on_accept, disabled=True)
col2.button("拒绝修改", on_click = on_reject, disabled=True)
else:
raise RuntimeError(f"working_step={env["working_step"]}") # should never be here
def on_accept():
global pos, op_list, inline, op_inline, pos_inline, refined_text
if env["working_step"] != 1: # not revice
raise RuntimeError(f"working_step={env["working_step"]}") # should never be here
if not inline:
if op_list[pos][0] == "e":
refined_text = refined_text + op_list[pos][1] + "\n"
pos += 1
elif op_list[pos][0] == "d":
del op_list[pos]
elif op_list[pos][0] == "i":
op_list[pos][0] = "e"
refined_text = refined_text + op_list[pos][1] + "\n"
pos += 1
elif op_list[pos][0] == "s":
inline = True
op_inline = op_list[pos][2]
pos_inline = 0
while op_inline[pos_inline][0] == "e": # skip to first non-"e" elment
pos_inline += 1
if inline:
if op_inline[pos_inline][0] == "e":
pos_inline += 1
elif op_inline[pos_inline][0] == "d":
del op_inline[pos_inline]
elif op_inline[pos_inline][0] == "i":
op_inline[pos_inline][0] = "e"
pos_inline += 1
else:
raise RuntimeError
while pos_inline < len(op_inline) and op_inline[pos_inline][0] == "e": # skip "e" following,hilight next d/i
pos_inline += 1
# 完成本行确认
if pos_inline >= len(op_inline):
op_list[pos][0] = "e"
a = [row[1] for row in op_inline]
op_list[pos][1] = "".join(a)
inline = False
#pos += 1
st.session_state.is_changed = True
# end of the list
if pos == len(op_list):
save_workspace() # all finished, save
env["working_step"] = 2 # only refined-text area editable
# refresh
refresh_refined_textarea()
refresh_working()
#end of button clicked
def on_reject():
global pos, op_list, inline, op_inline, pos_inline, refined_text
if env["working_step"] != 1: # not revice
raise RuntimeError(f"working_step={env["working_step"]}") # should never be here
if not inline:
if op_list[pos][0] == "e":
refined_text = refined_text + op_list[pos][1] + "\n"
pos += 1
elif op_list[pos][0] == "d": # reject delete
op_list[pos][0] = "e"
refined_text = refined_text + op_list[pos][1] + "\n"
pos += 1
elif op_list[pos][0] == "i":
del op_list[pos]
elif op_list[pos][0] == "s":
inline = True
op_inline = op_list[pos][2]
pos_inline = 0
while op_inline[pos_inline][0] == "e": # skip to first non-"e" elment
pos_inline += 1
if inline:
if op_inline[pos_inline][0] == "e":
pos_inline += 1
elif op_inline[pos_inline][0] == "d":
op_inline[pos_inline][0] = "e"
pos_inline += 1
elif op_inline[pos_inline][0] == "i":
del op_inline[pos_inline]
else:
raise RuntimeError
while pos_inline < len(op_inline) and op_inline[pos_inline][0] == "e": # skip "e" following,hilight next d/i
pos_inline += 1
# 完成本行确认
if pos_inline >= len(op_inline):
op_list[pos][0] = "e"
a = [row[1] for row in op_inline]
op_list[pos][1] = "".join(a)
inline = False
#pos += 1
st.session_state.is_changed = True
# end of the list
if pos == len(op_list):
save_workspace() # all finished, save
env["working_step"] = 2 # only refined-text area editable
# refresh
refresh_refined_textarea()
refresh_working()
#end of button clicked
# pass # not finish yet
# layout 2 buttons
show_revice_button()
# lay out text tobe confirm(working area)
wac = st.container(border = True) # working area
wac.markdown("**正在校对的内容:**")
wa = wac.empty()
def refresh_working():
if env["working_step"] == 0:
return
MAX_LINE_SHOW = 20
s = ""
if env["working_step"] == 1:
maxitem = min(pos+MAX_LINE_SHOW, len(op_list))
work_items = op_list[pos: maxitem]
i = 0
for l in work_items: # layout delete and insert
s = s + df.change_oneline_to_html(l, i == 0)
s = s + "<br/>"
i += 1
elif env["working_step"] == 2:
s = "恭喜,这里的内容已经都校对完了"
else:
raise RuntimeError(f"working_step={env["working_step"]}") # should never be here
wa.empty()
wa.html(s)
refresh_working()