Added find by the correct sort method

Author: usidedown

src/fheroes2/dialog/dialog_selectfile.cpp

@@ -31,6 +31,7 @@
 #include <memory>
 #include <sstream>
 #include <string>
+#include <tuple>
 #include <utility>
 #include <vector>
 
@@ -115,6 +116,26 @@ namespace
         textInput.drawInRoi( field.x + 4 + ( maxFileNameWidth - textInput.width() ) / 2, field.y + 4, output, field );
     }
 
+    struct CompareByTimestamp
+    {
+        bool operator()( const Maps::FileInfo & info, uint32_t timestamp ) const
+        {
+            return info.timestamp > timestamp;
+        }
+        bool operator()( uint32_t timestamp, const Maps::FileInfo & info ) const
+        {
+            return timestamp > info.timestamp;
+        }
+    };
+
+    struct CompareByFilename
+    {
+        bool operator()( const Maps::FileInfo & info, const std::string & filename ) const
+        {
+            return Maps::CaseInsensitiveCompare( info.filename, filename );
+        }
+    };
+
     class FileInfoListBox : public Interface::ListBox<Maps::FileInfo>
     {
     public:
@@ -341,16 +362,16 @@ namespace
         if ( !lastfile.empty() ) {
             filename = System::GetStem( lastfile );
             charInsertPos = filename.size();
-
-            MapsFileInfoList::iterator it = lists.begin();
-            for ( ; it != lists.end(); ++it ) {
-                if ( it->filename == lastfile ) {
-                    break;
-                }
+            MapsFileInfoList::const_iterator it;
+            if ( settings.GetSaveFileSortingMethod() == SaveFileSortingMethod::FILENAME ) {
+                it = std::lower_bound( lists.cbegin(), lists.cend(), lastfile, CompareByFilename() );
+            }
+            else {
+                it = std::find_if( it, lists.cend(), [&lastfile]( const Maps::FileInfo & info ) { return info.filename == lastfile; } );
             }
 
-            if ( it != lists.end() ) {
-                listbox.SetCurrent( std::distance( lists.begin(), it ) );
+            if ( it != lists.cend() ) {
+                listbox.SetCurrent( std::distance( lists.cbegin(), it ) );
             }
             else {
                 if ( !isEditing ) {
@@ -485,22 +506,32 @@ namespace
             }
             else if ( le.MouseClickLeft( buttonSort.area() ) ) {
                 const int currentId = listbox.getCurrentId();
+                std::string lastChoice{};
+                uint32_t lastChoiceTimestamp{};
+                if ( currentId >= 0 && static_cast<size_t>( currentId ) < lists.size() ) {
+                    lastChoice = lists[currentId].filename;
+                    lastChoiceTimestamp = lists[currentId].timestamp;
+                }
 
                 settings.changeSaveFileSortingMethod();
                 sortMapInfos( lists );
                 listUpdated = true;
 
                 // re-select the last selected file if any, unless we're typing in the list box
-                if ( !filename.empty() && !isListboxSelected ) {
-                    const std::string lastChoice = System::concatPath( Game::GetSaveDir(), filename + Game::GetSaveFileExtension() );
-
+                if ( !lastChoice.empty() ) {
                     MapsFileInfoList::const_iterator it = lists.cbegin();
-                    for ( ; it != lists.end(); ++it ) {
-                        if ( it->filename == lastChoice ) {
-                            break;
-                        }
+                    MapsFileInfoList::const_iterator end = lists.cend();
+                    const SaveFileSortingMethod sortingMethod = settings.GetSaveFileSortingMethod();
+
+                    if ( sortingMethod == SaveFileSortingMethod::TIMESTAMP ) {
+                        std::tie( it, end ) = std::equal_range( lists.cbegin(), lists.cend(), lastChoiceTimestamp, CompareByTimestamp() );
+                        it = std::find_if( it, end, [&lastChoice]( const Maps::FileInfo & info ) { return info.filename == lastChoice; } );
                     }
-                    if ( it != lists.cend() ) {
+                    else {
+                        it = std::lower_bound( lists.cbegin(), lists.cend(), lastChoice, CompareByFilename() );
+                    }
+
+                    if ( it != end ) {
                         const int newId = static_cast<int>( std::distance( lists.cbegin(), it ) );
                         if ( newId != currentId ) {
                             listbox.SetCurrent( newId );

src/fheroes2/maps/maps_fileinfo.cpp

@@ -28,7 +28,6 @@
 #include <cstring>
 #include <functional>
 #include <list>
-#include <locale>
 #include <map>
 #include <sstream>
 #include <type_traits>
@@ -59,32 +58,6 @@ namespace
     const size_t mapNameLength = 16;
     const size_t mapDescriptionLength = 200;
 
-    template <typename CharType>
-    bool CaseInsensitiveCompare( const std::basic_string<CharType> & lhs, const std::basic_string<CharType> & rhs )
-    {
-        typename std::basic_string<CharType>::const_iterator li = lhs.begin();
-        typename std::basic_string<CharType>::const_iterator ri = rhs.begin();
-
-        while ( li != lhs.end() && ri != rhs.end() ) {
-            const CharType lc = std::tolower( *li, std::locale() );
-            const CharType rc = std::tolower( *ri, std::locale() );
-
-            ++li;
-            ++ri;
-
-            if ( lc < rc ) {
-                return true;
-            }
-            if ( lc > rc ) {
-                return false;
-            }
-            // the chars are "equal", so proceed to check the next pair
-        }
-
-        // we came to the end of either (or both) strings, left is "smaller" if it was shorter:
-        return li == lhs.end() && ri != rhs.end();
-    }
-
     // This function returns an unsorted array. It is a caller responsibility to take care of sorting if needed.
     MapsFileInfoList getValidMaps( const ListFiles & mapFiles, const uint8_t humanPlayerCount, const bool isForEditor, const bool isOriginalMapFormat )
     {

src/fheroes2/maps/maps_fileinfo.h

@@ -26,6 +26,7 @@
 #include <algorithm>
 #include <array>
 #include <cstdint>
+#include <locale>
 #include <optional>
 #include <string>
 #include <type_traits>
@@ -234,6 +235,32 @@ namespace Maps
 
     OStreamBase & operator<<( OStreamBase & stream, const FileInfo & fi );
     IStreamBase & operator>>( IStreamBase & stream, FileInfo & fi );
+
+    template <typename CharType>
+    bool CaseInsensitiveCompare( const std::basic_string<CharType> & lhs, const std::basic_string<CharType> & rhs )
+    {
+        typename std::basic_string<CharType>::const_iterator li = lhs.begin();
+        typename std::basic_string<CharType>::const_iterator ri = rhs.begin();
+
+        while ( li != lhs.end() && ri != rhs.end() ) {
+            const CharType lc = std::tolower( *li, std::locale() );
+            const CharType rc = std::tolower( *ri, std::locale() );
+
+            ++li;
+            ++ri;
+
+            if ( lc < rc ) {
+                return true;
+            }
+            if ( lc > rc ) {
+                return false;
+            }
+            // the chars are "equal", so proceed to check the next pair
+        }
+
+        // we came to the end of either (or both) strings, left is "smaller" if it was shorter:
+        return li == lhs.end() && ri != rhs.end();
+    }
 }
 
 using MapsFileInfoList = std::vector<Maps::FileInfo>;