diff --git a/platform/local_country_file.cpp b/platform/local_country_file.cpp index 2ccf776392..4cf20444ce 100644 --- a/platform/local_country_file.cpp +++ b/platform/local_country_file.cpp @@ -49,7 +49,10 @@ void LocalCountryFile::DeleteFromDisk(TMapOptions files) const if (OnDisk(file) && HasOptions(files, file)) { if (!my::DeleteFileX(GetPath(file))) + { LOG(LERROR, (file, "from", *this, "wasn't deleted from disk.")); + ASSERT(false, ()); + } } } } diff --git a/platform/local_country_file_utils.cpp b/platform/local_country_file_utils.cpp index f65bedcc6c..f97a6f7d6a 100644 --- a/platform/local_country_file_utils.cpp +++ b/platform/local_country_file_utils.cpp @@ -3,7 +3,7 @@ #include "platform/platform.hpp" #include "coding/file_name_utils.hpp" -#include "coding/file_writer.hpp" +#include "coding/internal/file_data.hpp" #include "base/string_utils.hpp" #include "base/logging.hpp" @@ -19,6 +19,43 @@ namespace size_t const kMaxTimestampLength = 18; bool IsSpecialFile(string const & file) { return file == "." || file == ".."; } + +bool CheckedGetFileType(string const & path, Platform::EFileType & type) +{ + Platform::EError const ret = Platform::GetFileType(path, type); + if (ret != Platform::ERR_OK) + { + LOG(LERROR, ("Can't determine file type for", path, ":", ret)); + return false; + } + return true; +} + +bool CheckedMkDir(string const & directory) +{ + Platform & platform = GetPlatform(); + Platform::EError const ret = platform.MkDir(directory); + switch (ret) + { + case Platform::ERR_OK: + return true; + case Platform::ERR_FILE_ALREADY_EXISTS: + { + Platform::EFileType type; + if (!CheckedGetFileType(directory, type)) + return false; + if (type != Platform::FILE_TYPE_DIRECTORY) + { + LOG(LERROR, (directory, "exists, but not a directory:", type)); + return false; + } + return true; + } + default: + LOG(LERROR, (directory, "can't be created:", ret)); + return false; + } +} } // namespace void CleanupMapsDirectory() @@ -34,7 +71,7 @@ void CleanupMapsDirectory() string const regexp = "\\.(downloading|resume|ready)[0-9]?$"; platform.GetFilesByRegExp(mapsDir, regexp, files); for (string const & file : files) - FileWriter::DeleteFileX(my::JoinFoldersToPath(mapsDir, file)); + my::DeleteFileX(my::JoinFoldersToPath(mapsDir, file)); } // Find and remove Brazil and Japan maps. @@ -160,29 +197,80 @@ shared_ptr PreparePlaceForCountryFiles(CountryFile const & cou return make_shared(platform.WritableDir(), countryFile, version); string const directory = my::JoinFoldersToPath(platform.WritableDir(), strings::to_string(version)); - Platform::EError ret = platform.MkDir(directory); - switch (ret) + if (!CheckedMkDir(directory)) + return shared_ptr(); + return make_shared(directory, countryFile, version); +} + +// static +bool CountryIndexes::PreparePlaceOnDisk(LocalCountryFile const & localFile) +{ + return CheckedMkDir(IndexesDir(localFile)); +} + +// static +bool CountryIndexes::DeleteFromDisk(LocalCountryFile const & localFile) +{ + string const directory = IndexesDir(localFile); + + vector files; + Platform::GetFilesByRegExp(directory, "\\.*", files); + for (string const & file : files) { - case Platform::ERR_OK: - return make_shared(directory, countryFile, version); - case Platform::ERR_FILE_ALREADY_EXISTS: - { - Platform::EFileType type; - if (Platform::GetFileType(directory, type) != Platform::ERR_OK) - { - LOG(LERROR, ("Can't determine file type for:", directory)); - return shared_ptr(); - } - if (type != Platform::FILE_TYPE_DIRECTORY) - { - LOG(LERROR, (directory, "exists, but not a directory:", type)); - return shared_ptr(); - } - return make_shared(directory, countryFile, version); - } - default: - LOG(LERROR, ("Can't prepare place for", countryFile, "(", version, ") :", ret)); - return shared_ptr(); + if (IsSpecialFile(file)) + continue; + string const path = my::JoinFoldersToPath(directory, file); + if (!my::DeleteFileX(path)) + LOG(LERROR, ("Can't remove country index:", path)); + } + + Platform::EError const ret = Platform::RmDir(directory); + if (ret != Platform::ERR_OK && ret != Platform::ERR_FILE_DOES_NOT_EXIST) + { + LOG(LERROR, ("Can't remove indexes directory:", directory, ret)); + return false; + } + return true; +} + +// static +string CountryIndexes::GetPath(LocalCountryFile const & localFile, Index index) +{ + string const directory = IndexesDir(localFile); + string const name = localFile.GetCountryFile().GetNameWithoutExt(); + string file; + switch (index) + { + case Index::Bits: + file = name + ".bftsegbits"; + break; + case Index::Nodes: + file = name + ".bftsegnodes"; + break; + case Index::Offsets: + file = name + ".offsets"; + break; + } + return my::JoinFoldersToPath(directory, file); +} + +// static +string CountryIndexes::IndexesDir(LocalCountryFile const & localFile) +{ + return my::JoinFoldersToPath(localFile.GetDirectory(), + localFile.GetCountryFile().GetNameWithoutExt()); +} + +string DebugPrint(CountryIndexes::Index index) +{ + switch (index) + { + case CountryIndexes::Index::Bits: + return "Bits"; + case CountryIndexes::Index::Nodes: + return "Nodes"; + case CountryIndexes::Index::Offsets: + return "Offsets"; } } } // namespace platform diff --git a/platform/local_country_file_utils.hpp b/platform/local_country_file_utils.hpp index 2b9b852c17..2d3987e0d5 100644 --- a/platform/local_country_file_utils.hpp +++ b/platform/local_country_file_utils.hpp @@ -1,5 +1,6 @@ #pragma once +#include "platform/country_defines.hpp" #include "platform/local_country_file.hpp" #include "std/shared_ptr.hpp" @@ -45,4 +46,35 @@ bool ParseVersion(string const & s, int64_t & version); // directory with name equal to decimal representation of version. shared_ptr PreparePlaceForCountryFiles(CountryFile const & countryFile, int64_t version); +// An API for managing country indexes. +class CountryIndexes +{ +public: + enum class Index + { + Bits, + Nodes, + Offsets + }; + + // Prepares (if necessary) directory for country indexes. Local file + // should point to existing local country files. Returns true on + // success, false otherwise. + static bool PreparePlaceOnDisk(LocalCountryFile const & localFile); + + // Removes country indexes from disk including containing directory. + static bool DeleteFromDisk(LocalCountryFile const & localFile); + + // Returns full path to country index. Note that this method does + // not create a file on disk - it just returns a path where the + // index should be created/accessed/removed. + static string GetPath(LocalCountryFile const & localFile, Index index); + +private: + friend void UnitTest_LocalCountryFile_CountryIndexes(); + + static string IndexesDir(LocalCountryFile const & localFile); +}; + +string DebugPrint(CountryIndexes::Index index); } // namespace platform diff --git a/platform/platform_tests/local_country_file_tests.cpp b/platform/platform_tests/local_country_file_tests.cpp index 46981142f6..71989eb980 100644 --- a/platform/platform_tests/local_country_file_tests.cpp +++ b/platform/platform_tests/local_country_file_tests.cpp @@ -421,4 +421,35 @@ UNIT_TEST(LocalCountryFile_PreparePlaceForCountryFiles) TEST(franceLocalFile.get(), ()); TEST_EQUAL(expectedFranceFile, *franceLocalFile, ()); } + +UNIT_TEST(LocalCountryFile_CountryIndexes) +{ + Platform & platform = GetPlatform(); + + CountryFile germanyFile("Germany"); + shared_ptr germanyLocalFile = + platform::PreparePlaceForCountryFiles(germanyFile, 101010 /* version */); + TEST(germanyLocalFile.get(), ("Can't prepare place for:", germanyFile)); + TEST_EQUAL(my::JoinFoldersToPath(platform.WritableDir(), "101010"), + germanyLocalFile->GetDirectory(), ()); + TEST_EQUAL( + my::JoinFoldersToPath(germanyLocalFile->GetDirectory(), germanyFile.GetNameWithoutExt()), + CountryIndexes::IndexesDir(*germanyLocalFile), ()); + TEST(CountryIndexes::PreparePlaceOnDisk(*germanyLocalFile), + ("Can't prepare place for:", *germanyLocalFile)); + + string const bitsPath = CountryIndexes::GetPath(*germanyLocalFile, CountryIndexes::Index::Bits); + TEST(!Platform::IsFileExistsByFullPath(bitsPath), (bitsPath)); + { + FileWriter writer(bitsPath); + string const contents = "bits index"; + writer.Write(contents.data(), contents.size()); + } + TEST(Platform::IsFileExistsByFullPath(bitsPath), (bitsPath)); + + TEST(CountryIndexes::DeleteFromDisk(*germanyLocalFile), + ("Can't delete indexes for:", *germanyLocalFile)); + + TEST(!Platform::IsFileExistsByFullPath(bitsPath), (bitsPath)); +} } // namespace platform diff --git a/storage/storage.cpp b/storage/storage.cpp index 0e106343bb..6902c2825e 100644 --- a/storage/storage.cpp +++ b/storage/storage.cpp @@ -66,21 +66,6 @@ uint64_t GetRemoteSize(CountryFile const & file, TMapOptions opt) return size; } -// TODO (@gorshenin): directory where country indexes are stored -// should be abstracted out to LocalCountryIndexes. -void DeleteCountryIndexes(CountryFile const & file) -{ - Platform::FilesList files; - Platform const & platform = GetPlatform(); - string const name = file.GetNameWithoutExt(); - string const path = platform.WritablePathForCountryIndexes(name); - - /// @todo We need correct regexp for any file (not including "." and ".."). - platform.GetFilesByRegExp(path, name + "\\..*", files); - for (auto const & file : files) - my::DeleteFileX(path + file); -} - class EqualFileName { string const & m_name; @@ -594,7 +579,7 @@ bool Storage::RegisterDownloadedFile(string const & path, uint64_t size, int64_t void Storage::OnMapDownloadFinished(shared_ptr localFile) { - DeleteCountryIndexes(localFile->GetCountryFile()); + platform::CountryIndexes::DeleteFromDisk(*localFile); // Notify framework that all requested files for the country were downloaded. m_updateAfterDownload(*localFile); @@ -815,16 +800,12 @@ void Storage::DeleteCountryFiles(TIndex const & index, TMapOptions opt) if (it == m_localFiles.end()) return; - // TODO (@gorshenin): map-only indexes should not be touched when - // routing indexes are removed. - if (!it->second.empty()) - DeleteCountryIndexes(it->second.front()->GetCountryFile()); - - list> & localFiles = it->second; - for (shared_ptr & localFile : localFiles) + auto & localFiles = it->second; + for (auto & localFile : localFiles) { localFile->DeleteFromDisk(opt); localFile->SyncWithDisk(); + platform::CountryIndexes::DeleteFromDisk(*localFile); if (localFile->GetFiles() == TMapOptions::ENothing) localFile.reset(); }