Changed library construction to use iequals instead of imatch for art…

…ist and album comparisons
boysetsfrog · Dec 18, 2013 · b0d2bdc · b0d2bdc
1 parent 59ca061
commit b0d2bdc
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 6 deletions.
diff --git a/src/algorithm.cpp b/src/algorithm.cpp
@@ -87,6 +87,19 @@ bool Algorithm::iequals(std::string const & s1, std::string const & s2)
 	return (strcasecmp(s1.c_str(), s2.c_str()) == 0);
 }
 
+bool Algorithm::iequals(std::string const & s1, std::string const & s2, bool ignoreLeadingThe, bool caseInsensitive)
+{
+	std::string lower1(PrepString(s1, ignoreLeadingThe));
+	std::string lower2(PrepString(s2, ignoreLeadingThe));
+
+   if (caseInsensitive == true)
+   {
+      return (strcasecmp(lower1.c_str(), lower2.c_str()) == 0);
+   }
+
+   return (lower1 == lower2);
+}
+
 bool Algorithm::isNumeric(std::string const & s1)
 {
 	for (unsigned int i = 0; i < s1.size(); ++i)

diff --git a/src/algorithm.hpp b/src/algorithm.hpp
@@ -36,6 +36,7 @@ namespace Algorithm
    bool icompare(std::string const & s1, std::string const & s2, bool ignoreLeadingThe = false, bool caseInsensitive = true);
    bool imatch(std::string const & s1, std::string const & s2, bool ignoreLeadingThe, bool caseInsensitive);
    bool iequals(std::string const & s1, std::string const & s2);
+   bool iequals(std::string const & s1, std::string const & s2, bool ignoreLeadingThe, bool caseInsensitive);
 
    bool isNumeric(std::string const & s1);
 }

diff --git a/src/buffer/library.cpp b/src/buffer/library.cpp
@@ -44,9 +44,9 @@ Library::Library() :
    AddCallback(Main::Buffer_Remove, [this] (LibraryEntry * const entry) { CheckIfVariousRemoved(entry); });
 
    Main::Vimpc::EventHandler(Event::AllMetaDataReady, [this] (EventData const & Data) { Sort(); });
-   
-   settings_.RegisterCallback(Setting::AlbumArtist, [this] (bool Value) 
-   { 
+
+   settings_.RegisterCallback(Setting::AlbumArtist, [this] (bool Value)
+   {
       // Clear the cached format prints for every song
       for (auto song : uriMap_)
       {
@@ -133,7 +133,7 @@ void Library::Add(Mpc::Song * song)
    CreateVariousArtist();
 
    if ((lastAlbumEntry_ == NULL) ||
-       (Algorithm::imatch(lastAlbumEntry_->album_, album,
+       (Algorithm::iequals(lastAlbumEntry_->album_, album,
                           settings_.Get(Setting::IgnoreTheGroup), true) == false))
    {
       lastAlbumEntry_  = NULL;
@@ -148,7 +148,7 @@ void Library::Add(Mpc::Song * song)
          for (i = 0;
               ((i < Size()) &&
                ((Get(i)->type_ != Mpc::ArtistType) ||
-                (Algorithm::imatch(Get(i)->artist_, artist,
+                (Algorithm::iequals(Get(i)->artist_, artist,
                                    settings_.Get(Setting::IgnoreTheGroup), true) == false)));
                ++i);
 
@@ -184,7 +184,7 @@ void Library::Add(Mpc::Song * song)
        (lastArtistEntry_ != variousArtist_) &&
        (lastArtistEntry_->children_.back() == lastAlbumEntry_) &&
        (Algorithm::iequals(lastAlbumEntry_->album_, album)  == true) &&
-       (Algorithm::imatch(lastArtistEntry_->artist_, artist,
+       (Algorithm::iequals(lastArtistEntry_->artist_, artist,
            settings_.Get(Setting::IgnoreTheGroup), true) == false))
    {
       lastArtistEntry_->children_.pop_back();