From a510696efcdda0543032f7ada2f663f1f4fa4b5f Mon Sep 17 00:00:00 2001 From: Viv Date: Fri, 2 Jun 2023 16:35:06 -0400 Subject: [PATCH] `parsers.py`: Add support for SHIFT-JIS .tjas Roppon was formatted as SHIFTJIS, so this was necessary. --- tja2fumen/main.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/tja2fumen/main.py b/tja2fumen/main.py index d43e0b9..7af93d7 100644 --- a/tja2fumen/main.py +++ b/tja2fumen/main.py @@ -24,8 +24,12 @@ def main(fnameFumen=None, fnameTJA=None, validate=False): if fnameTJA: # Parse tja - inputFile = open(fnameTJA, "r", encoding="utf-8-sig") - parsedSongsTJA = parseTJA(inputFile) + try: + inputFile = open(fnameTJA, "r", encoding="utf-8-sig") + parsedSongsTJA = parseTJA(inputFile) + except UnicodeDecodeError: + inputFile = open(fnameTJA, "r", encoding="shift-jis") + parsedSongsTJA = parseTJA(inputFile) # Try converting the Oni TJA chart to match the Oni fumen convertedTJA = convertTJAToFumen(parsedSongFumen, parsedSongsTJA['Oni'])