dazed/DazedTL
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix double nametag bug

Browse source
This commit is contained in:
DazedAnon 2026-07-12 00:11:44 -05:00
parent 24feb08bea
commit acfc72da6e
2 changed files with 34 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
modules/rpgmakermvmz.py
View file

@ -2235,15 +2235,6 @@ def searchCodes(page, pbar, jobList, filename):
# Speaker Check
speakerList = []
# Remove any RPGMaker Code at start
ffMatch = re.search(
r"^((?:[\\]+[^cCnNiIkKvV]+\[[\d\w]+\])+)",
jaString,
)
if ffMatch != None:
jaString = jaString.replace(ffMatch.group(0), "")
nametag += ffMatch.group(0)
# m and z Codes
match = re.search(r"(.*?)[\\]+m\[\d+?\][\\]+z\[\d+?\]", speakerWork)
if match:

34
tests/test_mvmz_source_original.py
View file

@ -240,6 +240,40 @@ class TestMVMZSourceOriginal(unittest.TestCase):
for c in with_orig:
self.assertTrue(_has_japanese(c["_original"]))
def test_leading_format_codes_not_duplicated(self):
"""Leading \\F/\\AA/\\M codes must be restored once, including on re-run."""
src = "\\F4[2]\\AA[4]\\M4[yes]うなずいてみるよ"
page = {
"list": [
{"code": 101, "indent": 0, "parameters": ["", 0, 0, 2, "セラス"]},
{"code": 401, "indent": 0, "parameters": [src]},
]
}
page1, captured1 = _run_search_codes(page)
cmd = _find_commands(page1, 401)[0]
self.assertEqual(cmd.get("_original"), src)
out = cmd["parameters"][0]
self.assertEqual(out.count("\\F4[2]"), 1, out)
self.assertEqual(out.count("\\AA[4]"), 1, out)
self.assertEqual(out.count("\\M4[yes]"), 1, out)
self.assertTrue(out.startswith("\\F4[2]\\AA[4]\\M4[yes]"), out)
for payload in captured1:
items = payload if isinstance(payload, list) else [payload]
for item in items:
if isinstance(item, str):
self.assertNotIn("\\F4[2]", item, f"codes must be stripped before AI: {item!r}")
# Simulate a previously-bugged double prefix still sitting in parameters.
cmd["parameters"][0] = "\\F4[2]\\AA[4]\\M4[yes]" + out
page2, _ = _run_search_codes(page1)
cmd2 = _find_commands(page2, 401)[0]
out2 = cmd2["parameters"][0]
self.assertEqual(cmd2.get("_original"), src)
self.assertEqual(out2.count("\\F4[2]"), 1, out2)
self.assertEqual(out2.count("\\AA[4]"), 1, out2)
self.assertEqual(out2.count("\\M4[yes]"), 1, out2)
def test_speaker_color_line_full_original(self):
"""Standalone \\C[n]Name\\C[n] speaker 401 lines keep the full string in _original."""
page = {