diff --git a/src/tja2fumen/__init__.py b/src/tja2fumen/__init__.py index 49ac1d6..7945c91 100644 --- a/src/tja2fumen/__init__.py +++ b/src/tja2fumen/__init__.py @@ -39,7 +39,7 @@ def main(argv=None): # Write fumen data to files for fumenData, outputName in zip(parsedSongsFumen.values(), outputFilenames): - writeFumen(open(outputName, "wb"), fumenData) + writeFumen(outputName, fumenData) if return_vars: return parsedSongsTJA, parsedSongsFumen, outputFilenames diff --git a/src/tja2fumen/parsers.py b/src/tja2fumen/parsers.py index e3e474b..771d9a4 100644 --- a/src/tja2fumen/parsers.py +++ b/src/tja2fumen/parsers.py @@ -286,10 +286,7 @@ def readFumen(fumenFile, exclude_empty_measures=False): For more information on any of the terms used in this function (e.g. scoreInit, scoreDiff), please refer to KatieFrog's excellent guide: https://gist.github.com/KatieFrogs/e000f406bbc70a12f3c34a07303eec8b """ - if type(fumenFile) is str: - file = open(fumenFile, "rb") - else: - file = fumenFile + file = open(fumenFile, "rb") size = os.fstat(file.fileno()).st_size # Fetch the header bytes diff --git a/src/tja2fumen/writers.py b/src/tja2fumen/writers.py index 71fe837..ccb3fde 100644 --- a/src/tja2fumen/writers.py +++ b/src/tja2fumen/writers.py @@ -2,11 +2,12 @@ from tja2fumen.utils import writeStruct, putBool from tja2fumen.constants import branchNames, typeNotes -def writeFumen(file, song): +def writeFumen(path_out, song): # Fetch the byte order (little/big endian) order = song['order'] # Write the header + file = open(path_out, "wb") file.write(song['headerPadding']) # Write header padding bytes file.write(song['headerMetadata']) # Write header metadata bytes