@kevlns/xlmerge 2.0.1 → 2.0.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -0,0 +1,44 @@
1
+ <!doctype html>
2
+ <html lang="zh-CN"><meta charset="utf-8"><meta name="viewport" content="width=device-width,initial-scale=1">
3
+ <title>Excel 冲突解析进度</title>
4
+ <style>
5
+ :root{--ink:#24221d;--paper:#fffdf4;--gold:#f2cb54;--muted:#777367}*{box-sizing:border-box}
6
+ body{margin:0;background:#eeeadd;color:var(--ink);font-family:"Microsoft YaHei",sans-serif;min-height:100vh;display:grid;place-items:center;background-image:linear-gradient(#24221d06 1px,transparent 1px),linear-gradient(90deg,#24221d06 1px,transparent 1px);background-size:24px 24px}
7
+ main{width:min(780px,calc(100% - 40px));border:2px solid var(--ink);background:var(--paper);box-shadow:8px 8px 0 var(--ink)}
8
+ header{display:flex;justify-content:space-between;gap:16px;border-bottom:2px solid var(--ink);padding:18px 28px;font-size:12px;font-weight:bold;letter-spacing:2px}
9
+ .status{background:var(--gold);padding:3px 8px;letter-spacing:0}.body{padding:36px 28px}h1{font-size:32px;margin:0 0 12px;font-family:Georgia,"SimSun",serif}.hint{color:var(--muted);font-size:13px;line-height:1.8;margin-bottom:32px}
10
+ .file{font-size:17px;font-weight:bold;overflow-wrap:anywhere;margin:10px 0 24px}.label{font-size:11px;letter-spacing:2px;color:var(--muted)}
11
+ .counts{display:grid;grid-template-columns:1fr 1fr;border:1px solid var(--ink)}.metric{padding:18px}.metric+ .metric{border-left:1px solid var(--ink)}.number{font:32px Consolas,monospace;margin:8px 0}.detail{font-size:12px;color:var(--muted);overflow-wrap:anywhere;min-height:18px}
12
+ progress{display:block;appearance:none;width:100%;height:8px;margin:24px 0 12px;border:0;background:#e4dfd1}progress::-webkit-progress-bar{background:#e4dfd1}progress::-webkit-progress-value{background:var(--ink)}progress:not([value]){animation:pulse 1.4s infinite}
13
+ footer{border-top:2px solid var(--ink);padding:18px 28px;display:flex;align-items:center;justify-content:space-between;gap:20px;font-size:12px}button{font:inherit;font-weight:bold;border:2px solid var(--ink);background:var(--gold);padding:11px 18px;box-shadow:3px 3px 0 var(--ink);cursor:pointer;white-space:nowrap}button:disabled{opacity:.5;cursor:wait;box-shadow:none}button:focus-visible{outline:3px solid #267da0;outline-offset:4px}#error{color:#a32929;white-space:pre-wrap;overflow-wrap:anywhere}
14
+ @keyframes pulse{50%{opacity:.35}}@media(prefers-reduced-motion:reduce){progress:not([value]){animation:none}}@media(max-width:520px){header,.body,footer{padding:20px}h1{font-size:26px}.counts{grid-template-columns:1fr}.metric+.metric{border-left:0;border-top:1px solid var(--ink)}footer{align-items:flex-start;flex-direction:column}}
15
+ </style>
16
+ <main><header><span>XLMERGE / EXCEL 冲突解决工具</span><span class="status" id="state">解析中</span></header>
17
+ <div class="body" aria-live="polite"><h1 id="phase">准备解析工作簿</h1><div class="hint">解析完成后自动进入审阅页面。你可以随时中断本次解析。</div>
18
+ <div class="label">当前工作簿</div><div class="file" id="file">正在读取冲突列表…</div>
19
+ <div class="counts"><div class="metric"><div class="label">已完成工作簿 / 总数</div><div class="number" id="files">— / —</div><div class="detail" id="side">等待解析</div></div><div class="metric"><div class="label">当前阶段 Sheet 已处理 / 总数</div><div class="number" id="sheets">— / —</div><div class="detail" id="sheet">等待 Sheet 对齐</div></div></div>
20
+ <progress id="progress" aria-label="已完成工作簿进度"></progress><div class="detail" id="detail">进度按实际完成数量更新</div><p id="error" role="alert"></p></div>
21
+ <footer><span id="footer">解析期间不会修改仓库表格。</span><button id="cancel">关闭并中断解析</button></footer></main>
22
+ <script>
23
+ let stopping=false, acknowledged=false, finished=false;
24
+ const el=id=>document.getElementById(id);
25
+ async function poll(){
26
+ try{
27
+ const r=await fetch('/api/status',{cache:'no-store'});if(!r.ok)throw Error('无法读取解析进度');const s=await r.json();
28
+ if(s.state==='ready'&&!stopping){location.reload();return;}
29
+ el('phase').textContent=s.phase;el('file').textContent=s.file||'正在读取冲突列表…';
30
+ el('files').textContent=s.fileTotal?`${s.fileDone} / ${s.fileTotal}`:'— / —';
31
+ el('sheets').textContent=s.sheetTotal?`${s.sheetDone} / ${s.sheetTotal}`:'— / —';
32
+ el('sheet').textContent=s.sheet||'整本计算期间不提供逐 Sheet 进度';
33
+ el('side').textContent=({base:'Base 版本',ours:'本地版本',theirs:'远端版本'})[s.side]||s.phase;
34
+ if(s.fileTotal){el('progress').max=s.fileTotal;el('progress').value=s.fileDone;}
35
+ el('state').textContent=({preparing:'解析中',cancelling:'正在中断',cancelled:'已中断',failed:'解析失败'})[s.state]||'已完成';
36
+ if(s.state==='failed'){el('error').textContent=s.error||'解析失败';el('cancel').textContent='关闭页面和服务';}
37
+ if(s.state==='cancelled'){finish();return;}
38
+ }catch(e){if(acknowledged){finish();return;}el('error').textContent=e.message+',正在重试…';}
39
+ if(!finished)setTimeout(poll,500);
40
+ }
41
+ function finish(){finished=true;el('state').textContent='已停止';el('phase').textContent='解析已停止';el('footer').textContent='工作树未修改,可以关闭此页。';el('cancel').disabled=false;el('cancel').textContent='关闭页面';el('cancel').onclick=()=>window.close();if(stopping)window.close();}
42
+ el('cancel').onclick=async()=>{stopping=true;el('cancel').disabled=true;el('cancel').textContent='正在停止计算…';try{const r=await fetch('/api/shutdown',{method:'POST'});if(!r.ok)throw Error('中断请求失败');acknowledged=true;}catch(e){stopping=false;el('cancel').disabled=false;el('error').textContent=e.message;}};
43
+ poll();
44
+ </script></html>
@@ -1,126 +1,179 @@
1
- """Local-only HTTP server for the sheet-aware XLSX resolver UI."""
2
-
3
- from __future__ import annotations
4
-
5
- import json
6
- import sys
7
- import threading
8
- import webbrowser
9
- from pathlib import Path
10
- from wsgiref.simple_server import make_server
11
-
12
- from bottle import Bottle, request, response
13
-
14
- SCRIPT_DIR = Path(__file__).resolve().parent
15
- if str(SCRIPT_DIR) not in sys.path:
16
- sys.path.insert(0, str(SCRIPT_DIR))
17
-
18
- from xlsx_conflict import ConflictError, _build_commit_message, apply_manifest, load_manifest
19
-
20
-
21
- def _payload() -> dict:
22
- """Read raw JSON without Bottle's 100 KiB ``request.json`` form-memory limit."""
23
- if not request.content_length:
24
- return {}
25
- data = request.body.read()
26
- if not data:
27
- return {}
28
- parsed = json.loads(data.decode("utf-8"))
29
- return parsed if isinstance(parsed, dict) else {}
30
-
31
-
32
- def _json(data, status: int = 200):
33
- response.status = status
34
- response.content_type = "application/json; charset=utf-8"
35
- return json.dumps(data, ensure_ascii=False)
36
-
37
-
38
- def _public_manifest(manifest):
39
- return {
40
- "summary": manifest["summary"],
41
- "files": [
42
- {
43
- "id": item["id"],
44
- "path": item["path"],
45
- "oursAuthor": item.get("oursAuthor", ""),
46
- "theirsAuthor": item.get("theirsAuthor", ""),
47
- "oursDate": item.get("oursDate", ""),
48
- "theirsDate": item.get("theirsDate", ""),
49
- "macro": item.get("macro"),
50
- "diff": item["diff"],
51
- }
52
- for item in manifest["files"]
53
- ],
54
- }
55
-
56
-
57
- def serve(manifest_path: Path | str, *, open_browser: bool = True, port: int = 0) -> bool:
58
- manifest_path = Path(manifest_path).resolve()
59
- manifest = load_manifest(manifest_path)
60
- if not manifest["files"]:
61
- print(
62
- "Manifest has no conflicts requiring review; use resolve/apply for auto-theirs entries.",
63
- file=sys.stderr,
64
- )
65
- return False
66
- html_path = Path(__file__).with_name("merge_ui.html")
67
- app = Bottle()
68
- state = {"resolved": False, "server": None}
69
-
70
- @app.get("/")
71
- def index():
72
- response.content_type = "text/html; charset=utf-8"
73
- return html_path.read_text(encoding="utf-8")
74
-
75
- @app.get("/api/diff")
76
- def diff():
77
- return _json(_public_manifest(manifest))
78
-
79
- @app.post("/api/commit-preview")
80
- def commit_preview():
81
- """只读:按当前 decisions 生成结构化 commit 信息,不执行任何写操作。"""
82
- payload = _payload()
83
- try:
84
- message = _build_commit_message(manifest, payload.get("decisions") or {})
85
- return _json({"message": message})
86
- except (ConflictError, OSError, ValueError, KeyError) as exc:
87
- return _json({"success": False, "error": str(exc)}, 400)
88
-
89
- @app.post("/api/resolve")
90
- def resolve():
91
- payload = _payload()
92
- try:
93
- result = apply_manifest(
94
- manifest_path,
95
- payload.get("decisions") or {},
96
- commit=bool(payload.get("commit", True)),
97
- push=bool(payload.get("push", False)),
98
- message=(payload.get("message") or "").strip() or None,
99
- )
100
- if result["success"]:
101
- state["resolved"] = True
102
- threading.Timer(2.0, state["server"].shutdown).start()
103
- return _json(result, 200 if result["success"] else 500)
104
- except (ConflictError, OSError, ValueError, KeyError) as exc:
105
- return _json({"success": False, "error": str(exc)}, 400)
106
-
107
- @app.error(413)
108
- def too_large(error):
109
- return _json({"success": False, "error": "request body too large"}, 413)
110
-
111
- @app.post("/api/shutdown")
112
- def shutdown():
113
- threading.Thread(target=state["server"].shutdown, daemon=True).start()
114
- return _json({"success": True})
115
-
116
- server = make_server("127.0.0.1", port, app)
117
- state["server"] = server
118
- url = f"http://127.0.0.1:{server.server_port}"
119
- print(f"MERGE_SERVER_URL={url}", flush=True)
120
- if open_browser:
121
- webbrowser.open(url)
122
- try:
123
- server.serve_forever()
124
- finally:
125
- server.server_close()
126
- return bool(state["resolved"])
1
+ """Local-only HTTP server for the sheet-aware XLSX resolver UI."""
2
+
3
+ from __future__ import annotations
4
+
5
+ import json
6
+ import sys
7
+ import threading
8
+ import webbrowser
9
+ from pathlib import Path
10
+ from wsgiref.simple_server import make_server
11
+
12
+ from bottle import Bottle, request, response
13
+
14
+ SCRIPT_DIR = Path(__file__).resolve().parent
15
+ if str(SCRIPT_DIR) not in sys.path:
16
+ sys.path.insert(0, str(SCRIPT_DIR))
17
+
18
+ from xlsx_conflict import ConflictError, _build_commit_message, apply_manifest, load_manifest
19
+ from prepare_progress import preparation_context, PreparationCancelled, checkpoint
20
+
21
+
22
+ def _payload() -> dict:
23
+ """Read raw JSON without Bottle's 100 KiB ``request.json`` form-memory limit."""
24
+ if not request.content_length:
25
+ return {}
26
+ data = request.body.read()
27
+ if not data:
28
+ return {}
29
+ parsed = json.loads(data.decode("utf-8"))
30
+ return parsed if isinstance(parsed, dict) else {}
31
+
32
+
33
+ def _json(data, status: int = 200):
34
+ response.status = status
35
+ response.content_type = "application/json; charset=utf-8"
36
+ return json.dumps(data, ensure_ascii=False)
37
+
38
+
39
+ def _public_manifest(manifest):
40
+ return {
41
+ "summary": manifest["summary"],
42
+ "files": [
43
+ {
44
+ "id": item["id"],
45
+ "path": item["path"],
46
+ "oursAuthor": item.get("oursAuthor", ""),
47
+ "theirsAuthor": item.get("theirsAuthor", ""),
48
+ "oursDate": item.get("oursDate", ""),
49
+ "theirsDate": item.get("theirsDate", ""),
50
+ "macro": item.get("macro"),
51
+ "diff": item["diff"],
52
+ }
53
+ for item in manifest["files"]
54
+ ],
55
+ }
56
+
57
+
58
+ def serve(manifest_path: Path | str, *, open_browser: bool = True, port: int = 0,
59
+ prepare_repo=None, relative_path=None) -> bool:
60
+ manifest_path = Path(manifest_path).resolve()
61
+ manifest = None if prepare_repo else load_manifest(manifest_path)
62
+ if manifest is not None and not manifest["files"]:
63
+ print(
64
+ "Manifest has no conflicts requiring review; use resolve/apply for auto-theirs entries.",
65
+ file=sys.stderr,
66
+ )
67
+ return False
68
+ html_path = Path(__file__).with_name("merge_ui.html")
69
+ app = Bottle()
70
+ state = {"resolved": False, "server": None}
71
+ lock = threading.Lock()
72
+ cancelled = threading.Event()
73
+ status = {'state': 'preparing' if prepare_repo else 'ready', 'phase': '开始解析',
74
+ 'file': '', 'fileDone': 0, 'fileTotal': 0, 'sheet': '', 'sheetDone': 0, 'sheetTotal': 0, 'side': ''}
75
+
76
+ def report(progress):
77
+ with lock:
78
+ status.update(progress)
79
+
80
+ def prepare():
81
+ nonlocal manifest
82
+ try:
83
+ from xlsx_conflict import prepare_conflicts
84
+ with preparation_context(report, cancelled):
85
+ path = prepare_conflicts(prepare_repo, relative_path=relative_path, runtime_dir=manifest_path.parent)
86
+ checkpoint()
87
+ prepared = load_manifest(path)
88
+ with lock:
89
+ if cancelled.is_set():
90
+ raise PreparationCancelled()
91
+ manifest = prepared
92
+ status.update(state='ready', phase='可开始审阅')
93
+ except PreparationCancelled:
94
+ report({'state': 'cancelled', 'phase': '已中断,工作树未修改'})
95
+ except Exception as exc:
96
+ report({'state': 'failed', 'error': str(exc), 'phase': '解析失败'})
97
+
98
+ worker = threading.Thread(target=prepare, name='xlmerge-prepare') if prepare_repo else None
99
+
100
+ @app.get("/")
101
+ def index():
102
+ response.content_type = "text/html; charset=utf-8"
103
+ with lock:
104
+ ready = status['state'] == 'ready'
105
+ return (html_path if ready else html_path.with_name('loading_ui.html')).read_text(encoding="utf-8")
106
+
107
+ @app.get('/api/status')
108
+ def progress():
109
+ with lock:
110
+ return _json(dict(status))
111
+
112
+ @app.get("/api/diff")
113
+ def diff():
114
+ if manifest is None:
115
+ return _json({'error': '解析尚未完成'}, 409)
116
+ return _json(_public_manifest(manifest))
117
+
118
+ @app.post("/api/commit-preview")
119
+ def commit_preview():
120
+ """只读:按当前 decisions 生成结构化 commit 信息,不执行任何写操作。"""
121
+ payload = _payload()
122
+ if manifest is None:
123
+ return _json({'error': '解析尚未完成'}, 409)
124
+ try:
125
+ message = _build_commit_message(manifest, payload.get("decisions") or {})
126
+ return _json({"message": message})
127
+ except (ConflictError, OSError, ValueError, KeyError) as exc:
128
+ return _json({"success": False, "error": str(exc)}, 400)
129
+
130
+ @app.post("/api/resolve")
131
+ def resolve():
132
+ payload = _payload()
133
+ if manifest is None:
134
+ return _json({'error': '解析尚未完成'}, 409)
135
+ try:
136
+ result = apply_manifest(
137
+ manifest_path,
138
+ payload.get("decisions") or {},
139
+ commit=bool(payload.get("commit", True)),
140
+ push=bool(payload.get("push", False)),
141
+ message=(payload.get("message") or "").strip() or None,
142
+ )
143
+ if result["success"]:
144
+ state["resolved"] = True
145
+ threading.Timer(2.0, state["server"].shutdown).start()
146
+ return _json(result, 200 if result["success"] else 500)
147
+ except (ConflictError, OSError, ValueError, KeyError) as exc:
148
+ return _json({"success": False, "error": str(exc)}, 400)
149
+
150
+ @app.error(413)
151
+ def too_large(error):
152
+ return _json({"success": False, "error": "request body too large"}, 413)
153
+
154
+ @app.post("/api/shutdown")
155
+ def shutdown():
156
+ with lock:
157
+ if status['state'] == 'preparing':
158
+ cancelled.set()
159
+ status['state'] = 'cancelling'
160
+ def stop():
161
+ if worker:
162
+ worker.join()
163
+ state['server'].shutdown()
164
+ threading.Thread(target=stop, daemon=True).start()
165
+ return _json({"success": True})
166
+
167
+ server = make_server("127.0.0.1", port, app)
168
+ state["server"] = server
169
+ if worker:
170
+ worker.start()
171
+ url = f"http://127.0.0.1:{server.server_port}"
172
+ print(f"MERGE_SERVER_URL={url}", flush=True)
173
+ if open_browser:
174
+ webbrowser.open(url)
175
+ try:
176
+ server.serve_forever()
177
+ finally:
178
+ server.server_close()
179
+ return bool(state["resolved"])