Fix P2/2P bug and add clsca to the test suite

Fixes #13.

src/tja2fumen/parsers.py

@@ -81,11 +81,14 @@ def getCourseData(lines):
                 value = match_command.group(2).strip() if match_command.group(2) else ''
                 # For STYLE:Double, #START P1/P2 indicates the start of a new chart
                 # But, we want multiplayer charts to inherit the metadata from the course as a whole, so we deepcopy
-                if nameUpper == "START" and value in ["P1", "P2"]:                   
+                if nameUpper == "START":
-                    currentCourse = currentCourseCached + value
+                    if value in ["P1", "P2"]:
-                    courses[currentCourse] = deepcopy(courses[currentCourseCached])
+                        currentCourse = currentCourseCached + value
-                    courses[currentCourse]['data'] = list()  # Keep the metadata, but reset the note data
+                        courses[currentCourse] = deepcopy(courses[currentCourseCached])
-                    value = ''  # Once we've made the new course, we can reset this to a normal #START command
+                        courses[currentCourse]['data'] = list()  # Keep the metadata, but reset the note data
+                        value = ''  # Once we've made the new course, we can reset this to a normal #START command
+                    elif value:
+                        raise ValueError(f"Invalid value '{value}' for #START command.")
             elif match_notes:
                 nameUpper = 'NOTES'
                 value = match_notes.group(1)

testing/data/clsca.tja

@@ -0,0 +1,505 @@
+BPM:120.26
+OFFSET:-2.024
+
+
+COURSE:Oni
+LEVEL:7
+
+
+STYLE:Single
+BALLOON:30,10,
+SCOREINIT:570
+SCOREDIFF:147
+
+
+#START
+
+
+#GOGOSTART
+1011111210111112,
+#BPMCHANGE 119
+1011211210003000,
+#BPMCHANGE 120
+1011111210111112,
+1022202220000000,
+1011111210111112,
+#BPMCHANGE 120.69
+1011211210003000,
+#BPMCHANGE 119.94
+1011111210111112,
+#BPMCHANGE 118.83
+#SCROLL 1.01
+1011101110003000,
+
+#BPMCHANGE 120.06
+#SCROLL 1
+#GOGOEND
+1010202010111020,
+1010202010111000,
+1010202010111020,
+1010202010111000,
+
+#BPMCHANGE 118.34
+2220222022202220,
+#BPMCHANGE 122.22
+#SCROLL 0.97
+21121210,
+#BPMCHANGE 119.94
+#SCROLL 0.99
+2220222022202220,
+#SCROLL 1
+7,
+#BPMCHANGE 120.57
+0008,
+
+#BPMCHANGE 120
+#GOGOSTART
+1011111210111112,
+1011211210003000,
+1011111210111112,
+1022202220000000,
+1011111210111112,
+1011211210003000,
+1011111210111112,
+#BPMCHANGE 118.86
+1011101110003000,
+
+#BPMCHANGE 120.26
+#GOGOEND
+1122,
+1122,
+
+#BPMCHANGE 120
+100102200100,
+201101100200,
+100102200200,
+200101100200,
+10120121,
+21121000,
+101202201202,
+2000222022202220,
+
+2011101010101020,
+1022201010222010,
+1011102020002000,
+#BPMCHANGE 117.99
+2011111122222222,
+
+#BPMCHANGE 122.08
+#SCROLL 0.97
+#GOGOSTART
+100102200100,
+#BPMCHANGE 120
+#SCROLL 1
+201101100200,
+100102200200,
+#BPMCHANGE 119.3
+200101100200,
+
+#BPMCHANGE 120
+#GOGOEND
+10120121,
+21121000,
+101202201202,
+#BPMCHANGE 121.03
+2000222022202220,
+
+#BPMCHANGE 120
+2011101010101020,
+1022201010222010,
+1011102020002000,
+
+#GOGOSTART
+1011111210111112,
+1011211210003000,
+1011111210111112,
+1022202220000000,
+1011111210111112,
+1011211210003000,
+1011111210111112,
+1112111211121112,
+
+70000081,
+1300,
+
+#GOGOEND
+
+
+#END
+
+
+COURSE:Hard
+LEVEL:5
+BALLOON:25,10
+SCOREINIT:550
+SCOREDIFF:155
+
+
+STYLE:Single
+
+
+#START
+
+
+#GOGOSTART
+1011101010111010,
+#BPMCHANGE 119
+1011101110003000,
+#BPMCHANGE 120
+1011101010111010,
+1022202220000000,
+1011101010111010,
+#BPMCHANGE 120.69
+1011101110003000,
+#BPMCHANGE 119.94
+1011101010111010,
+#BPMCHANGE 118.83
+#SCROLL 1.01
+1011101110003000,
+
+#BPMCHANGE 120.06
+#SCROLL 1
+#GOGOEND
+11221110,
+1010202010111000,
+11221110,
+1010202010111000,
+
+#BPMCHANGE 118.34
+2220222022202220,
+#BPMCHANGE 122.22
+#SCROLL 0.97
+11121120,
+#BPMCHANGE 119.94
+#SCROLL 0.99
+2220222022202220,
+#SCROLL 1
+7,
+#BPMCHANGE 120.57
+0008,
+
+#BPMCHANGE 120
+#GOGOSTART
+1011101010111010,
+1011101110003000,
+1011101010111010,
+1022202220000000,
+1011101010111010,
+1011101110003000,
+1011101010111010,
+#BPMCHANGE 118.86
+1011101110003000,
+
+#BPMCHANGE 120.26
+#GOGOEND
+,
+1122,
+
+#BPMCHANGE 120
+100102200100,
+201101100000,
+100102200000,
+200101100000,
+10120112,
+11111000,
+100100200202,
+2,
+
+20101110,
+10211021,
+10211020,
+#BPMCHANGE 117.99
+200000000000500000000000000000000008000000000000,
+
+#BPMCHANGE 122.08
+#SCROLL 0.97
+#GOGOSTART
+200102200100,
+#BPMCHANGE 120
+#SCROLL 1
+201101100000,
+100102200000,
+#BPMCHANGE 119.3
+200101100000,
+
+#BPMCHANGE 120
+#GOGOEND
+10120112,
+11111000,
+100100200202,
+#BPMCHANGE 121.03
+2,
+
+#BPMCHANGE 120
+20101110,
+10211021,
+10211020,
+
+#GOGOSTART
+1011101010111010,
+1011101110003000,
+1011101010111010,
+1022202220000000,
+1011101010111010,
+1011101110003000,
+1011101010111010,
+1110111011101110,
+
+70000081,
+1300,
+
+#GOGOEND
+
+
+#END
+
+
+COURSE:Normal
+LEVEL:5
+BALLOON:20,7
+SCOREINIT:680
+SCOREDIFF:207
+
+
+STYLE:Single
+
+
+#START
+
+
+#GOGOSTART
+1111,
+#BPMCHANGE 119
+11101000,
+#BPMCHANGE 120
+1111,
+11101000,
+1111,
+#BPMCHANGE 120.69
+11101000,
+#BPMCHANGE 119.94
+11101110,
+#BPMCHANGE 118.83
+#SCROLL 1.01
+10111030,
+
+#BPMCHANGE 120.06
+#SCROLL 1
+#GOGOEND
+10201110,
+10201110,
+10201110,
+10201110,
+
+#BPMCHANGE 118.34
+22202220,
+#BPMCHANGE 122.22
+#SCROLL 0.97
+11101210,
+#BPMCHANGE 119.94
+#SCROLL 0.99
+22202220,
+#SCROLL 1
+7,
+#BPMCHANGE 120.57
+0008,
+
+#BPMCHANGE 120
+#GOGOSTART
+1111,
+11111020,
+1111,
+11111000,
+1111,
+11111020,
+11101110,
+#BPMCHANGE 118.86
+10111030,
+
+#BPMCHANGE 120.26
+#GOGOEND
+,
+1122,
+
+#BPMCHANGE 120
+1122,
+2110,
+1122,
+2110,
+10110011,
+10112000,
+10222020,
+20222020,
+
+20101110,
+12101000,
+00121020,
+#BPMCHANGE 117.99
+200000000000500000000000000000000008000000000000,
+
+#BPMCHANGE 122.08
+#SCROLL 0.97
+#GOGOSTART
+1122,
+#BPMCHANGE 120
+#SCROLL 1
+2110,
+1122,
+#BPMCHANGE 119.3
+2110,
+
+#BPMCHANGE 120
+#GOGOEND
+10110011,
+10112000,
+10222020,
+#BPMCHANGE 121.03
+20222020,
+
+#BPMCHANGE 120
+20101110,
+12101000,
+00121020,
+
+#GOGOSTART
+11101110,
+11111020,
+11101110,
+11111000,
+11101110,
+11111020,
+11101110,
+12121212,
+70000081,
+1300,
+
+#GOGOEND
+
+
+#END
+
+
+COURSE:Easy
+LEVEL:3
+BALLOON:
+SCOREINIT:660
+SCOREDIFF:270
+
+
+STYLE:Single
+
+
+#START
+
+
+#GOGOSTART
+11,
+#BPMCHANGE 119
+1110,
+#BPMCHANGE 120
+11,
+1110,
+22,
+#BPMCHANGE 120.69
+2220,
+#BPMCHANGE 119.94
+11,
+#BPMCHANGE 118.83
+#SCROLL 1.01
+1110,
+
+#BPMCHANGE 120.06
+#SCROLL 1
+#GOGOEND
+1210,
+1210,
+1210,
+1210,
+
+#BPMCHANGE 118.34
+2220,
+#BPMCHANGE 122.22
+#SCROLL 0.97
+1110,
+#BPMCHANGE 119.94
+#SCROLL 0.99
+2220,
+#SCROLL 1
+5,
+#BPMCHANGE 120.57
+000000000000000000000008000000000000000000000000,
+
+#BPMCHANGE 120
+#GOGOSTART
+11,
+1110,
+11,
+1110,
+22,
+2220,
+11,
+#BPMCHANGE 118.86
+1113,
+
+#BPMCHANGE 120.26
+#GOGOEND
+,
+12,
+
+#BPMCHANGE 120
+1120,
+2110,
+1120,
+2110,
+1,
+1120,
+12,
+22,
+
+2011,
+1011,
+1011,
+#BPMCHANGE 117.99
+200000000000500000000000000000000008000000000000,
+
+#BPMCHANGE 122.08
+#SCROLL 0.97
+#GOGOSTART
+1120,
+#BPMCHANGE 120
+#SCROLL 1
+2110,
+1120,
+#BPMCHANGE 119.3
+2110,
+
+#BPMCHANGE 120
+#GOGOEND
+1,
+1120,
+12,
+#BPMCHANGE 121.03
+22,
+
+#BPMCHANGE 120
+2011,
+1011,
+1011,
+
+#GOGOSTART
+31,
+1110,
+31,
+1110,
+42,
+2220,
+33,
+1111,
+
+500000000000000000000000000008000000000000100000,
+1300,
+
+#GOGOEND
+
+
+#END

testing/test_conversion.py

@@ -12,6 +12,7 @@ from tja2fumen.constants import COURSE_IDS, NORMALIZE_COURSE, simpleHeaders, byt
 
 
 @pytest.mark.parametrize('id_song', [
+    pytest.param('clsca'),
     pytest.param('linda'),
     pytest.param('senpac'),
     pytest.param('butou5'),