Compare commits
3
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
1340f6c233 | ||
|
|
5aeddacfc9 | ||
|
|
453d288a6c |
No files matched your search
@@ -38,6 +38,7 @@ jobs:
|
||||
tests/dsh/test_issue_broker.py
|
||||
tests/packaging/test_dsh_runtime_staging.py
|
||||
tests/packaging/test_release_configuration.py
|
||||
tests/packaging/test_self_extracting_release.py
|
||||
--junitxml=build/ci-results.xml --tb=short
|
||||
- name: Windows release scope
|
||||
run: |
|
||||
|
||||
@@ -4,11 +4,11 @@
|
||||
|
||||
面向 **Windows + DxDesigner / Expedition Enterprise 7.9.5** 的器件批量替换工具。一个工程对应一个任务,可以只替换同料号下的部分位号;支持直接编辑和 Excel BOM 导入,同批工程按顺序执行。
|
||||
|
||||
**最新版本:V1.2.1(预发布)** · [下载便携包](https://git.simgreek.com/Skyworth_Digital_Hardware/dxdesigner-part-replacement/releases/download/v1.2.1/DxPartReplace-1.2.1.zip) · [版本说明与附件](https://git.simgreek.com/Skyworth_Digital_Hardware/dxdesigner-part-replacement/releases/tag/v1.2.1) · [完整使用说明](docs/user/v1.1.0-project-tasks.md)
|
||||
**最新版本:V1.2.2(预发布)** · [自解压 EXE](https://git.simgreek.com/Skyworth_Digital_Hardware/dxdesigner-part-replacement/releases/download/v1.2.2/DxPartReplace-1.2.2.exe) · [ZIP 便携包](https://git.simgreek.com/Skyworth_Digital_Hardware/dxdesigner-part-replacement/releases/download/v1.2.2/DxPartReplace-1.2.2.zip) · [版本说明与附件](https://git.simgreek.com/Skyworth_Digital_Hardware/dxdesigner-part-replacement/releases/tag/v1.2.2) · [完整使用说明](docs/user/v1.1.0-project-tasks.md)
|
||||
|
||||
V1.2.1 提供完整 Node/Qt 运行时、DSH 任务功能和全部 UI 资源。升级前备份 data,完整更新 EXE 与 _internal,不要只替换 EXE。
|
||||
V1.2.2 新增操作历史、安全续跑与内置 7-Zip 的自解压 EXE,同时提供完整 Node/Qt 运行时、DSH 任务功能和全部 UI 资源。升级前备份 data,完整更新 EXE 与 _internal,不要只替换 EXE。
|
||||
|
||||
本版修复冻结应用缺少 SVG 资源的问题,保留维护者配置的工单上报能力,并增加云端 CI。[本版变更](docs/releases/v1.2.1.md)。
|
||||
本版合并 PR15 与 PR17,补齐操作历史和模型设置,提供自解压 EXE 与 ZIP 两种同内容发行包。[本版变更](docs/releases/v1.2.2.md)。
|
||||
|
||||
本版提供[目标封装选择](docs/user/target-cell-selection.md):目标封装可留空,此时工具不主动覆写封装,可后续与中心库同步;需要指定时,在料号规则中读取并选择合法封装。BOM 保持原 11 列。
|
||||
|
||||
@@ -44,7 +44,9 @@ node tools/verify_dsh_runtime.mjs
|
||||
|
||||
### 第 1 步:解压并打开应用
|
||||
|
||||
[下载 V1.2.1 便携包](https://git.simgreek.com/Skyworth_Digital_Hardware/dxdesigner-part-replacement/releases/download/v1.2.1/DxPartReplace-1.2.1.zip),**完整解压**,双击 `DxPartReplace.exe`。保留它与 `_internal` 的相对位置,无需安装 Python;本机需要可用的 DxDesigner、许可证和中央库。
|
||||
推荐下载上方自解压 EXE,双击后选择新的解压目录,完成后运行目录内的 DxPartReplace.exe。自解压引擎已内置,无需另外安装 7-Zip,也无需通过 Windows 资源管理器解压。
|
||||
|
||||
[下载 V1.2.2 便携包](https://git.simgreek.com/Skyworth_Digital_Hardware/dxdesigner-part-replacement/releases/download/v1.2.2/DxPartReplace-1.2.2.zip),**完整解压**,双击 `DxPartReplace.exe`。保留它与 `_internal` 的相对位置,无需安装 Python;本机需要可用的 DxDesigner、许可证和中央库。
|
||||
|
||||
打开后看到下图主窗口。首次使用请准备完整的工程副本,执行前保存并关闭待处理工程。
|
||||
|
||||
|
||||
@@ -0,0 +1,7 @@
|
||||
# V1.2.2
|
||||
|
||||
本版本合并 PR15 的操作历史与安全续跑改进,并提供带内置 7-Zip 解压引擎的 Windows 自解压包。
|
||||
|
||||
下载 `DxPartReplace-1.2.2.exe` 可使用自解压界面选择目标目录;`DxPartReplace-1.2.2.zip` 作为同内容回退包。两种包都包含完整的 `DxPartReplace.exe`、`_internal`、DSH Node 运行时、Qt WebEngine 依赖和资源文件。
|
||||
|
||||
解压后请保留 `DxPartReplace.exe` 与 `_internal` 的相对位置。本机仍需可用的 DxDesigner、许可证和中央库。沿用旧任务前先安全退出旧版本并备份 `data`,不要同时使用不同版本打开同一数据目录。
|
||||
@@ -33,6 +33,12 @@ legacy_runtime_datas = [
|
||||
|
||||
# The native assistant loads the official web UI; include its pinned Node runtime.
|
||||
dsh_root = project_root / 'integration' / 'dsh'
|
||||
for required in ('node_modules/@deepseek-ai/dsh/package.json', 'issue-bootstrap.json',
|
||||
'start.mjs', 'package.json', 'task-plugin/host.mjs'):
|
||||
if not (dsh_root / required).is_file():
|
||||
raise RuntimeError(f'Complete DSH release runtime is required; missing: {required}')
|
||||
if shutil.which('node') is None:
|
||||
raise RuntimeError('Node executable is required for the complete release')
|
||||
if (dsh_root / 'issue-bootstrap.json').is_file():
|
||||
legacy_runtime_datas.append((str(dsh_root / 'issue-bootstrap.json'), 'dsh-runtime'))
|
||||
if (dsh_root / 'node_modules' / '@deepseek-ai' / 'dsh' / 'package.json').is_file():
|
||||
|
||||
@@ -0,0 +1,21 @@
|
||||
# Windows self-extracting release
|
||||
|
||||
Build the complete application with `Build-DxPartReplace.ps1` first. The spec now fails if the installed DSH package, reporter configuration or Node executable is missing. Keep the entire installed `integration/dsh/node_modules` tree, including lazy runtime dependencies.
|
||||
|
||||
Use the official **7-Zip 26.05 x64** tools from:
|
||||
|
||||
- Binary: https://github.com/ip7z/7zip/releases/download/26.05/7z2605-x64.exe
|
||||
- SHA256: `fd99e86f57d8f429ef5ed045bf98315af962e2309b0f1ba87a147a44c71647d0`
|
||||
- Source and license: https://github.com/ip7z/7zip/releases/tag/26.05 and https://www.7-zip.org/license.txt
|
||||
|
||||
Extract the installer with an existing 7-Zip tool into a build-only directory. No machine-wide installation is needed. Use that directory's `7z.exe`, `7z.dll`, `7z.sfx` and `License.txt`. The standard `7z.sfx` opens a destination selector and extracts to a persistent directory. It is not the install-to-temp SFX module; it takes no installer configuration and does not auto-launch or delete the extracted application.
|
||||
|
||||
```powershell
|
||||
python tools/build_self_extracting_release.py --source-dir dist/DxPartReplace --output-dir G:/dx-release-1.2.2 --version 1.2.2 --seven-zip build/7zip-2605/full/7z.exe --sfx-stub build/7zip-2605/full/7z.sfx --license build/7zip-2605/full/License.txt
|
||||
```
|
||||
|
||||
Use a fresh output directory and keep the completed build input unchanged during packaging. The tool rejects an existing directory, overlapping input/output paths and an application input containing `data`. It stages the complete input using same-volume hardlinks (copying when links are unavailable), includes the 7-Zip license, produces independent EXE + ZIP archives, and writes artifact and per-file SHA256 hashes. LZMA2 level 3 and bounded solid blocks keep decoding memory modest; tiny files still incur filesystem costs, so do not promise a fixed speedup across machines.
|
||||
|
||||
Before publishing, run the self-extracting EXE itself with `-y -o<fresh directory>`, compare every resulting file and every ZIP member against the manifest, and run `tools/verify_packaged_runtime.py` and Qt/DSH UI acceptance on that extracted EXE. Neither merely listing the archive nor the source UI tests replaces this check.
|
||||
|
||||
The optional Windows integration test exercises the real SFX with Chinese/spaced paths and empty/binary files. Set `DX_SFX_TEST_TOOLS` to the official tools directory and run `python -m pytest tests/packaging/test_self_extracting_release.py`. Linux CI runs the portable output-protection checks and explicitly skips the Windows integration.
|
||||
@@ -1,8 +1,8 @@
|
||||
# UTF-8
|
||||
VSVersionInfo(
|
||||
ffi=FixedFileInfo(
|
||||
filevers=(1, 2, 1, 0),
|
||||
prodvers=(1, 2, 1, 0),
|
||||
filevers=(1, 2, 2, 0),
|
||||
prodvers=(1, 2, 2, 0),
|
||||
mask=0x3f,
|
||||
flags=0x2,
|
||||
OS=0x40004,
|
||||
@@ -15,11 +15,11 @@ VSVersionInfo(
|
||||
StringTable('040904B0', [
|
||||
StringStruct('CompanyName', 'DxProductivity'),
|
||||
StringStruct('FileDescription', 'DxDesigner Part Replacement'),
|
||||
StringStruct('FileVersion', '1.2.1.0'),
|
||||
StringStruct('FileVersion', '1.2.2.0'),
|
||||
StringStruct('InternalName', 'DxPartReplace'),
|
||||
StringStruct('OriginalFilename', 'DxPartReplace.exe'),
|
||||
StringStruct('ProductName', 'DxDesigner Part Replacement'),
|
||||
StringStruct('ProductVersion', '1.2.1')
|
||||
StringStruct('ProductVersion', '1.2.2')
|
||||
])
|
||||
]),
|
||||
VarFileInfo([VarStruct('Translation', [1033, 1200])])
|
||||
|
||||
+1
-1
@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
|
||||
|
||||
[project]
|
||||
name = "dx-productivity"
|
||||
version = "1.2.1"
|
||||
version = "1.2.2"
|
||||
requires-python = ">=3.12,<3.13"
|
||||
dependencies = ["PySide6>=6.7,<7", "pywin32>=306", "pywinauto>=0.6.9,<1", "openpyxl>=3.1,<4"]
|
||||
|
||||
|
||||
@@ -1 +1 @@
|
||||
VERSION = "1.2.1"
|
||||
VERSION = "1.2.2"
|
||||
@@ -0,0 +1,81 @@
|
||||
from pathlib import Path
|
||||
import os
|
||||
import subprocess
|
||||
import sys
|
||||
import zipfile
|
||||
|
||||
import pytest
|
||||
|
||||
ROOT = Path(__file__).resolve().parents[2]
|
||||
sys.path.insert(0, str(ROOT / 'tools'))
|
||||
from build_self_extracting_release import build_release
|
||||
from verify_self_extracting_release import verify
|
||||
|
||||
|
||||
def test_release_refuses_existing_output_without_deleting_it(tmp_path):
|
||||
source = tmp_path / 'app'
|
||||
source.mkdir()
|
||||
output = tmp_path / 'valuable'
|
||||
output.mkdir()
|
||||
sentinel = output / 'keep.txt'
|
||||
sentinel.write_text('user files')
|
||||
tool = tmp_path / 'tool.exe'
|
||||
tool.write_bytes(b'MZ')
|
||||
with pytest.raises((FileExistsError, ValueError)):
|
||||
build_release(source, output, version='1.2.2', seven_zip=tool, sfx_stub=tool)
|
||||
assert sentinel.read_text() == 'user files'
|
||||
|
||||
|
||||
def test_release_rejects_output_inside_source(tmp_path):
|
||||
source = tmp_path / 'app'
|
||||
source.mkdir()
|
||||
tool = tmp_path / 'tool.exe'
|
||||
tool.write_bytes(b'MZ')
|
||||
with pytest.raises(ValueError, match='inside'):
|
||||
build_release(source, source / 'out', version='1.2.2', seven_zip=tool, sfx_stub=tool)
|
||||
assert not (source / 'out').exists()
|
||||
|
||||
|
||||
def test_release_refuses_user_data_in_payload(tmp_path):
|
||||
source = tmp_path / 'app'
|
||||
(source / 'data').mkdir(parents=True)
|
||||
(source / 'data' / 'tasks.db').write_bytes(b'private')
|
||||
tool = tmp_path / 'tool.exe'
|
||||
tool.write_bytes(b'MZ')
|
||||
with pytest.raises(ValueError, match='data'):
|
||||
build_release(source, tmp_path / 'out', version='1.2.2', seven_zip=tool, sfx_stub=tool)
|
||||
assert not (tmp_path / 'out').exists()
|
||||
|
||||
|
||||
@pytest.mark.skipif(os.name != 'nt' or not os.environ.get('DX_SFX_TEST_TOOLS'),
|
||||
reason='Windows and explicit official 7-Zip tools required')
|
||||
def test_actual_sfx_and_zip_extract_identical_unicode_and_empty_files(tmp_path):
|
||||
tools = Path(os.environ['DX_SFX_TEST_TOOLS']).resolve()
|
||||
source = tmp_path / 'payload'
|
||||
source.mkdir()
|
||||
(source / 'DxPartReplace.exe').write_bytes(b'sample application')
|
||||
(source / '中文 目录').mkdir()
|
||||
(source / '中文 目录' / '空.txt').write_bytes(b'')
|
||||
(source / '中文 目录' / 'file.bin').write_bytes(bytes(range(256)) * 2048)
|
||||
(source / 'licenses').mkdir()
|
||||
original_license=source/'licenses'/'7-Zip-LICENSE.txt'
|
||||
original_license.write_text('original input must remain unchanged')
|
||||
output = tmp_path / 'release'
|
||||
manifest = build_release(source, output, version='1.2.2', seven_zip=tools/'7z.exe',
|
||||
sfx_stub=tools/'7z.sfx', license_path=tools/'License.txt')
|
||||
assert original_license.read_text() == 'original input must remain unchanged'
|
||||
destination = tmp_path / '解压 结果'
|
||||
result = verify(output/'release-manifest-1.2.2.json', destination)
|
||||
assert result['passed'] and result['files'] == 4
|
||||
with zipfile.ZipFile(output/'DxPartReplace-1.2.2.zip') as archive:
|
||||
assert archive.testzip() is None
|
||||
assert {p.relative_to(destination).as_posix() for p in destination.rglob('*') if p.is_file()} == set(archive.namelist())
|
||||
assert len(archive.namelist()) == 4 == manifest['file_count']
|
||||
for name in archive.namelist():
|
||||
assert (destination/name).read_bytes() == archive.read(name)
|
||||
assert (destination/'DxPartReplace'/'中文 目录'/'file.bin').read_bytes() == bytes(range(256))*2048
|
||||
with (output/'DxPartReplace-1.2.2.exe').open('ab') as stream:
|
||||
stream.write(b'corrupt download')
|
||||
with pytest.raises(ValueError, match='Artifact checksum'):
|
||||
verify(output/'release-manifest-1.2.2.json', tmp_path/'corrupt-extraction')
|
||||
assert not (tmp_path/'corrupt-extraction').exists()
|
||||
@@ -0,0 +1,130 @@
|
||||
"""Create the ZIP and 7-Zip self-extracting artifacts for a release."""
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
import argparse
|
||||
import hashlib
|
||||
import json
|
||||
import os
|
||||
import re
|
||||
from pathlib import Path
|
||||
import shutil
|
||||
import subprocess
|
||||
import zipfile
|
||||
|
||||
from self_extracting_release import build_sfx
|
||||
|
||||
|
||||
def _sha256(path: Path) -> str:
|
||||
digest = hashlib.sha256()
|
||||
with path.open("rb") as stream:
|
||||
for chunk in iter(lambda: stream.read(1024 * 1024), b""):
|
||||
digest.update(chunk)
|
||||
return digest.hexdigest()
|
||||
|
||||
|
||||
def _zip_tree(source: Path, output: Path) -> int:
|
||||
files = 0
|
||||
with zipfile.ZipFile(output, "x", compression=zipfile.ZIP_DEFLATED, compresslevel=6, allowZip64=True) as archive:
|
||||
for path in sorted(source.rglob("*")):
|
||||
if path.is_file():
|
||||
archive.write(path, path.relative_to(source.parent).as_posix())
|
||||
files += 1
|
||||
return files
|
||||
|
||||
|
||||
def _stage_file(source, destination):
|
||||
# Release input is immutable during packaging. Same-volume links avoid a
|
||||
# second copy of tens of thousands of runtime files; archives are independent.
|
||||
try:
|
||||
os.link(source, destination)
|
||||
except OSError:
|
||||
shutil.copyfile(source, destination)
|
||||
return destination
|
||||
|
||||
|
||||
def build_release(source_dir: Path, output_dir: Path, *, version: str, seven_zip: Path, sfx_stub: Path,
|
||||
license_path: Path | None = None) -> dict:
|
||||
source_dir = Path(source_dir).resolve(strict=True)
|
||||
output_dir = Path(output_dir).resolve()
|
||||
if not source_dir.is_dir():
|
||||
raise ValueError("source_dir must be a directory")
|
||||
if output_dir.is_relative_to(source_dir) or source_dir.is_relative_to(output_dir):
|
||||
raise ValueError('Output must not be inside or contain the source directory')
|
||||
if (source_dir / 'data').exists():
|
||||
raise ValueError('Release input must not include user data')
|
||||
if not re.fullmatch(r'[0-9]+\.[0-9]+\.[0-9]+(?:-[A-Za-z0-9.]+)?', version):
|
||||
raise ValueError('Invalid release version')
|
||||
seven_zip = Path(seven_zip).resolve(strict=True)
|
||||
sfx_stub = Path(sfx_stub).resolve(strict=True)
|
||||
output_dir.mkdir(parents=True, exist_ok=False)
|
||||
|
||||
staging = output_dir / "staging" / "DxPartReplace"
|
||||
shutil.copytree(source_dir, staging, copy_function=_stage_file)
|
||||
if license_path is not None:
|
||||
license_target = staging / "licenses" / "7-Zip-LICENSE.txt"
|
||||
license_target.parent.mkdir(parents=True, exist_ok=True)
|
||||
# Break a possible staging hardlink before replacing a pre-existing notice.
|
||||
license_target.unlink(missing_ok=True)
|
||||
shutil.copyfile(Path(license_path).resolve(strict=True), license_target)
|
||||
|
||||
archive_7z = output_dir / f"DxPartReplace-{version}.7z"
|
||||
subprocess.run([
|
||||
str(seven_zip), "a", "-t7z", "-mx=3", "-m0=LZMA2", "-mmt=4", "-ms=64m",
|
||||
str(archive_7z), "DxPartReplace"
|
||||
], cwd=staging.parent, check=True, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, text=True,
|
||||
timeout=3600)
|
||||
|
||||
zip_path = output_dir / f"DxPartReplace-{version}.zip"
|
||||
file_count = _zip_tree(staging, zip_path)
|
||||
sfx_path = output_dir / f"DxPartReplace-{version}.exe"
|
||||
build_sfx(sfx_stub, archive_7z, sfx_path)
|
||||
archive_7z.unlink()
|
||||
|
||||
manifest = {
|
||||
"version": version,
|
||||
"file_count": file_count,
|
||||
"artifacts": {
|
||||
zip_path.name: {"bytes": zip_path.stat().st_size, "sha256": _sha256(zip_path)},
|
||||
sfx_path.name: {"bytes": sfx_path.stat().st_size, "sha256": _sha256(sfx_path)},
|
||||
},
|
||||
"extractor": {
|
||||
"kind": "7zip-sfx",
|
||||
"stub": sfx_stub.name,
|
||||
"stub_sha256": _sha256(sfx_stub),
|
||||
"compressor": seven_zip.name,
|
||||
"compressor_sha256": _sha256(seven_zip),
|
||||
"version_output": subprocess.check_output([str(seven_zip)], text=True, errors='replace')[:500],
|
||||
"settings": "LZMA2 level 3, 4 threads, 64 MiB solid blocks",
|
||||
},
|
||||
"files": {path.relative_to(staging.parent).as_posix(): _sha256(path)
|
||||
for path in sorted(staging.rglob('*')) if path.is_file()},
|
||||
}
|
||||
(output_dir / f"release-manifest-{version}.json").write_text(
|
||||
json.dumps(manifest, ensure_ascii=False, indent=2) + "\n", encoding="utf-8"
|
||||
)
|
||||
(output_dir / f"SHA256SUMS-{version}.txt").write_text(
|
||||
"".join(f"{item['sha256']} {name}\n" for name, item in manifest["artifacts"].items()),
|
||||
encoding="ascii",
|
||||
)
|
||||
return manifest
|
||||
|
||||
|
||||
def main() -> int:
|
||||
parser = argparse.ArgumentParser()
|
||||
parser.add_argument("--source-dir", type=Path, required=True)
|
||||
parser.add_argument("--output-dir", type=Path, required=True)
|
||||
parser.add_argument("--version", required=True)
|
||||
parser.add_argument("--seven-zip", type=Path, required=True)
|
||||
parser.add_argument("--sfx-stub", type=Path, required=True)
|
||||
parser.add_argument("--license", type=Path)
|
||||
args = parser.parse_args()
|
||||
manifest = build_release(args.source_dir, args.output_dir, version=args.version,
|
||||
seven_zip=args.seven_zip, sfx_stub=args.sfx_stub,
|
||||
license_path=args.license)
|
||||
print(json.dumps(manifest, ensure_ascii=False, indent=2))
|
||||
return 0
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
raise SystemExit(main())
|
||||
@@ -0,0 +1,45 @@
|
||||
"""Build a 7-Zip SFX wrapper around a prepared .7z release archive."""
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
from pathlib import Path
|
||||
import os
|
||||
import shutil
|
||||
|
||||
|
||||
def build_sfx(
|
||||
stub: Path,
|
||||
archive: Path,
|
||||
output: Path,
|
||||
) -> Path:
|
||||
"""Use the official 7z.sfx extractor (not the temporary installer stub).
|
||||
|
||||
Its native dialog selects a persistent destination. No installer config,
|
||||
registry modifications, temporary extraction or automatic launch is needed.
|
||||
"""
|
||||
stub = Path(stub)
|
||||
archive = Path(archive)
|
||||
output = Path(output)
|
||||
if not stub.is_file() or not archive.is_file():
|
||||
raise FileNotFoundError("SFX stub and archive must both exist")
|
||||
if output.exists():
|
||||
raise FileExistsError(output)
|
||||
with stub.open('rb') as stream:
|
||||
if stream.read(2) != b'MZ':
|
||||
raise ValueError('Expected Windows SFX executable')
|
||||
with archive.open('rb') as stream:
|
||||
if stream.read(6) != b'7z\xbc\xaf\x27\x1c':
|
||||
raise ValueError('Expected 7z archive')
|
||||
output.parent.mkdir(parents=True, exist_ok=True)
|
||||
temporary = output.with_name(f".{output.name}.{os.getpid()}.tmp")
|
||||
try:
|
||||
with temporary.open("xb") as target:
|
||||
for source in (stub, archive):
|
||||
with source.open('rb') as stream:
|
||||
shutil.copyfileobj(stream, target, 1024 * 1024)
|
||||
target.flush()
|
||||
os.fsync(target.fileno())
|
||||
os.replace(temporary, output)
|
||||
finally:
|
||||
temporary.unlink(missing_ok=True)
|
||||
return output
|
||||
@@ -0,0 +1,59 @@
|
||||
"""Run the delivered SFX and verify its files and every ZIP member against SHA256."""
|
||||
import argparse
|
||||
import hashlib
|
||||
import json
|
||||
import os
|
||||
from pathlib import Path
|
||||
import subprocess
|
||||
import time
|
||||
import zipfile
|
||||
|
||||
|
||||
def digest(stream):
|
||||
return hashlib.file_digest(stream, 'sha256').hexdigest()
|
||||
|
||||
|
||||
def verify(manifest_path: Path, destination: Path):
|
||||
manifest = json.loads(manifest_path.read_text(encoding='utf-8'))
|
||||
root = manifest_path.resolve().parent
|
||||
destination = destination.resolve()
|
||||
if destination.exists():
|
||||
raise FileExistsError('Use a fresh extraction destination')
|
||||
for name, expected in manifest['artifacts'].items():
|
||||
with (root/name).open('rb') as stream:
|
||||
if digest(stream) != expected['sha256']:
|
||||
raise ValueError('Artifact checksum mismatch: '+name)
|
||||
version = manifest['version']
|
||||
started = time.monotonic()
|
||||
subprocess.run([str(root/f'DxPartReplace-{version}.exe'), '-y', '-o'+str(destination)],
|
||||
check=True, timeout=1800, creationflags=getattr(subprocess, 'CREATE_NO_WINDOW', 0))
|
||||
elapsed = time.monotonic()-started
|
||||
actual = {p.relative_to(destination).as_posix(): p for p in destination.rglob('*') if p.is_file()}
|
||||
if set(actual) != set(manifest['files']):
|
||||
raise ValueError('Self-extracted file set differs from manifest')
|
||||
for name, path in actual.items():
|
||||
with path.open('rb') as stream:
|
||||
if digest(stream) != manifest['files'][name]:
|
||||
raise ValueError('Self-extracted checksum mismatch: '+name)
|
||||
with zipfile.ZipFile(root/f'DxPartReplace-{version}.zip') as archive:
|
||||
if len(archive.namelist()) != len(actual) or set(archive.namelist()) != set(actual):
|
||||
raise ValueError('ZIP file set differs from manifest')
|
||||
# Reading to EOF also checks ZIP CRC for every member.
|
||||
for name in archive.namelist():
|
||||
with archive.open(name) as stream:
|
||||
if digest(stream) != manifest['files'][name]:
|
||||
raise ValueError('ZIP checksum mismatch: '+name)
|
||||
return dict(passed=True, files=len(actual), sfx_extraction_seconds=round(elapsed, 3),
|
||||
actual_sfx_executed=True, zip_crc_and_sha256=True,
|
||||
destination=str(destination))
|
||||
|
||||
|
||||
if __name__ == '__main__':
|
||||
parser = argparse.ArgumentParser(description=__doc__)
|
||||
parser.add_argument('manifest', type=Path)
|
||||
parser.add_argument('destination', type=Path)
|
||||
parser.add_argument('--report', type=Path, required=True)
|
||||
args = parser.parse_args()
|
||||
result = verify(args.manifest, args.destination)
|
||||
args.report.write_text(json.dumps(result, ensure_ascii=False, indent=2)+'\n', encoding='utf-8')
|
||||
print(json.dumps(result, ensure_ascii=False, indent=2))
|
||||
Reference in new issue
Block a user