some optimizations to avoid case conversions and memory allocations

2 files changed, 5 insertions, 3 deletions

diff --git a/src/shared/directoryentry.cpp b/src/shared/directoryentry.cpp
index 146662ad..c6b29fbb 100644
--- a/src/shared/directoryentry.cpp
+++ b/src/shared/directoryentry.cpp
@@ -875,9 +875,11 @@ DirectoryEntry *DirectoryEntry::findSubDirectoryRecursive(const std::wstring &pa
 }

 

 

-const FileEntry::Ptr DirectoryEntry::findFile(const std::wstring &name) const

+const FileEntry::Ptr DirectoryEntry::findFile(

+  const std::wstring &name, bool alreadyLowerCase) const

 {

-  auto iter = m_Files.find(ToLower(name));

+  auto iter = m_Files.find(alreadyLowerCase ? name : ToLower(name));

+

   if (iter != m_Files.end()) {

     return m_FileRegister->getFile(iter->second);

   } else {

diff --git a/src/shared/directoryentry.h b/src/shared/directoryentry.h
index 52265583..d33b495a 100644
--- a/src/shared/directoryentry.h
+++ b/src/shared/directoryentry.h
@@ -278,7 +278,7 @@ public:
     * @param name name of the file

     * @return fileentry object for the file or nullptr if no file matches

     */

-  const FileEntry::Ptr findFile(const std::wstring &name) const;

+  const FileEntry::Ptr findFile(const std::wstring &name, bool alreadyLowerCase=false) const;

   bool hasFile(const std::wstring& name) const;

 

   bool containsArchive(std::wstring archiveName);