libcore: File index and config profiles are indexed case-insensitively

skyjake · Sep 1, 2019 · b634c78 · b634c78
1 parent c08986d
commit b634c78
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 26 deletions.
diff --git a/doomsday/libs/core/include/de/data/cstring.h b/doomsday/libs/core/include/de/data/cstring.h
@@ -78,6 +78,7 @@ class DE_PUBLIC CString
     Char first() const { return *mb_iterator(begin()); }
     String lower() const;
     String upper() const;
+    std::string toStdString() const { return {begin(), end()}; }
 
     static size_t npos;
 

diff --git a/doomsday/libs/core/include/de/data/profiles.h b/doomsday/libs/core/include/de/data/profiles.h
@@ -142,7 +142,7 @@ class DE_PUBLIC Profiles
      */
     StringList profiles() const;
 
-    LoopResult forAll(std::function<LoopResult (AbstractProfile &)> func) const;
+    LoopResult forAll(const std::function<LoopResult (AbstractProfile &)>& func) const;
 
     /**
      * Returns the total number of profiles.

diff --git a/doomsday/libs/core/include/de/filesys/fileindex.h b/doomsday/libs/core/include/de/filesys/fileindex.h
@@ -39,7 +39,7 @@ class Package;
 class DE_PUBLIC FileIndex
 {
 public:
-    typedef std::multimap<String, File *> Index;
+    typedef std::multimap<String, File *, String::InsensitiveLessThan> Index;
     typedef std::pair<Index::iterator, Index::iterator> IndexRange;
     typedef std::list<File *> FoundFiles;
 

diff --git a/doomsday/libs/core/src/data/profiles.cpp b/doomsday/libs/core/src/data/profiles.cpp
@@ -24,15 +24,10 @@
 
 namespace de {
 
-static String nameToKey(const String &name)
-{
-    return name.lower();
-}
-
 DE_PIMPL(Profiles)
 , DE_OBSERVES(Deletable, Deletion)
 {
-    typedef Map<String, AbstractProfile *> Profiles;
+    typedef Map<String, AbstractProfile *, String::InsensitiveLessThan> Profiles;
     Profiles profiles;
     String persistentName;
 
@@ -46,8 +41,8 @@ DE_PIMPL(Profiles)
 
     void add(AbstractProfile *profile)
     {
-        String const key = nameToKey(profile->name());
-        if (profiles.contains(nameToKey(key)))
+        String const key = profile->name();
+        if (profiles.contains(key))
         {
             delete profiles[key];
         }
@@ -65,7 +60,7 @@ DE_PIMPL(Profiles)
     {
         profile.audienceForDeletion -= this;
         profile.setOwner(nullptr);
-        profiles.remove(nameToKey(profile.name()));
+        profiles.remove(profile.name());
 
         DE_FOR_PUBLIC_AUDIENCE2(Removal, i)
         {
@@ -75,20 +70,18 @@ DE_PIMPL(Profiles)
 
     void changeLookupKey(AbstractProfile const &profile, String const &newName)
     {
-        profiles.remove(nameToKey(profile.name()));
-        profiles.insert(nameToKey(newName), const_cast<AbstractProfile *>(&profile));
+        profiles.remove(profile.name());
+        profiles.insert(newName, const_cast<AbstractProfile *>(&profile));
     }
 
     void objectWasDeleted(Deletable *obj)
     {
         // At this point the AbstractProfile itself is already deleted.
-        MutableMapIterator<String, AbstractProfile *> iter(profiles);
-        while (iter.hasNext())
+        for (auto i = profiles.begin(); i != profiles.end(); ++i)
         {
-            iter.next();
-            if (iter.value() == obj)
+            if (i->second == obj)
             {
-                iter.remove();
+                profiles.erase(i);
                 break;
             }
         }
@@ -182,7 +175,7 @@ int Profiles::count() const
 
 Profiles::AbstractProfile *Profiles::tryFind(String const &name) const
 {
-    auto found = d->profiles.find(nameToKey(name));
+    auto found = d->profiles.find(name);
     if (found != d->profiles.end())
     {
         return found->second;
@@ -214,7 +207,7 @@ bool Profiles::isPersistent() const
     return !d->persistentName.isEmpty();
 }
 
-LoopResult Profiles::forAll(std::function<LoopResult (AbstractProfile &)> func) const
+LoopResult Profiles::forAll(const std::function<LoopResult (AbstractProfile &)>& func) const
 {
     for (const auto &prof : d->profiles)
     {
@@ -271,9 +264,9 @@ void Profiles::serialize() const
 
         os << "\nprofile {\n"
               "    name: " << prof->name().c_str() << "\n";
-        for (auto line : prof->toInfoSource().split('\n'))
+        for (const auto &line : prof->toInfoSource().splitRef('\n'))
         {
-            os << "    " << line.c_str() << "\n";
+            os << "    " << line.toStdString() << "\n";
         }
         os << "}\n";
         ++count;

diff --git a/doomsday/libs/core/src/filesys/fileindex.cpp b/doomsday/libs/core/src/filesys/fileindex.cpp
@@ -40,10 +40,10 @@ DE_PIMPL(FileIndex), public Lockable
 
     static String indexedName(File const &file)
     {
-        String name = file.name().lower();
+        String name = file.name();
 
         // Ignore the package version in the indexed names.
-        if (name.endsWith(".pack"))
+        if (name.endsWith(".pack", CaseInsensitive))
         {
             name = Package::split(name.fileNameWithoutExtension()).first + ".pack";
         }
@@ -83,8 +83,8 @@ DE_PIMPL(FileIndex), public Lockable
 
     void findPartialPath(const String &path, FoundFiles &found) const
     {
-        String baseName = path.fileName().lower();
-        String dir      = path.fileNamePath().lower();
+        String baseName = path.fileName();
+        String dir      = path.fileNamePath();
 
         if (!dir.empty() && !dir.beginsWith("/"))
         {