From d55cb68eb690b8e3dfc6506a3b5673b3bf4852fe Mon Sep 17 00:00:00 2001 From: Kiryl Kaveryn Date: Fri, 27 Dec 2024 14:30:36 +0400 Subject: [PATCH] [map] save the file name into the `LastEditedBookmarkCategory` setting instead of the absolute file path Signed-off-by: Kiryl Kaveryn --- base/base_tests/file_name_utils_tests.cpp | 12 +++++++++++ map/bookmark.cpp | 6 ++++++ map/bookmark.hpp | 1 + map/bookmark_manager.cpp | 25 +++++++++++++---------- map/bookmark_manager.hpp | 2 +- 5 files changed, 34 insertions(+), 12 deletions(-) diff --git a/base/base_tests/file_name_utils_tests.cpp b/base/base_tests/file_name_utils_tests.cpp index 9fafc175ab..2654231e07 100644 --- a/base/base_tests/file_name_utils_tests.cpp +++ b/base/base_tests/file_name_utils_tests.cpp @@ -7,32 +7,44 @@ UNIT_TEST(FileName_Smoke) { std::string name = "/Users/xxx/Documents/test.test"; + TEST_EQUAL(base::FileNameFromFullPath(name), "test.test", ()); TEST_EQUAL(base::GetFileExtension(name), ".test", ()); base::GetNameFromFullPath(name); TEST_EQUAL(name, "test.test", ()); base::GetNameFromFullPath(name); TEST_EQUAL(name, "test.test", ()); + TEST_EQUAL(base::FileNameFromFullPath(name), "test.test", ()); base::GetNameWithoutExt(name); TEST_EQUAL(name, "test", ()); name = "C:\\My Documents\\test.test"; + TEST_EQUAL(base::FileNameFromFullPath(name), "test.test", ()); TEST_EQUAL(base::GetFileExtension(name), ".test", ()); base::GetNameFromFullPath(name); TEST_EQUAL(name, "test.test", ()); base::GetNameWithoutExt(name); TEST_EQUAL(name, "test", ()); + name = ""; + TEST_EQUAL(base::FileNameFromFullPath(name), "", ()); + TEST_EQUAL(base::GetFileExtension(name), std::string(), ()); + base::GetNameFromFullPath(name); + TEST(name.empty(), ()); + name = "/"; + TEST_EQUAL(base::FileNameFromFullPath(name), "", ()); TEST_EQUAL(base::GetFileExtension(name), std::string(), ()); base::GetNameFromFullPath(name); TEST(name.empty(), ()); name = "C:\\"; + TEST_EQUAL(base::FileNameFromFullPath(name), "", ()); TEST_EQUAL(base::GetFileExtension(name), std::string(), ()); base::GetNameFromFullPath(name); TEST(name.empty(), ()); name = "../test"; + TEST_EQUAL(base::FileNameFromFullPath(name), "test", ()); TEST_EQUAL(base::GetFileExtension(name), std::string(), ()); base::GetNameFromFullPath(name); TEST_EQUAL(name, "test", ()); diff --git a/map/bookmark.cpp b/map/bookmark.cpp index 18f84303ba..aba4772df6 100644 --- a/map/bookmark.cpp +++ b/map/bookmark.cpp @@ -3,6 +3,7 @@ #include "indexer/scales.hpp" +#include "base/file_name_utils.hpp" #include "base/string_utils.hpp" #include @@ -374,6 +375,11 @@ std::string BookmarkCategory::GetName() const return GetPreferredBookmarkStr(m_data.m_name); } +std::string BookmarkCategory::GetFileNameWithoutPath() const +{ + return base::FileNameFromFullPath(m_file); +} + bool BookmarkCategory::HasElevationProfile() const { auto const it = m_data.m_properties.find(kHasElevationProfileProperty); diff --git a/map/bookmark.hpp b/map/bookmark.hpp index a3eb74d021..72be843612 100644 --- a/map/bookmark.hpp +++ b/map/bookmark.hpp @@ -100,6 +100,7 @@ public: void SetFileName(std::string const & fileName) { m_file = fileName; } std::string GetName() const; std::string const & GetFileName() const { return m_file; } + std::string GetFileNameWithoutPath() const; void EnableAutoSave(bool enable) { m_autoSave = enable; } bool IsAutoSaveEnabled() const { return m_autoSave; } diff --git a/map/bookmark_manager.cpp b/map/bookmark_manager.cpp index 9f2a50836d..b18aea122a 100644 --- a/map/bookmark_manager.cpp +++ b/map/bookmark_manager.cpp @@ -1921,13 +1921,17 @@ Track * BookmarkManager::AddTrack(std::unique_ptr && track) void BookmarkManager::SaveState() const { - settings::Set(kLastEditedBookmarkCategory, m_lastCategoryUrl); + settings::Set(kLastEditedBookmarkCategory, m_lastCategoryFile); settings::Set(kLastEditedBookmarkColor, static_cast(m_lastColor)); } void BookmarkManager::LoadState() { - settings::TryGet(kLastEditedBookmarkCategory, m_lastCategoryUrl); + settings::TryGet(kLastEditedBookmarkCategory, m_lastCategoryFile); + + // Migration to fix a bug with unique full paths for each Testflight installation. + if (auto const slashPath = m_lastCategoryFile.find_last_of('/'); slashPath != std::string::npos) + m_lastCategoryFile = base::FileNameFromFullPath(m_lastCategoryFile); uint32_t color; if (settings::Get(kLastEditedBookmarkColor, color) && @@ -2317,14 +2321,10 @@ kml::MarkGroupId BookmarkManager::LastEditedBMCategory() if (HasBmCategory(m_lastEditedGroupId)) return m_lastEditedGroupId; - for (auto & cat : m_categories) - { - if (cat.second->GetFileName() == m_lastCategoryUrl) - { - m_lastEditedGroupId = cat.first; - return m_lastEditedGroupId; - } - } + for (auto const & [groupId, category] : m_categories) + if (category->GetFileNameWithoutPath() == m_lastCategoryFile) + return m_lastEditedGroupId = groupId; + m_lastEditedGroupId = CheckAndCreateDefaultCategory(); return m_lastEditedGroupId; } @@ -2337,8 +2337,11 @@ kml::PredefinedColor BookmarkManager::LastEditedBMColor() const void BookmarkManager::SetLastEditedBmCategory(kml::MarkGroupId groupId) { + if (m_lastEditedGroupId == groupId) + return; + m_lastEditedGroupId = groupId; - m_lastCategoryUrl = GetBmCategory(groupId)->GetFileName(); + m_lastCategoryFile = GetBmCategory(groupId)->GetFileNameWithoutPath(); SaveState(); } diff --git a/map/bookmark_manager.hpp b/map/bookmark_manager.hpp index 4847f69eee..d85477bc8c 100644 --- a/map/bookmark_manager.hpp +++ b/map/bookmark_manager.hpp @@ -764,7 +764,7 @@ private: CategoriesCollection m_categories; kml::GroupIdCollection m_unsortedBmGroupsIdList; - std::string m_lastCategoryUrl; + std::string m_lastCategoryFile; kml::MarkGroupId m_lastEditedGroupId = kml::kInvalidMarkGroupId; kml::PredefinedColor m_lastColor = kml::PredefinedColor::Red; UserMarkLayers m_userMarkLayers; -- 2.45.3