Taiko_Stuff/tja2fumen
1
0
Fork 0
mirror of synced 2024-11-27 22:40:49 +01:00
Code Releases Wiki Activity

parsers.py: Simplify BPM/OFFSET logic

Browse Source
This commit is contained in:
Viv 2023-07-25 23:21:20 -04:00
parent 3cb25c23c7
commit 6ea74ae58b
1 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/tja2fumen/parsers.py
View File

@ -58,12 +58,15 @@ def split_tja_lines_into_courses(lines):
lines = [line.split("//")[0].strip() for line in lines lines = [line.split("//")[0].strip() for line in lines
if line.split("//")[0].strip()] if line.split("//")[0].strip()]
parsed_tja = None # Initialize song with BPM and OFFSET global metadata
bpm = [line.split(":")[1] for line in lines
if line.startswith("BPM")][0]
offset = [line.split(":")[1] for line in lines
if line.startswith("OFFSET")][0]
parsed_tja = TJASong(bpm, offset)
current_course = '' current_course = ''
current_course_basename = '' current_course_basename = ''
song_bpm = 0
song_offset = 0
for line in lines: for line in lines:
# Only metadata and #START commands are relevant for this function # Only metadata and #START commands are relevant for this function
match_metadata = re.match(r"^([A-Z]+):(.*)", line) match_metadata = re.match(r"^([A-Z]+):(.*)", line)
@ -74,17 +77,8 @@ def split_tja_lines_into_courses(lines):
name_upper = match_metadata.group(1).upper() name_upper = match_metadata.group(1).upper()
value = match_metadata.group(2).strip() value = match_metadata.group(2).strip()
# Global metadata fields
if name_upper in ['BPM', 'OFFSET']:
if name_upper == 'BPM':
song_bpm = value
elif name_upper == 'OFFSET':
song_offset = value
if song_bpm and song_offset:
parsed_tja = TJASong(song_bpm, song_offset)
# Course-specific metadata fields # Course-specific metadata fields
elif name_upper == 'COURSE': if name_upper == 'COURSE':
if value not in NORMALIZE_COURSE.keys(): if value not in NORMALIZE_COURSE.keys():
raise ValueError(f"Invalid COURSE value: '{value}'") raise ValueError(f"Invalid COURSE value: '{value}'")
current_course = NORMALIZE_COURSE[value] current_course = NORMALIZE_COURSE[value]