Renamed methods.

Split out logic into single use utility methods.

Author: neogeek

includes/RhythmGameUtilities/Parsers.hpp

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

tests/RhythmGameUtilities/Parsers.cpp

@@ -104,44 +104,44 @@ void testParseValuesFromChartSections()
     std::cout << ".";
 }
 
-void testParseTimeSignaturesFromChartSection()
+void testParseTimeSignaturesFromChartSections()
 {
     auto sections = ParseSectionsFromChart(contents);
 
-    auto lines = ParseTimeSignaturesFromChartSection(sections);
+    auto lines = ParseTimeSignaturesFromChartSections(sections);
 
     assert(lines.size() == 4);
 
     std::cout << ".";
 }
 
-void testParseBpmFromChartSection()
+void testParseBpmFromChartSections()
 {
     auto sections = ParseSectionsFromChart(contents);
 
-    auto lines = ParseBpmFromChartSection(sections);
+    auto lines = ParseBpmFromChartSections(sections);
 
     assert(lines.size() == 7);
 
     std::cout << ".";
 }
 
-void testParseNotesFromChartSection()
+void testParseNotesFromChartSections()
 {
     auto sections = ParseSectionsFromChart(contents);
 
-    auto lines = ParseNotesFromChartSection(sections, Difficulty::Expert);
+    auto lines = ParseNotesFromChartSections(sections, Difficulty::Expert);
 
     assert(lines.size() == 8);
 
     std::cout << ".";
 }
 
-void testParseLyricsFromChartSection()
+void testParseLyricsFromChartSections()
 {
     auto sections = ParseSectionsFromChart(contents);
 
-    auto lines = ParseLyricsFromChartSection(sections);
+    auto lines = ParseLyricsFromChartSections(sections);
 
     assert(lines.size() == 12);
 
@@ -153,10 +153,10 @@ int main()
     testParseSectionsFromChart();
     testParseValuesFromChartSections();
 
-    testParseTimeSignaturesFromChartSection();
-    testParseBpmFromChartSection();
-    testParseNotesFromChartSection();
-    testParseLyricsFromChartSection();
+    testParseTimeSignaturesFromChartSections();
+    testParseBpmFromChartSections();
+    testParseNotesFromChartSections();
+    testParseLyricsFromChartSections();
 
     return 0;
 }