Split parse method logic into two methods.

Author: neogeek

includes/RhythmGameUtilities/Parsers.hpp

@@ -99,97 +99,137 @@ std::vector<ChartSection> ParseSectionsFromChart(const char *contents)
     return sections;
 }
 
-std::map<int, int>
-ParseTimeSignaturesFromChartSections(std::vector<ChartSection> sections)
+std::map<int, int> ParseTimeSignaturesFromChartSection(ChartSection section)
 {
     auto timeSignatures = std::map<int, int>();
 
-    for (auto &section : sections)
+    if (section.name == ToString(NamedSection::SyncTrack))
     {
-        if (section.name == ToString(NamedSection::SyncTrack))
+        for (auto &line : section.lines)
         {
-            for (auto &line : section.lines)
+            if (line.second.front() == ToString(TypeCode::TimeSignatureMarker))
             {
-                if (line.second.front() ==
-                    ToString(TypeCode::TimeSignatureMarker))
-                {
-                    timeSignatures.insert(
-                        {std::stoi(line.first), std::stoi(line.second.at(1))});
-                }
+                timeSignatures.insert(
+                    {std::stoi(line.first), std::stoi(line.second.at(1))});
             }
         }
     }
 
     return timeSignatures;
 }
 
-std::map<int, int> ParseBpmFromChartSections(std::vector<ChartSection> sections)
+std::map<int, int>
+ParseTimeSignaturesFromChartSections(std::vector<ChartSection> sections)
+{
+    for (auto &section : sections)
+    {
+        if (section.name == ToString(NamedSection::SyncTrack))
+        {
+            return ParseTimeSignaturesFromChartSection(section);
+        }
+    }
+
+    return std::map<int, int>();
+}
+
+std::map<int, int> ParseBpmFromChartSection(ChartSection section)
 {
     auto bpm = std::map<int, int>();
 
+    if (section.name == ToString(NamedSection::SyncTrack))
+    {
+        for (auto &line : section.lines)
+        {
+            if (line.second.front() == ToString(TypeCode::BPM_Marker))
+            {
+                bpm.insert(
+                    {std::stoi(line.first), std::stoi(line.second.at(1))});
+            }
+        }
+    }
+
+    return bpm;
+}
+
+std::map<int, int> ParseBpmFromChartSections(std::vector<ChartSection> sections)
+{
     for (auto &section : sections)
     {
         if (section.name == ToString(NamedSection::SyncTrack))
         {
-            for (auto &line : section.lines)
+            return ParseBpmFromChartSection(section);
+        }
+    }
+
+    return std::map<int, int>();
+}
+
+std::vector<Note> ParseNotesFromChartSection(ChartSection section,
+                                             Difficulty difficulty)
+{
+    auto notes = std::vector<Note>();
+
+    if (section.name == ToString(difficulty) + "Single")
+    {
+        for (auto &line : section.lines)
+        {
+            if (line.second.front() == ToString(TypeCode::NoteMarker))
             {
-                if (line.second.front() == ToString(TypeCode::BPM_Marker))
-                {
-                    bpm.insert(
-                        {std::stoi(line.first), std::stoi(line.second.at(1))});
-                }
+                notes.push_back({std::stoi(line.first),
+                                 std::stoi(line.second.at(1)),
+                                 std::stoi(line.second.at(2))});
             }
         }
     }
 
-    return bpm;
+    return notes;
 }
 
 std::vector<Note>
 ParseNotesFromChartSections(std::vector<ChartSection> sections,
                             Difficulty difficulty)
 {
-    auto notes = std::vector<Note>();
-
     for (auto &section : sections)
     {
         if (section.name == ToString(difficulty) + "Single")
         {
-            for (auto &line : section.lines)
+            return ParseNotesFromChartSection(section, difficulty);
+        }
+    }
+
+    return std::vector<Note>();
+}
+
+std::map<int, std::string> ParseLyricsFromChartSection(ChartSection section)
+{
+    auto lyrics = std::map<int, std::string>();
+
+    if (section.name == ToString(NamedSection::Events))
+    {
+        for (auto &line : section.lines)
+        {
+            if (line.second.back().rfind("lyric", 0) == 0)
             {
-                if (line.second.front() == ToString(TypeCode::NoteMarker))
-                {
-                    notes.push_back({std::stoi(line.first),
-                                     std::stoi(line.second.at(1)),
-                                     std::stoi(line.second.at(2))});
-                }
+                lyrics.insert({std::stoi(line.first), line.second.at(1)});
             }
         }
     }
 
-    return notes;
+    return lyrics;
 }
 
 std::map<int, std::string>
 ParseLyricsFromChartSections(std::vector<ChartSection> sections)
 {
-    auto lyrics = std::map<int, std::string>();
-
     for (auto &section : sections)
     {
         if (section.name == ToString(NamedSection::Events))
         {
-            for (auto &line : section.lines)
-            {
-                if (line.second.back().rfind("lyric", 0) == 0)
-                {
-                    lyrics.insert({std::stoi(line.first), line.second.at(1)});
-                }
-            }
+            return ParseLyricsFromChartSection(section);
         }
     }
 
-    return lyrics;
+    return std::map<int, std::string>();
 }
 
 } // namespace RhythmGameUtilities