From 6eea8520124867913808d5991d94c4d299534dd0 Mon Sep 17 00:00:00 2001 From: Viktor Govako Date: Fri, 26 Aug 2022 12:15:37 +0300 Subject: [PATCH] [storage] Print found MWM file size. Signed-off-by: Viktor Govako --- storage/storage.cpp | 105 ++++++++++-------------- storage/storage.hpp | 26 +++--- storage/storage_tests/storage_tests.cpp | 2 +- 3 files changed, 56 insertions(+), 77 deletions(-) diff --git a/storage/storage.cpp b/storage/storage.cpp index 5e7e1db8c4..f5e14dc9cd 100644 --- a/storage/storage.cpp +++ b/storage/storage.cpp @@ -2,7 +2,7 @@ #include "storage/country_tree_helpers.hpp" #include "storage/diff_scheme/apply_diff.hpp" -#include "storage/diff_scheme/diff_scheme_loader.hpp" +//#include "storage/diff_scheme/diff_scheme_loader.hpp" #include "storage/downloader.hpp" #include "storage/map_files_downloader.hpp" #include "storage/storage_helpers.hpp" @@ -21,9 +21,7 @@ #include "base/exception.hpp" #include "base/file_name_utils.hpp" -#include "base/gmtime.hpp" #include "base/logging.hpp" -#include "base/scope_guard.hpp" #include "base/stl_helpers.hpp" #include "base/string_utils.hpp" @@ -315,16 +313,7 @@ void Storage::RegisterAllLocalMaps(bool enableDiffs /* = false */) ++j; } - LocalCountryFile const & localFile = *i; - string const & name = localFile.GetCountryName(); - CountryId const countryId = FindCountryIdByFile(name); - if (IsLeaf(countryId)) - RegisterCountryFiles(countryId, localFile); - else - RegisterFakeCountryFiles(localFile); // Also called for Worlds from resources. - - LOG(LINFO, ("Found file:", name, "in directory:", localFile.GetDirectory())); - + RegisterLocalFile(*i); i = j; } @@ -418,7 +407,7 @@ LocalFilePtr Storage::GetLatestLocalFile(CountryFile const & countryFile) const { CHECK_THREAD_CHECKER(m_threadChecker, ()); - CountryId const countryId = FindCountryIdByFile(countryFile.GetName()); + CountryId const & countryId = FindCountryIdByFile(countryFile.GetName()); if (IsLeaf(countryId)) { LocalFilePtr localFile = GetLatestLocalFile(countryId); @@ -516,9 +505,9 @@ void Storage::RestoreDownloadQueue() strings::Tokenize(download, ";", [this](string_view v) { auto const it = base::FindIf(m_notAppliedDiffs, [this, v](LocalCountryFile const & localDiff) - { - return v == FindCountryIdByFile(localDiff.GetCountryName()); - }); + { + return v == FindCountryId(localDiff); + }); if (it == m_notAppliedDiffs.end()) { @@ -580,20 +569,17 @@ void Storage::DeleteCustomCountryVersion(LocalCountryFile const & localFile) { CHECK_THREAD_CHECKER(m_threadChecker, ()); - CountryFile const countryFile = localFile.GetCountryFile(); DeleteFromDiskWithIndexes(localFile, MapFileType::Map); DeleteFromDiskWithIndexes(localFile, MapFileType::Diff); + auto it = m_localFilesForFakeCountries.find(localFile.GetCountryFile()); + if (it != m_localFilesForFakeCountries.end()) { - auto it = m_localFilesForFakeCountries.find(countryFile); - if (it != m_localFilesForFakeCountries.end()) - { - m_localFilesForFakeCountries.erase(it); - return; - } + m_localFilesForFakeCountries.erase(it); + return; } - CountryId const countryId = FindCountryIdByFile(countryFile.GetName()); + CountryId const & countryId = FindCountryId(localFile); if (!IsLeaf(countryId)) { LOG(LERROR, ("Removed files for an unknown country:", localFile)); @@ -859,22 +845,6 @@ void Storage::OnMapDownloadFinished(CountryId const & countryId, DownloadStatus RegisterDownloadedFiles(countryId, type); } -CountryId Storage::FindCountryIdByFile(string const & name) const -{ - // @TODO(bykoianko) Probably it's worth to check here if name represent a node in the tree. - return CountryId(name); -} - -CountriesVec Storage::FindAllIndexesByFile(CountryId const & name) const -{ - // @TODO(bykoianko) This method should be rewritten. At list now name and the param of Find - // have different types: string and CountryId. - CountriesVec result; - if (m_countries.FindFirst(name)) - result.push_back(name); - return result; -} - /* void Storage::GetOutdatedCountries(vector & countries) const { @@ -951,36 +921,47 @@ void Storage::RegisterCountryFiles(LocalFilePtr localFile) CHECK(localFile, ()); localFile->SyncWithDisk(); - for (auto const & countryId : FindAllIndexesByFile(localFile->GetCountryName())) + CountryId const & countryId = FindCountryId(*localFile); + LocalFilePtr existingFile = GetLocalFile(countryId, localFile->GetVersion()); + if (existingFile) { - LocalFilePtr existingFile = GetLocalFile(countryId, localFile->GetVersion()); - if (existingFile) - { - if (existingFile->IsInBundle()) - *existingFile = *localFile; - else - ASSERT_EQUAL(localFile.get(), existingFile.get(), ()); - } + if (existingFile->IsInBundle()) + *existingFile = *localFile; else - m_localFiles[countryId].push_front(localFile); + ASSERT_EQUAL(localFile.get(), existingFile.get(), ()); } + else + m_localFiles[countryId].push_front(localFile); } -void Storage::RegisterCountryFiles(CountryId const & countryId, LocalCountryFile const & localFile) +void Storage::RegisterLocalFile(platform::LocalCountryFile const & localFile) { - LocalFilePtr p = GetLocalFile(countryId, localFile.GetVersion()); - if (!p) + LocalFilePtr ptr; + + CountryId const & countryId = FindCountryId(localFile); + if (IsLeaf(countryId)) { - p = make_shared(localFile); - RegisterCountryFiles(p); + ptr = GetLocalFile(countryId, localFile.GetVersion()); + if (!ptr) + { + ptr = make_shared(localFile); + RegisterCountryFiles(ptr); + } + } + else + { + ptr = make_shared(localFile); + ptr->SyncWithDisk(); + m_localFilesForFakeCountries[ptr->GetCountryFile()] = ptr; } -} -void Storage::RegisterFakeCountryFiles(LocalCountryFile const & localFile) -{ - LocalFilePtr p = make_shared(localFile); - p->SyncWithDisk(); - m_localFilesForFakeCountries[p->GetCountryFile()] = p; + uint64_t const size = ptr->GetSize(MapFileType::Map); + LOG(LINFO, ("Found file:", countryId, "in directory:", ptr->GetDirectory(), "with size:", size)); + + /// Funny, but ptr->GetCountryFile() has valid name only. Size and sha1 are not initialized. + /// @todo Store only name (CountryId) in LocalCountryFile instead of CountryFile? + if (m_currentVersion == ptr->GetVersion() && size != GetCountryFile(countryId).GetRemoteSize()) + LOG(LERROR, ("Inconsistent MWM and version for", *ptr)); } void Storage::DeleteCountryFiles(CountryId const & countryId, MapFileType type, bool deferredDelete) diff --git a/storage/storage.hpp b/storage/storage.hpp index 5db4c15e2e..eee7f594ed 100644 --- a/storage/storage.hpp +++ b/storage/storage.hpp @@ -13,16 +13,12 @@ #include "platform/local_country_file.hpp" #include "base/cancellable.hpp" -#include "base/deferred_task.hpp" #include "base/thread_checker.hpp" #include "base/thread_pool_delayed.hpp" -#include -#include #include #include #include -#include #include #include #include @@ -513,7 +509,17 @@ public: Country const & CountryLeafByCountryId(CountryId const & countryId) const; Country const & CountryByCountryId(CountryId const & countryId) const; - CountryId FindCountryIdByFile(std::string const & name) const; + /// @todo Proxy functions for future, to distinguish CountryId from regular file name. + /// @{ + CountryId const & FindCountryId(platform::LocalCountryFile const & localFile) const + { + return localFile.GetCountryName(); + } + CountryId const & FindCountryIdByFile(std::string const & name) const + { + return name; + } + /// @} // Returns true iff |countryId| exists as a node in the tree. bool IsNode(CountryId const & countryId) const; @@ -596,11 +602,7 @@ private: // Registers disk files for a country. This method must be used only // for real (listed in countries.txt) countries. - void RegisterCountryFiles(CountryId const & countryId, platform::LocalCountryFile const & localFile); - - // Registers disk files for a country. This method must be used only - // for custom (made by user) map files. - void RegisterFakeCountryFiles(platform::LocalCountryFile const & localFile); + void RegisterLocalFile(platform::LocalCountryFile const & localFile); // Removes disk files for all versions of a country. void DeleteCountryFiles(CountryId const & countryId, MapFileType type, bool deferredDelete); @@ -627,10 +629,6 @@ private: void NotifyStatusChanged(CountryId const & countryId); void NotifyStatusChangedForHierarchy(CountryId const & countryId); - /// @todo Temporary function to gel all associated indexes for the country file name. - /// Will be removed in future after refactoring. - CountriesVec FindAllIndexesByFile(CountryId const & name) const; - /// Calculates progress of downloading for expandable nodes in country tree. /// |descendants| All descendants of the parent node. downloader::Progress CalculateProgress(CountriesVec const & descendants) const; diff --git a/storage/storage_tests/storage_tests.cpp b/storage/storage_tests/storage_tests.cpp index 9644bf995d..9161fde628 100644 --- a/storage/storage_tests/storage_tests.cpp +++ b/storage/storage_tests/storage_tests.cpp @@ -636,7 +636,7 @@ UNIT_CLASS_TEST(StorageTest, DeleteCountry) writer.Write(data.data(), data.size()); } - storage.RegisterFakeCountryFiles(file); + storage.RegisterLocalFile(file); TEST(map.Exists(), ()); TEST(Platform::IsFileExistsByFullPath(bitsPath), (bitsPath));