Fix #47, change Union::String::IsMatchesMask into a proper std::regex (…

…#50) * Fix #47, change Union::String::IsMatchesMask into a proper std::regex * Add const-qualifiers to TransitionInfo.cpp
Silver-Ore-Team · Oct 19, 2024 · f9e3183 · f9e3183
1 parent 38da23f
commit f9e3183
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 9 deletions.
diff --git a/src/NH/Bass/TransitionInfo.cpp b/src/NH/Bass/TransitionInfo.cpp
@@ -5,15 +5,26 @@
 #include <NH/Bass/MusicTheme.h>
 
 #include <utility>
+#include <regex>
 
 namespace NH::Bass
 {
     const Transition& TransitionInfo::GetTransition(const std::string& targetTheme) const
     {
         for (const auto& [key, transition]: m_FilteredTransitions)
         {
-            String regex = String(key.c_str()).Replace(",", "|").Replace(" ", "\\s*").Replace("*", ".*");;
-            if (regex.IsMatchesMask(targetTheme.c_str()))
+            String regexString = String(key.c_str())
+                // interpret comma as an OR operator, "THEME_1,THEME_2" -> "THEME_1|THEME_2"
+                .Replace(",", "|")
+                // interpret a space as zero or more whitespace characters
+                .Replace(" ", "\\s*")
+                // nasty hack to avoid replacement of .* -> ..* by the next step
+                .Replace(".*", "*")
+                // interpret wildcard (*) as any match (.*) in the regex syntax
+                .Replace("*", ".*");
+
+            const std::regex regex(regexString);
+            if (std::smatch match; std::regex_match(targetTheme, match, regex))
             {
                 return transition;
             }
@@ -26,7 +37,7 @@ namespace NH::Bass
         return m_DefaultTransition;
     }
 
-    void TransitionInfo::AddTransitionEffect(TransitionEffect effect, double duration, const std::string& filter)
+    void TransitionInfo::AddTransitionEffect(const TransitionEffect effect, const double duration, const std::string& filter)
     {
         Transition* transition = filter.empty() ? &m_DefaultTransition : GetFilteredTransition(filter);
         transition->Effect = effect;
@@ -35,7 +46,7 @@ namespace NH::Bass
 
     void TransitionInfo::AddMidiFile(const MidiFile& file, const std::string& filter)
     {
-        Transition* transition = filter == "" ? &m_DefaultTransition : GetFilteredTransition(filter);
+        Transition* transition = filter.empty() ? &m_DefaultTransition : GetFilteredTransition(filter);
         Transition::TimePoint timePoint{-1};
         for (const auto& [key, start, end] : file.GetTones())
         {
@@ -58,18 +69,18 @@ namespace NH::Bass
 
     void TransitionInfo::AddTimePoint(const Transition::TimePoint& timePoint, const std::string& filter)
     {
-        Transition* transition = filter == "" ? &m_DefaultTransition : GetFilteredTransition(filter);
+        Transition* transition = filter.empty() ? &m_DefaultTransition : GetFilteredTransition(filter);
         transition->TimePoints.push_back(timePoint);
     }
 
     void TransitionInfo::AddJingle(std::shared_ptr<AudioFile> jingle, const double delay, const std::string& filter)
     {
-        Transition* transition = filter == "" ? &m_DefaultTransition : GetFilteredTransition(filter);
+        Transition* transition = filter.empty() ? &m_DefaultTransition : GetFilteredTransition(filter);
         transition->Jingle = std::move(jingle);
         transition->JingleDelay = delay;
     }
 
-    Transition* TransitionInfo::GetFilteredTransition(std::string filter)
+    Transition* TransitionInfo::GetFilteredTransition(const std::string& filter)
     {
         if (!m_FilteredTransitions.contains(filter))
         {

diff --git a/src/NH/Bass/TransitionInfo.h b/src/NH/Bass/TransitionInfo.h
@@ -27,10 +27,10 @@ namespace NH::Bass
 
         [[nodiscard]] const Transition& GetTransition(const std::string& targetTheme) const;
         [[nodiscard]] const Transition& GetDefaultTransition() const;
-        [[nodiscard]] std::string GetSourceTheme() const { return m_SourceTheme; }
+        [[nodiscard]] const std::string& GetSourceTheme() const { return m_SourceTheme; }
 
     private:
-        Transition* GetFilteredTransition(std::string filter);
+        Transition* GetFilteredTransition(const std::string& filter);
     };
 
 }