admin
237a09a5b0
一、问题（本轮实测）
`draw-ui` 与 `oil-motion` 目录里**各自带一个内嵌 `.git`** ⇒ 上一次提交把它们记成了 **gitlink（子模块指针）**
⇒ 仓库里只存了一个不属于任何远端的 commit id，**别人克隆下来这两份是空的** ✗（`git status` 显示 ` m draw-ui` / ` m oil-motion` ＝ 子模块内容有改动）。
二、处置（可回退）
· 把两处的 `.git` **挪走**（⛔ 不是删除）⇒ `归档/内嵌git-20261008/{draw-ui,oil-motion}.git`；
· `git rm --cached` 掉那两个 gitlink，再 `git add` 两个目录 ⇒ **按正常文件入库**（内容才真的进仓库）。
三、副作用（如实记）
挪走 `.git` 后，这两个技能**不能再原地 `git pull` 取上游更新**（要更新得重新拉一份覆盖）；
如需恢复其本地仓库，把 `归档/内嵌git-20261008/` 里的 `.git` 挪回原处即可。
76 lines
3.3 KiB
Python
76 lines
3.3 KiB
Python
from pathlib import Path
|
|
import json
|
|
import subprocess
|
|
import sys
|
|
import tempfile
|
|
import unittest
|
|
|
|
from PIL import Image
|
|
|
|
SCRIPT = Path(__file__).resolve().parents[1] / "scripts" / "assemble_page.py"
|
|
|
|
|
|
class AssemblePageTests(unittest.TestCase):
|
|
def setUp(self):
|
|
self.temp = tempfile.TemporaryDirectory()
|
|
self.addCleanup(self.temp.cleanup)
|
|
self.root = Path(self.temp.name)
|
|
Image.new("RGBA", (8, 5), (255, 0, 0, 255)).save(self.root / "a.png")
|
|
Image.new("RGBA", (8, 3), (0, 0, 255, 128)).save(self.root / "b.png")
|
|
self.data = {"expected_sections": ["a", "b"], "sections": [{"id": "a", "image": "a.png"}, {"id": "b", "image": "b.png"}]}
|
|
self.output = self.root / "page.png"
|
|
|
|
def run_cli(self, *extra):
|
|
manifest = self.root / "page.json"
|
|
manifest.write_text(json.dumps(self.data))
|
|
return subprocess.run([sys.executable, str(SCRIPT), "--manifest", str(manifest), "--output", str(self.output), *extra], capture_output=True, text=True, cwd=self.root.parent)
|
|
|
|
def test_cli_preserves_order_dimensions_pixels_and_relative_paths(self):
|
|
result = self.run_cli()
|
|
self.assertEqual(result.returncode, 0, result.stderr)
|
|
with Image.open(self.output) as im:
|
|
self.assertEqual(im.size, (8, 8))
|
|
self.assertEqual(im.getpixel((0, 4)), (255, 0, 0, 255))
|
|
self.assertEqual(im.getpixel((0, 5)), (0, 0, 255, 128))
|
|
|
|
def test_rejects_wrong_width_without_writing_output(self):
|
|
Image.new("RGB", (7, 3)).save(self.root / "b.png")
|
|
self.assertNotEqual(self.run_cli().returncode, 0)
|
|
self.assertFalse(self.output.exists())
|
|
|
|
def test_rejects_missing_reordered_and_duplicate_sections(self):
|
|
for sections in ([self.data["sections"][0]], list(reversed(self.data["sections"])), [self.data["sections"][0]] * 2):
|
|
with self.subTest(sections=sections):
|
|
original = self.data["sections"]
|
|
self.data["sections"] = sections
|
|
self.assertNotEqual(self.run_cli().returncode, 0)
|
|
self.assertFalse(self.output.exists())
|
|
self.data["sections"] = original
|
|
|
|
def test_rejects_corrupt_source_and_preserves_existing_output(self):
|
|
self.output.write_bytes(b"existing")
|
|
self.assertNotEqual(self.run_cli().returncode, 0)
|
|
self.assertEqual(self.output.read_bytes(), b"existing")
|
|
(self.root / "b.png").write_bytes(b"broken")
|
|
self.assertNotEqual(self.run_cli("--force").returncode, 0)
|
|
self.assertEqual(self.output.read_bytes(), b"existing")
|
|
|
|
def test_force_replaces_output_after_validation(self):
|
|
self.output.write_bytes(b"existing")
|
|
self.assertEqual(self.run_cli("--force").returncode, 0)
|
|
with Image.open(self.output) as im:
|
|
self.assertEqual(im.size, (8, 8))
|
|
|
|
def test_rejects_duplicate_image_and_overwriting_source(self):
|
|
self.data["sections"][1]["image"] = "a.png"
|
|
self.assertNotEqual(self.run_cli().returncode, 0)
|
|
self.data["sections"][1]["image"] = "b.png"
|
|
self.output = self.root / "a.png"
|
|
before = self.output.read_bytes()
|
|
self.assertNotEqual(self.run_cli("--force").returncode, 0)
|
|
self.assertEqual(self.output.read_bytes(), before)
|
|
|
|
|
|
if __name__ == "__main__":
|
|
unittest.main()
|