diff --git a/drape_frontend/read_metaline_task.cpp b/drape_frontend/read_metaline_task.cpp index f0f3f80036..27c7514035 100644 --- a/drape_frontend/read_metaline_task.cpp +++ b/drape_frontend/read_metaline_task.cpp @@ -35,7 +35,7 @@ std::vector ReadMetalinesFromFile(MwmSet::MwmId const & mwmId) try { std::vector model; - ModelReaderPtr reader = FilesContainerR(mwmId.GetInfo()->GetLocalFile().GetPath(MapOptions::Map)) + ModelReaderPtr reader = FilesContainerR(mwmId.GetInfo()->GetLocalFile().GetPath(MapFileType::Map)) .GetReader(METALINES_FILE_TAG); ReaderSrc src(reader.GetPtr()); auto const version = ReadPrimitiveFromSource(src); diff --git a/editor/editor_tests/osm_editor_test.cpp b/editor/editor_tests/osm_editor_test.cpp index 1dde414946..60f04e356e 100644 --- a/editor/editor_tests/osm_editor_test.cpp +++ b/editor/editor_tests/osm_editor_test.cpp @@ -1303,7 +1303,7 @@ void EditorTest::SaveTransactionTest() void EditorTest::Cleanup(platform::LocalCountryFile const & map) { platform::CountryIndexes::DeleteFromDisk(map); - map.DeleteFromDisk(MapOptions::Map); + map.DeleteFromDisk(MapFileType::Map); } bool EditorTest::RemoveMwm(MwmSet::MwmId const & mwmId) diff --git a/generator/generator_tests/cities_ids_tests.cpp b/generator/generator_tests/cities_ids_tests.cpp index 77f430f0d1..1f242533b3 100644 --- a/generator/generator_tests/cities_ids_tests.cpp +++ b/generator/generator_tests/cities_ids_tests.cpp @@ -76,7 +76,7 @@ UNIT_CLASS_TEST(CitiesIdsTest, BuildCitiesIds) builder.Add(marCaribe); }); - auto const worldMwmPath = testWorldId.GetInfo()->GetLocalFile().GetPath(MapOptions::Map); + auto const worldMwmPath = testWorldId.GetInfo()->GetLocalFile().GetPath(MapFileType::Map); indexer::FeatureIdToGeoObjectIdOneWay oneWayMap(GetDataSource()); TEST(oneWayMap.Load(), ()); diff --git a/generator/generator_tests_support/test_mwm_builder.cpp b/generator/generator_tests_support/test_mwm_builder.cpp index a215e3e9d0..541c98c667 100644 --- a/generator/generator_tests_support/test_mwm_builder.cpp +++ b/generator/generator_tests_support/test_mwm_builder.cpp @@ -62,7 +62,7 @@ TestMwmBuilder::TestMwmBuilder(platform::LocalCountryFile & file, DataHeader::Ma : m_file(file) , m_type(type) , m_collector( - make_unique(m_file.GetPath(MapOptions::Map) + EXTENSION_TMP)) + make_unique(m_file.GetPath(MapFileType::Map) + EXTENSION_TMP)) , m_version(version) { } @@ -140,7 +140,7 @@ void TestMwmBuilder::Finish() CHECK(base::DeleteFileX(tmpFilePath), ()); - string const path = m_file.GetPath(MapOptions::Map); + string const path = m_file.GetPath(MapFileType::Map); (void)base::DeleteFileX(path + OSM2FEATURE_FILE_EXTENSION); CHECK(BuildOffsetsTable(path), ("Can't build feature offsets table.")); diff --git a/generator/generator_tests_support/test_with_custom_mwms.cpp b/generator/generator_tests_support/test_with_custom_mwms.cpp index 81e918a947..1ac517251d 100644 --- a/generator/generator_tests_support/test_with_custom_mwms.cpp +++ b/generator/generator_tests_support/test_with_custom_mwms.cpp @@ -24,7 +24,7 @@ TestWithCustomMwms::~TestWithCustomMwms() void TestWithCustomMwms::Cleanup(platform::LocalCountryFile const & file) { platform::CountryIndexes::DeleteFromDisk(file); - file.DeleteFromDisk(MapOptions::Map); + file.DeleteFromDisk(MapFileType::Map); } void TestWithCustomMwms::SetMwmVersion(uint32_t version) { m_version = version; } diff --git a/generator/srtm_coverage_checker/srtm_coverage_checker.cpp b/generator/srtm_coverage_checker/srtm_coverage_checker.cpp index 4eba5c5194..ac67c22811 100644 --- a/generator/srtm_coverage_checker/srtm_coverage_checker.cpp +++ b/generator/srtm_coverage_checker/srtm_coverage_checker.cpp @@ -59,13 +59,13 @@ int main(int argc, char * argv[]) for (auto & file : localFiles) { file.SyncWithDisk(); - if (!file.OnDisk(MapOptions::Map)) + if (!file.OnDisk(MapFileType::Map)) { LOG(LINFO, ("Warning! Routing file not found for:", file.GetCountryName())); continue; } - auto const path = file.GetPath(MapOptions::Map); + auto const path = file.GetPath(MapFileType::Map); LOG(LINFO, ("Mwm", path, "is being processed.")); size_t all = 0; diff --git a/generator/utils.cpp b/generator/utils.cpp index 49ead94f6c..48d02a9215 100644 --- a/generator/utils.cpp +++ b/generator/utils.cpp @@ -23,7 +23,7 @@ SingleMwmDataSource::SingleMwmDataSource(std::string const & mwmPath) { m_countryFile = platform::LocalCountryFile::MakeTemporary(mwmPath); m_countryFile.SyncWithDisk(); - CHECK(m_countryFile.OnDisk(MapOptions::Map), + CHECK(m_countryFile.OnDisk(MapFileType::Map), ("No correct mwm corresponding to local country file:", m_countryFile, ". Path:", mwmPath)); auto const result = m_dataSource.Register(m_countryFile); diff --git a/generator/utils.hpp b/generator/utils.hpp index 39e2f65204..930a54c50d 100644 --- a/generator/utils.hpp +++ b/generator/utils.hpp @@ -30,7 +30,7 @@ public: explicit SingleMwmDataSource(std::string const & mwmPath); DataSource & GetDataSource() { return m_dataSource; } - std::string GetPath(MapOptions file) const { return m_countryFile.GetPath(file); } + std::string GetPath(MapFileType type) const { return m_countryFile.GetPath(type); } MwmSet::MwmId const & GetMwmId() const { return m_mwmId; } private: diff --git a/indexer/indexer_tests/feature_to_osm_tests.cpp b/indexer/indexer_tests/feature_to_osm_tests.cpp index 77d87eb0eb..18204a4e75 100644 --- a/indexer/indexer_tests/feature_to_osm_tests.cpp +++ b/indexer/indexer_tests/feature_to_osm_tests.cpp @@ -61,7 +61,7 @@ UNIT_CLASS_TEST(FeatureIdToGeoObjectIdTest, Smoke) // TestMwmBuilder will create the section but we will rewrite it right away. auto testWorldId = BuildWorld([&](TestMwmBuilder & builder) {}); - auto const testWorldPath = testWorldId.GetInfo()->GetLocalFile().GetPath(MapOptions::Map); + auto const testWorldPath = testWorldId.GetInfo()->GetLocalFile().GetPath(MapFileType::Map); vector buf; { diff --git a/indexer/indexer_tests/rank_table_test.cpp b/indexer/indexer_tests/rank_table_test.cpp index c777735d06..879c33dc86 100644 --- a/indexer/indexer_tests/rank_table_test.cpp +++ b/indexer/indexer_tests/rank_table_test.cpp @@ -87,7 +87,7 @@ UNIT_TEST(RankTableBuilder_EndToEnd) platform::LocalCountryFile localFile = platform::LocalCountryFile::MakeForTesting("minsk-pass-copy"); - TEST(localFile.OnDisk(MapOptions::Map), ()); + TEST(localFile.OnDisk(MapFileType::Map), ()); vector ranks; { diff --git a/indexer/indexer_tests/scale_index_reading_tests.cpp b/indexer/indexer_tests/scale_index_reading_tests.cpp index da3134bedf..f927b9c8a4 100644 --- a/indexer/indexer_tests/scale_index_reading_tests.cpp +++ b/indexer/indexer_tests/scale_index_reading_tests.cpp @@ -91,7 +91,7 @@ UNIT_CLASS_TEST(ScaleIndexReadingTest, Mmap) TEST(id.IsAlive(), ()); - auto const path = id.GetInfo()->GetLocalFile().GetPath(MapOptions::Map); + auto const path = id.GetInfo()->GetLocalFile().GetPath(MapFileType::Map); FilesContainerR cont(path); feature::DataHeader header(cont); diff --git a/indexer/mwm_set.cpp b/indexer/mwm_set.cpp index fb414515bc..c0cad90404 100644 --- a/indexer/mwm_set.cpp +++ b/indexer/mwm_set.cpp @@ -404,7 +404,7 @@ void MwmSet::ClearCache(MwmId const & id) // MwmValue ---------------------------------------------------------------------------------------- MwmValue::MwmValue(LocalCountryFile const & localFile) - : m_cont(platform::GetCountryReader(localFile, MapOptions::Map)), m_file(localFile) + : m_cont(platform::GetCountryReader(localFile, MapFileType::Map)), m_file(localFile) { m_factory.Load(m_cont); } diff --git a/indexer/rank_table.cpp b/indexer/rank_table.cpp index 586fa9cd26..cf670e701f 100644 --- a/indexer/rank_table.cpp +++ b/indexer/rank_table.cpp @@ -327,7 +327,7 @@ bool SearchRankTableBuilder::CreateIfNotExists(platform::LocalCountryFile const unique_ptr table; { - ModelReaderPtr reader = platform::GetCountryReader(localFile, MapOptions::Map); + ModelReaderPtr reader = platform::GetCountryReader(localFile, MapFileType::Map); if (!reader.GetPtr()) return false; diff --git a/map/framework.cpp b/map/framework.cpp index 8937ec779f..cc203951fb 100644 --- a/map/framework.cpp +++ b/map/framework.cpp @@ -676,7 +676,7 @@ void Framework::OnCountryFileDownloaded(storage::CountryId const & countryId, m2::RectD rect = MercatorBounds::FullRect(); - if (localFile && localFile->OnDisk(MapOptions::Map)) + if (localFile && localFile->OnDisk(MapFileType::Map)) { // Add downloaded map. auto p = m_featuresFetcher.RegisterMap(*localFile); diff --git a/map/mwm_tests/mwm_foreach_test.cpp b/map/mwm_tests/mwm_foreach_test.cpp index 4ce41420e5..c5211bd85f 100644 --- a/map/mwm_tests/mwm_foreach_test.cpp +++ b/map/mwm_tests/mwm_foreach_test.cpp @@ -261,7 +261,7 @@ public: // vector rects; // rects.push_back(src1.GetWorldRect()); -// ModelReaderPtr reader = platform::GetCountryReader(localFile, MapOptions::Map); +// ModelReaderPtr reader = platform::GetCountryReader(localFile, MapFileType::Map); // while (!rects.empty()) // { diff --git a/platform/country_defines.cpp b/platform/country_defines.cpp index 9d2f16aabb..7e45d45842 100644 --- a/platform/country_defines.cpp +++ b/platform/country_defines.cpp @@ -2,12 +2,12 @@ #include "base/assert.hpp" -std::string DebugPrint(MapOptions options) +std::string DebugPrint(MapFileType type) { - switch (options) + switch (type) { - case MapOptions::Map: return "MapOnly"; - case MapOptions::Diff: return "Diff"; + case MapFileType::Map: return "MapOnly"; + case MapFileType::Diff: return "Diff"; } UNREACHABLE(); } diff --git a/platform/country_defines.hpp b/platform/country_defines.hpp index 85fc31a31e..141a160e9b 100644 --- a/platform/country_defines.hpp +++ b/platform/country_defines.hpp @@ -6,7 +6,7 @@ // Note: do not forget to change kMapOptionsCount // value when count of elements is changed. -enum class MapOptions : uint8_t +enum class MapFileType : uint8_t { Map, Diff @@ -18,4 +18,4 @@ using MwmCounter = uint32_t; using MwmSize = uint64_t; using LocalAndRemoteSize = std::pair; -std::string DebugPrint(MapOptions options); +std::string DebugPrint(MapFileType type); diff --git a/platform/country_file.cpp b/platform/country_file.cpp index 0427cc6914..5dbeed8439 100644 --- a/platform/country_file.cpp +++ b/platform/country_file.cpp @@ -15,13 +15,13 @@ namespace /// \returns file name (m_name) with extension dependent on the file param. /// The extension could be .mwm.routing or just .mwm. /// The method is used for old (two components) mwm support. -string GetNameWithExt(string const & countryFile, MapOptions file) +string GetNameWithExt(string const & countryFile, MapFileType file) { switch (file) { - case MapOptions::Map: + case MapFileType::Map: return countryFile + DATA_FILE_EXTENSION; - case MapOptions::Diff: + case MapFileType::Diff: return countryFile + DIFF_FILE_EXTENSION; default: ASSERT(false, ("Can't get name for:", file)); @@ -48,12 +48,9 @@ MwmSize CountryFile::GetRemoteSize() const return m_mapSize; } -string GetFileName(string const & countryFile, MapOptions opt, int64_t version) +string GetFileName(string const & countryFile, MapFileType type, int64_t version) { - if (version::IsSingleMwm(version)) - opt = opt == MapOptions::Diff ? MapOptions::Diff : MapOptions::Map; - - return GetNameWithExt(countryFile, opt); + return GetNameWithExt(countryFile, type); } string DebugPrint(CountryFile const & file) diff --git a/platform/country_file.hpp b/platform/country_file.hpp index fd65f5afd5..6c408231ed 100644 --- a/platform/country_file.hpp +++ b/platform/country_file.hpp @@ -47,6 +47,6 @@ private: /// \param countryFile is a file name without extension. For example Abkhazia. /// \param file is type of map data. /// \param version is version of mwm. For example 160731. -std::string GetFileName(std::string const & countryFile, MapOptions file, int64_t version); +std::string GetFileName(std::string const & countryFile, MapFileType type, int64_t version); std::string DebugPrint(CountryFile const & file); } // namespace platform diff --git a/platform/local_country_file.cpp b/platform/local_country_file.cpp index cf374faf2c..2e9edb3db9 100644 --- a/platform/local_country_file.cpp +++ b/platform/local_country_file.cpp @@ -38,7 +38,7 @@ void LocalCountryFile::SyncWithDisk() Platform & platform = GetPlatform(); // Now we are not working with several files at the same time and diffs have greater priority. - for (MapOptions type : {MapOptions::Diff, MapOptions::Map}) + for (MapFileType type : {MapFileType::Diff, MapFileType::Map}) { ASSERT_LESS(base::Underlying(type), m_files.size(), ()); @@ -50,7 +50,7 @@ void LocalCountryFile::SyncWithDisk() } } -void LocalCountryFile::DeleteFromDisk(MapOptions type) const +void LocalCountryFile::DeleteFromDisk(MapFileType type) const { ASSERT_LESS(base::Underlying(type), m_files.size(), ()); @@ -61,12 +61,12 @@ void LocalCountryFile::DeleteFromDisk(MapOptions type) const LOG(LERROR, (type, "from", *this, "wasn't deleted from disk.")); } -string LocalCountryFile::GetPath(MapOptions type) const +string LocalCountryFile::GetPath(MapFileType type) const { return base::JoinPath(m_directory, GetFileName(m_countryFile.GetName(), type, GetVersion())); } -uint64_t LocalCountryFile::GetSize(MapOptions type) const +uint64_t LocalCountryFile::GetSize(MapFileType type) const { ASSERT_LESS(base::Underlying(type), m_files.size(), ()); @@ -78,7 +78,7 @@ bool LocalCountryFile::HasFiles() const return std::any_of(m_files.cbegin(), m_files.cend(), [](auto value) { return value != 0; }); } -bool LocalCountryFile::OnDisk(MapOptions type) const +bool LocalCountryFile::OnDisk(MapFileType type) const { ASSERT_LESS(base::Underlying(type), m_files.size(), ()); @@ -106,7 +106,7 @@ bool LocalCountryFile::operator==(LocalCountryFile const & rhs) const bool LocalCountryFile::ValidateIntegrity() const { - auto calculatedSha1 = coding::SHA1::CalculateBase64(GetPath(MapOptions::Map)); + auto calculatedSha1 = coding::SHA1::CalculateBase64(GetPath(MapFileType::Map)); ASSERT_EQUAL(calculatedSha1, m_countryFile.GetSha1(), ("Integrity failure")); return calculatedSha1 == m_countryFile.GetSha1(); } diff --git a/platform/local_country_file.hpp b/platform/local_country_file.hpp index 16f9ff82e6..e58f328166 100644 --- a/platform/local_country_file.hpp +++ b/platform/local_country_file.hpp @@ -46,15 +46,15 @@ public: // Removes specified file from disk if it known for LocalCountryFile, i.e. // were found by previous SyncWithDisk() call. - void DeleteFromDisk(MapOptions type) const; + void DeleteFromDisk(MapFileType type) const; // Returns path to a file. Return value may be empty until // SyncWithDisk() is called. - std::string GetPath(MapOptions type) const; + std::string GetPath(MapFileType type) const; // Returns size of a file. Return value may be zero until // SyncWithDisk() is called. - uint64_t GetSize(MapOptions type) const; + uint64_t GetSize(MapFileType type) const; // Returns true when some files are found during SyncWithDisk and have non empty size. // Consider that we are not working with empty files. @@ -64,7 +64,7 @@ public: // Checks whether files specified in filesMask are on disk. Return // value will be false until SyncWithDisk() is called. // Consider that we are not working with empty files. - bool OnDisk(MapOptions type) const; + bool OnDisk(MapFileType type) const; std::string const & GetDirectory() const { return m_directory; } std::string const & GetCountryName() const { return m_countryFile.GetName(); } diff --git a/platform/local_country_file_utils.cpp b/platform/local_country_file_utils.cpp index b42ee52487..5a2488e118 100644 --- a/platform/local_country_file_utils.cpp +++ b/platform/local_country_file_utils.cpp @@ -135,9 +135,9 @@ void FindAllDiffsInDirectory(string const & dir, vector & diff } string GetFilePath(int64_t version, string const & dataDir, CountryFile const & countryFile, - MapOptions options) + MapFileType type) { - string const filename = GetFileName(countryFile.GetName(), options, version); + string const filename = GetFileName(countryFile.GetName(), type, version); string const dir = GetDataDirFullPath(dataDir); if (version == 0) return base::JoinPath(dir, filename); @@ -153,9 +153,9 @@ void DeleteDownloaderFilesForCountry(int64_t version, CountryFile const & countr void DeleteDownloaderFilesForCountry(int64_t version, string const & dataDir, CountryFile const & countryFile) { - for (MapOptions opt : {MapOptions::Map, MapOptions::Diff}) + for (MapFileType type : {MapFileType::Map, MapFileType::Diff}) { - string const path = GetFileDownloadPath(version, dataDir, countryFile, opt); + string const path = GetFileDownloadPath(version, dataDir, countryFile, type); ASSERT(strings::EndsWith(path, READY_FILE_EXTENSION), ()); Platform::RemoveFileIfExists(path); Platform::RemoveFileIfExists(path + RESUME_FILE_EXTENSION); @@ -164,7 +164,7 @@ void DeleteDownloaderFilesForCountry(int64_t version, string const & dataDir, // Delete the diff that was downloaded but wasn't applied. { - string const path = GetFilePath(version, dataDir, countryFile, MapOptions::Diff); + string const path = GetFilePath(version, dataDir, countryFile, MapFileType::Diff); Platform::RemoveFileIfExists(path); } } @@ -208,7 +208,7 @@ void FindAllLocalMapsInDirectoryAndCleanup(string const & directory, int64_t ver if (name == "Japan" || name == "Brazil") { localFile.SyncWithDisk(); - localFile.DeleteFromDisk(MapOptions::Map); + localFile.DeleteFromDisk(MapFileType::Map); continue; } @@ -295,7 +295,7 @@ void FindAllLocalMapsAndCleanup(int64_t latestVersion, string const & dataDir, // Assume that empty path means the resource file. LocalCountryFile worldFile{string(), CountryFile(file), version::ReadVersionDate(reader)}; - worldFile.m_files[static_cast(MapOptions::Map)] = 1; + worldFile.m_files[static_cast(MapFileType::Map)] = 1; if (i != localFiles.end()) { // Always use resource World files instead of local on disk. @@ -355,24 +355,23 @@ shared_ptr PreparePlaceForCountryFiles(int64_t version, string return make_shared(directory, countryFile, version); } -string GetFileDownloadPath(int64_t version, CountryFile const & countryFile, MapOptions options) +string GetFileDownloadPath(int64_t version, CountryFile const & countryFile, MapFileType type) { - return GetFileDownloadPath(version, string(), countryFile, options); + return GetFileDownloadPath(version, string(), countryFile, type); } string GetFileDownloadPath(int64_t version, string const & dataDir, CountryFile const & countryFile, - MapOptions options) + MapFileType type) { string const readyFile = - GetFileName(countryFile.GetName(), options, version) + READY_FILE_EXTENSION; + GetFileName(countryFile.GetName(), type, version) + READY_FILE_EXTENSION; string const dir = GetDataDirFullPath(dataDir); if (version == 0) return base::JoinPath(dir, readyFile); return base::JoinPath(dir, strings::to_string(version), readyFile); } -unique_ptr GetCountryReader(platform::LocalCountryFile const & file, - MapOptions options) +unique_ptr GetCountryReader(platform::LocalCountryFile const & file, MapFileType type) { Platform & platform = GetPlatform(); // See LocalCountryFile comment for explanation. @@ -381,7 +380,7 @@ unique_ptr GetCountryReader(platform::LocalCountryFile const & file return platform.GetReader(file.GetCountryName() + DATA_FILE_EXTENSION, GetSpecialFilesSearchScope()); } - return platform.GetReader(file.GetPath(options), "f"); + return platform.GetReader(file.GetPath(type), "f"); } // static diff --git a/platform/local_country_file_utils.hpp b/platform/local_country_file_utils.hpp index 6accfe456b..43090d1e34 100644 --- a/platform/local_country_file_utils.hpp +++ b/platform/local_country_file_utils.hpp @@ -77,11 +77,11 @@ std::shared_ptr PreparePlaceForCountryFiles(int64_t version, s // Note. The function assumes the maps are located in writable dir/|dataDir|/|version| directory. // If |dataDir| is empty (or is not set) the function assumes that maps are in writable dir. -std::string GetFileDownloadPath(int64_t version, CountryFile const & countryFile, MapOptions file); +std::string GetFileDownloadPath(int64_t version, CountryFile const & countryFile, MapFileType type); std::string GetFileDownloadPath(int64_t version, std::string const & dataDir, - CountryFile const & countryFile, MapOptions file); + CountryFile const & countryFile, MapFileType type); -std::unique_ptr GetCountryReader(LocalCountryFile const & file, MapOptions options); +std::unique_ptr GetCountryReader(LocalCountryFile const & file, MapFileType type); // An API for managing country indexes. class CountryIndexes diff --git a/platform/platform_tests/country_file_tests.cpp b/platform/platform_tests/country_file_tests.cpp index 8513e9fb84..978e387a46 100644 --- a/platform/platform_tests/country_file_tests.cpp +++ b/platform/platform_tests/country_file_tests.cpp @@ -15,7 +15,7 @@ UNIT_TEST(CountryFile_SmokeTwoComponentMwm) { CountryFile countryFile("TestCountry"); TEST_EQUAL("TestCountry", countryFile.GetName(), ()); - string const mapFileName = GetFileName(countryFile.GetName(), MapOptions::Map, + string const mapFileName = GetFileName(countryFile.GetName(), MapFileType::Map, version::FOR_TESTING_TWO_COMPONENT_MWM1); TEST_EQUAL("TestCountry" DATA_FILE_EXTENSION, mapFileName, ()); @@ -30,7 +30,7 @@ UNIT_TEST(CountryFile_SmokeOneComponentMwm) { CountryFile countryFile("TestCountryOneComponent"); TEST_EQUAL("TestCountryOneComponent", countryFile.GetName(), ()); - string const mapFileName = GetFileName(countryFile.GetName(), MapOptions::Map, + string const mapFileName = GetFileName(countryFile.GetName(), MapFileType::Map, version::FOR_TESTING_SINGLE_MWM1); TEST_EQUAL("TestCountryOneComponent" DATA_FILE_EXTENSION, mapFileName, ()); diff --git a/platform/platform_tests/local_country_file_tests.cpp b/platform/platform_tests/local_country_file_tests.cpp index 78e442ab99..5057fadcf0 100644 --- a/platform/platform_tests/local_country_file_tests.cpp +++ b/platform/platform_tests/local_country_file_tests.cpp @@ -72,18 +72,18 @@ UNIT_TEST(LocalCountryFile_Smoke) LocalCountryFile localFile("/test-dir", countryFile, 150309); - TEST_EQUAL("/test-dir/TestCountry" DATA_FILE_EXTENSION, localFile.GetPath(MapOptions::Map), ()); + TEST_EQUAL("/test-dir/TestCountry" DATA_FILE_EXTENSION, localFile.GetPath(MapFileType::Map), ()); // Not synced with disk yet. TEST(!localFile.HasFiles(), ()); - TEST(!localFile.OnDisk(MapOptions::Map), ()); - TEST(!localFile.OnDisk(MapOptions::Diff), ()); + TEST(!localFile.OnDisk(MapFileType::Map), ()); + TEST(!localFile.OnDisk(MapFileType::Diff), ()); TEST_EQUAL("/test-dir", localFile.GetDirectory(), ()); - TEST_EQUAL(0, localFile.GetSize(MapOptions::Map), ()); - TEST_EQUAL(0, localFile.GetSize(MapOptions::Diff), ()); + TEST_EQUAL(0, localFile.GetSize(MapFileType::Map), ()); + TEST_EQUAL(0, localFile.GetSize(MapFileType::Diff), ()); TEST_EQUAL(150309, localFile.GetVersion(), ()); } @@ -100,25 +100,25 @@ UNIT_TEST(LocalCountryFile_DiskFiles) for (int64_t version : {1, 150312}) { LocalCountryFile localFile(platform.WritableDir(), countryFile, version); - TEST(!localFile.OnDisk(MapOptions::Map), ()); - TEST(!localFile.OnDisk(MapOptions::Diff), ()); + TEST(!localFile.OnDisk(MapFileType::Map), ()); + TEST(!localFile.OnDisk(MapFileType::Diff), ()); - string const mapFileName = GetFileName(countryFile.GetName(), MapOptions::Map, + string const mapFileName = GetFileName(countryFile.GetName(), MapFileType::Map, version::FOR_TESTING_TWO_COMPONENT_MWM1); string const mapFileContents("map"); ScopedFile testMapFile(mapFileName, mapFileContents); localFile.SyncWithDisk(); - TEST(localFile.OnDisk(MapOptions::Map), ()); - TEST(!localFile.OnDisk(MapOptions::Diff), ()); - TEST_EQUAL(mapFileContents.size(), localFile.GetSize(MapOptions::Map), ()); + TEST(localFile.OnDisk(MapFileType::Map), ()); + TEST(!localFile.OnDisk(MapFileType::Diff), ()); + TEST_EQUAL(mapFileContents.size(), localFile.GetSize(MapFileType::Map), ()); localFile.SyncWithDisk(); - TEST(localFile.OnDisk(MapOptions::Map), ()); - TEST_EQUAL(mapFileContents.size(), localFile.GetSize(MapOptions::Map), ()); + TEST(localFile.OnDisk(MapFileType::Map), ()); + TEST_EQUAL(mapFileContents.size(), localFile.GetSize(MapFileType::Map), ()); - localFile.DeleteFromDisk(MapOptions::Map); + localFile.DeleteFromDisk(MapFileType::Map); TEST(!testMapFile.Exists(), (testMapFile, "wasn't deleted by LocalCountryFile.")); testMapFile.Reset(); } @@ -147,7 +147,7 @@ UNIT_TEST(LocalCountryFile_CleanupMapFiles) ScopedFile brazilMapFile("Brazil.mwm", "content"); LocalCountryFile irelandLocalFile(dir4.GetFullPath(), irelandFile, 4 /* version */); - ScopedFile irelandMapFile(dir4, irelandFile, MapOptions::Map); + ScopedFile irelandMapFile(dir4, irelandFile, MapFileType::Map); // Check FindAllLocalMaps() vector localFiles; @@ -163,8 +163,8 @@ UNIT_TEST(LocalCountryFile_CleanupMapFiles) brazilMapFile.Reset(); irelandLocalFile.SyncWithDisk(); - TEST(irelandLocalFile.OnDisk(MapOptions::Map), ()); - irelandLocalFile.DeleteFromDisk(MapOptions::Map); + TEST(irelandLocalFile.OnDisk(MapFileType::Map), ()); + irelandLocalFile.DeleteFromDisk(MapFileType::Map); TEST(!irelandMapFile.Exists(), (irelandMapFile)); irelandMapFile.Reset(); @@ -227,8 +227,8 @@ UNIT_TEST(LocalCountryFile_DirectoryLookup) ScopedDir testDir("test-dir"); - ScopedFile testIrelandMapFile(testDir, irelandFile, MapOptions::Map); - ScopedFile testNetherlandsMapFile(testDir, netherlandsFile, MapOptions::Map); + ScopedFile testIrelandMapFile(testDir, irelandFile, MapFileType::Map); + ScopedFile testNetherlandsMapFile(testDir, netherlandsFile, MapFileType::Map); vector localFiles; FindAllLocalMapsInDirectoryAndCleanup(testDir.GetFullPath(), 150309 /* version */, @@ -260,7 +260,7 @@ UNIT_TEST(LocalCountryFile_AllLocalFilesLookup) settings::Delete("LastMigration"); - ScopedFile testItalyMapFile(testDir, italyFile, MapOptions::Map); + ScopedFile testItalyMapFile(testDir, italyFile, MapFileType::Map); vector localFiles; FindAllLocalMapsAndCleanup(10101 /* latestVersion */, localFiles); @@ -371,7 +371,7 @@ UNIT_TEST(LocalCountryFile_MakeTemporary) { string const path = GetPlatform().WritablePathForFile("minsk-pass" DATA_FILE_EXTENSION); LocalCountryFile file = LocalCountryFile::MakeTemporary(path); - TEST_EQUAL(file.GetPath(MapOptions::Map), path, ()); + TEST_EQUAL(file.GetPath(MapFileType::Map), path, ()); } } // namespace platform diff --git a/platform/platform_tests_support/scoped_file.cpp b/platform/platform_tests_support/scoped_file.cpp index 4b0824b3fa..d7445ae395 100644 --- a/platform/platform_tests_support/scoped_file.cpp +++ b/platform/platform_tests_support/scoped_file.cpp @@ -31,9 +31,9 @@ ScopedFile::ScopedFile(std::string const & relativePath, std::string const & con } ScopedFile::ScopedFile(ScopedDir const & dir, CountryFile const & countryFile, - MapOptions mapOptions) + MapFileType type) : ScopedFile( - base::JoinPath(dir.GetRelativePath(), GetFileName(countryFile.GetName(), mapOptions, + base::JoinPath(dir.GetRelativePath(), GetFileName(countryFile.GetName(), type, version::FOR_TESTING_TWO_COMPONENT_MWM1)), Mode::Create) { diff --git a/platform/platform_tests_support/scoped_file.hpp b/platform/platform_tests_support/scoped_file.hpp index 28b12b89ed..229b274ed2 100644 --- a/platform/platform_tests_support/scoped_file.hpp +++ b/platform/platform_tests_support/scoped_file.hpp @@ -36,7 +36,7 @@ public: // Creates a scoped file in Mode::Create using the path inferred from |countryFile| // and |mapOptions|. - ScopedFile(ScopedDir const & dir, CountryFile const & countryFile, MapOptions mapOptions); + ScopedFile(ScopedDir const & dir, CountryFile const & countryFile, MapFileType type); ~ScopedFile(); diff --git a/qt/screenshoter.cpp b/qt/screenshoter.cpp index e419eb634b..4c58dc6c2d 100644 --- a/qt/screenshoter.cpp +++ b/qt/screenshoter.cpp @@ -128,7 +128,7 @@ void Screenshoter::PrepareCountries() { ChangeState(State::WaitCountries); m_countriesToDownload.insert(countryId); - storage.DownloadCountry(countryId, MapOptions::Map); + storage.DownloadCountry(countryId, MapFileType::Map); } } } diff --git a/routing/routing_integration_tests/get_altitude_test.cpp b/routing/routing_integration_tests/get_altitude_test.cpp index 6753c33b1d..4fe4891a70 100644 --- a/routing/routing_integration_tests/get_altitude_test.cpp +++ b/routing/routing_integration_tests/get_altitude_test.cpp @@ -58,7 +58,7 @@ void TestAltitudeOfAllMwmFeatures(string const & countryId, TAltitude const alti unique_ptr altitudeLoader = make_unique(dataSource, regResult.first /* mwmId */); - ForEachFromDat(country.GetPath(MapOptions::Map), [&](FeatureType & f, uint32_t const & id) { + ForEachFromDat(country.GetPath(MapFileType::Map), [&](FeatureType & f, uint32_t const & id) { if (!routing::IsRoad(TypesHolder(f))) return; diff --git a/search/search_integration_tests/generate_tests.cpp b/search/search_integration_tests/generate_tests.cpp index a7a032afbd..82881f30dd 100644 --- a/search/search_integration_tests/generate_tests.cpp +++ b/search/search_integration_tests/generate_tests.cpp @@ -86,6 +86,6 @@ UNIT_CLASS_TEST(GenerateTest, GenerateDeprecatedTypes) TEST_EQUAL(count, 3, ()); - file.DeleteFromDisk(MapOptions::Map); + file.DeleteFromDisk(MapFileType::Map); } } // namespace diff --git a/search/search_integration_tests/pre_ranker_test.cpp b/search/search_integration_tests/pre_ranker_test.cpp index f1a53da730..745a6dd88f 100644 --- a/search/search_integration_tests/pre_ranker_test.cpp +++ b/search/search_integration_tests/pre_ranker_test.cpp @@ -144,7 +144,7 @@ UNIT_CLASS_TEST(PreRankerTest, Smoke) vector distances(pois.size()); vector emit(pois.size()); - FeaturesVectorTest fv(mwmId.GetInfo()->GetLocalFile().GetPath(MapOptions::Map)); + FeaturesVectorTest fv(mwmId.GetInfo()->GetLocalFile().GetPath(MapFileType::Map)); fv.GetVector().ForEach([&](FeatureType & ft, uint32_t index) { FeatureID id(mwmId, index); ResultTracer::Provenance provenance; diff --git a/search/search_quality/helpers.cpp b/search/search_quality/helpers.cpp index 7012190091..fb56e9e7f6 100644 --- a/search/search_quality/helpers.cpp +++ b/search/search_quality/helpers.cpp @@ -46,7 +46,7 @@ uint64_t ReadVersionFromHeader(platform::LocalCountryFile const & mwm) return mwm.GetVersion(); } - ModelReaderPtr reader = FilesContainerR(mwm.GetPath(MapOptions::Map)).GetReader(VERSION_FILE_TAG); + ModelReaderPtr reader = FilesContainerR(mwm.GetPath(MapFileType::Map)).GetReader(VERSION_FILE_TAG); ReaderSrc src(reader.GetPtr()); version::MwmVersion version; diff --git a/storage/diff_scheme/diff_manager.cpp b/storage/diff_scheme/diff_manager.cpp index e5f3c1e9b1..3a56c568ca 100644 --- a/storage/diff_scheme/diff_manager.cpp +++ b/storage/diff_scheme/diff_manager.cpp @@ -51,12 +51,12 @@ void Manager::ApplyDiff(ApplyDiffParams && p, base::Cancellable const & cancella auto & diffReadyPath = p.m_diffReadyPath; auto & diffFile = p.m_diffFile; - auto const diffPath = diffFile->GetPath(MapOptions::Diff); + auto const diffPath = diffFile->GetPath(MapFileType::Diff); auto result = DiffApplicationResult::Failed; diffFile->SyncWithDisk(); - auto const isOnDisk = diffFile->OnDisk(MapOptions::Diff); + auto const isOnDisk = diffFile->OnDisk(MapFileType::Diff); auto const isFilePrepared = isOnDisk || base::RenameFileX(diffReadyPath, diffPath); if (isFilePrepared) @@ -65,8 +65,8 @@ void Manager::ApplyDiff(ApplyDiffParams && p, base::Cancellable const & cancella if (!isOnDisk) diffFile->SyncWithDisk(); - std::string const oldMwmPath = p.m_oldMwmFile->GetPath(MapOptions::Map); - std::string const newMwmPath = diffFile->GetPath(MapOptions::Map); + std::string const oldMwmPath = p.m_oldMwmFile->GetPath(MapFileType::Map); + std::string const newMwmPath = diffFile->GetPath(MapFileType::Map); std::string const diffApplyingInProgressPath = newMwmPath + DIFF_APPLYING_FILE_EXTENSION; result = generator::mwm_diff::ApplyDiff(oldMwmPath, diffApplyingInProgressPath, diffPath, @@ -86,7 +86,7 @@ void Manager::ApplyDiff(ApplyDiffParams && p, base::Cancellable const & cancella switch (result) { case DiffApplicationResult::Ok: - diffFile->DeleteFromDisk(MapOptions::Diff); + diffFile->DeleteFromDisk(MapFileType::Diff); break; case DiffApplicationResult::Cancelled: // The diff file will be deleted by storage. @@ -94,7 +94,7 @@ void Manager::ApplyDiff(ApplyDiffParams && p, base::Cancellable const & cancella // of interacting with storage are much harder to be taken into account that way. break; case DiffApplicationResult::Failed: - diffFile->DeleteFromDisk(MapOptions::Diff); + diffFile->DeleteFromDisk(MapFileType::Diff); alohalytics::Stats::Instance().LogEvent( "Downloader_DiffScheme_error", {{"type", "patching"}, diff --git a/storage/queued_country.cpp b/storage/queued_country.cpp index b4719eb7fc..e543b345fa 100644 --- a/storage/queued_country.cpp +++ b/storage/queued_country.cpp @@ -4,19 +4,29 @@ namespace storage { -QueuedCountry::QueuedCountry(CountryId const & countryId, MapOptions opt) - : m_countryId(countryId), m_downloadingType(opt) +QueuedCountry::QueuedCountry(CountryId const & countryId, MapFileType type) + : m_countryId(countryId), m_fileType(type) { ASSERT(IsCountryIdValid(GetCountryId()), ("Only valid countries may be downloaded.")); } -void QueuedCountry::SetDownloadingType(MapOptions type) +void QueuedCountry::SetFileType(MapFileType type) { - m_downloadingType = type; + m_fileType = type; } -MapOptions QueuedCountry::GetDownloadingType() const +MapFileType QueuedCountry::GetFileType() const { - return m_downloadingType; + return m_fileType; +} + +CountryId const & QueuedCountry::GetCountryId() const +{ + return m_countryId; +} + +bool QueuedCountry::operator==(CountryId const & countryId) const +{ + return m_countryId == countryId; } } // namespace storage diff --git a/storage/queued_country.hpp b/storage/queued_country.hpp index 4499dd472e..f02a1e3a12 100644 --- a/storage/queued_country.hpp +++ b/storage/queued_country.hpp @@ -9,17 +9,16 @@ namespace storage class QueuedCountry { public: - QueuedCountry(CountryId const & m_countryId, MapOptions opt); + QueuedCountry(CountryId const & m_countryId, MapFileType type); - void SetDownloadingType(MapOptions type); - MapOptions GetDownloadingType() const; + void SetFileType(MapFileType type); + MapFileType GetFileType() const; - CountryId const & GetCountryId() const { return m_countryId; } - - inline bool operator==(CountryId const & countryId) const { return m_countryId == countryId; } + CountryId const & GetCountryId() const; + bool operator==(CountryId const & countryId) const; private: CountryId m_countryId; - MapOptions m_downloadingType; + MapFileType m_fileType; }; } // namespace storage diff --git a/storage/storage.cpp b/storage/storage.cpp index 37156e2f32..8c4c804a72 100644 --- a/storage/storage.cpp +++ b/storage/storage.cpp @@ -49,10 +49,10 @@ void DeleteCountryIndexes(LocalCountryFile const & localFile) platform::CountryIndexes::DeleteFromDisk(localFile); } -void DeleteFromDiskWithIndexes(LocalCountryFile const & localFile, MapOptions options) +void DeleteFromDiskWithIndexes(LocalCountryFile const & localFile, MapFileType type) { DeleteCountryIndexes(localFile); - localFile.DeleteFromDisk(options); + localFile.DeleteFromDisk(type); } CountryTree::Node const & LeafNodeFromCountryId(CountryTree const & root, @@ -154,8 +154,8 @@ void Storage::DeleteAllLocalMaps(CountriesVec * existedCountries /* = nullptr */ if (existedCountries) existedCountries->push_back(localFiles.first); localFile->SyncWithDisk(); - DeleteFromDiskWithIndexes(*localFile, MapOptions::Map); - DeleteFromDiskWithIndexes(*localFile, MapOptions::Diff); + DeleteFromDiskWithIndexes(*localFile, MapFileType::Map); + DeleteFromDiskWithIndexes(*localFile, MapFileType::Diff); } } } @@ -204,10 +204,10 @@ void Storage::Migrate(CountriesVec const & existedCountries) for (auto const & countryId : prefetchedMaps) { string prefetchedFilename = - m_prefetchStorage->GetLatestLocalFile(countryId)->GetPath(MapOptions::Map); + m_prefetchStorage->GetLatestLocalFile(countryId)->GetPath(MapFileType::Map); CountryFile const countryFile = GetCountryFile(countryId); auto localFile = PreparePlaceForCountryFiles(GetCurrentDataVersion(), m_dataDir, countryFile); - string localFilename = localFile->GetPath(MapOptions::Map); + string localFilename = localFile->GetPath(MapFileType::Map); LOG_SHORT(LINFO, ("Move", prefetchedFilename, "to", localFilename)); base::RenameFileX(prefetchedFilename, localFilename); } @@ -274,8 +274,8 @@ void Storage::RegisterAllLocalMaps(bool enableDiffs) LOG(LINFO, ("Removing obsolete", localFile)); localFile.SyncWithDisk(); - DeleteFromDiskWithIndexes(localFile, MapOptions::Map); - DeleteFromDiskWithIndexes(localFile, MapOptions::Diff); + DeleteFromDiskWithIndexes(localFile, MapFileType::Map); + DeleteFromDiskWithIndexes(localFile, MapFileType::Diff); ++j; } @@ -384,7 +384,7 @@ LocalAndRemoteSize Storage::CountrySizeInBytes(CountryId const & countryId) cons CountryFile const & countryFile = GetCountryFile(countryId); if (queuedCountry == nullptr) { - return LocalAndRemoteSize(localFile ? localFile->GetSize(MapOptions::Map) : 0, + return LocalAndRemoteSize(localFile ? localFile->GetSize(MapFileType::Map) : 0, GetRemoteSize(countryFile, GetCurrentDataVersion())); } @@ -470,7 +470,7 @@ Status Storage::CountryStatusEx(CountryId const & countryId) const return status; auto localFile = GetLatestLocalFile(countryId); - if (!localFile || !localFile->OnDisk(MapOptions::Map)) + if (!localFile || !localFile->OnDisk(MapFileType::Map)) return Status::ENotDownloaded; auto const & countryFile = GetCountryFile(countryId); @@ -482,14 +482,13 @@ Status Storage::CountryStatusEx(CountryId const & countryId) const return Status::EOnDisk; } -void Storage::CountryStatusEx(CountryId const & countryId, Status & status, - MapOptions & options) const +void Storage::CountryStatusEx(CountryId const & countryId, Status & status, MapFileType & type) const { status = CountryStatusEx(countryId); if (status == Status::EOnDisk || status == Status::EOnDiskOutOfDate) { - options = MapOptions::Map; + type = MapFileType::Map; ASSERT(GetLatestLocalFile(countryId), ("Invariant violation: local file out of sync with disk.")); } @@ -506,7 +505,7 @@ void Storage::SaveDownloadQueue() ostringstream update; for (auto const & item : m_queue) { - auto & ss = item.GetDownloadingType() == MapOptions::Diff ? update : download; + auto & ss = item.GetFileType() == MapFileType::Diff ? update : download; ss << (ss.str().empty() ? "" : ";") << item.GetCountryId(); } @@ -543,7 +542,7 @@ void Storage::RestoreDownloadQueue() parse(update, true /* isUpdate */); } -void Storage::DownloadCountry(CountryId const & countryId, MapOptions opt) +void Storage::DownloadCountry(CountryId const & countryId, MapFileType type) { CHECK_THREAD_CHECKER(m_threadChecker, ()); @@ -551,7 +550,7 @@ void Storage::DownloadCountry(CountryId const & countryId, MapOptions opt) return; m_failedCountries.erase(countryId); - m_queue.push_back(QueuedCountry(countryId, opt)); + m_queue.push_back(QueuedCountry(countryId, type)); if (m_queue.size() == 1) { if (m_startDownloadingCallback) @@ -565,13 +564,13 @@ void Storage::DownloadCountry(CountryId const & countryId, MapOptions opt) SaveDownloadQueue(); } -void Storage::DeleteCountry(CountryId const & countryId, MapOptions opt) +void Storage::DeleteCountry(CountryId const & countryId, MapFileType type) { ASSERT(m_willDelete != nullptr, ("Storage::Init wasn't called")); LocalFilePtr localFile = GetLatestLocalFile(countryId); bool const deferredDelete = m_willDelete(countryId, localFile); - DeleteCountryFiles(countryId, opt, deferredDelete); + DeleteCountryFiles(countryId, type, deferredDelete); DeleteCountryFilesFromDownloader(countryId); m_diffManager.RemoveDiffForCountry(countryId); @@ -583,8 +582,8 @@ void Storage::DeleteCustomCountryVersion(LocalCountryFile const & localFile) CHECK_THREAD_CHECKER(m_threadChecker, ()); CountryFile const countryFile = localFile.GetCountryFile(); - DeleteFromDiskWithIndexes(localFile, MapOptions::Map); - DeleteFromDiskWithIndexes(localFile, MapOptions::Diff); + DeleteFromDiskWithIndexes(localFile, MapFileType::Map); + DeleteFromDiskWithIndexes(localFile, MapFileType::Diff); { auto it = m_localFilesForFakeCountries.find(countryFile); @@ -657,7 +656,7 @@ void Storage::DownloadNextCountryFromQueue() if (stopDownload || !PreparePlaceForCountryFiles(GetCurrentDataVersion(), m_dataDir, GetCountryFile(countryId))) { - OnMapDownloadFinished(countryId, HttpRequest::Status::Failed, queuedCountry.GetDownloadingType()); + OnMapDownloadFinished(countryId, HttpRequest::Status::Failed, queuedCountry.GetFileType()); return; } @@ -670,7 +669,7 @@ void Storage::DownloadNextCountryFromQueue() void Storage::DownloadNextFile(QueuedCountry const & country) { CountryId const & countryId = country.GetCountryId(); - auto const opt = country.GetDownloadingType(); + auto const opt = country.GetFileType(); string const readyFilePath = GetFileDownloadPath(countryId, opt); uint64_t size; @@ -681,7 +680,7 @@ void Storage::DownloadNextFile(QueuedCountry const & country) // the diff file which is ready to apply. // If there is a such file we have to cause the success download scenario. bool isDownloadedDiff = false; - if (opt == MapOptions::Diff) + if (opt == MapFileType::Diff) { string filePath = readyFilePath; base::GetNameWithoutExt(filePath); @@ -779,7 +778,7 @@ void Storage::OnMapFileDownloadFinished(HttpRequest::Status status, // Send statistics to PushWoosh. We send these statistics only for the newly downloaded // mwms, not for updated ones. - if (success && queuedCountry.GetDownloadingType() != MapOptions::Diff) + if (success && queuedCountry.GetFileType() != MapFileType::Diff) { auto const it = m_localFiles.find(countryId); if (it == m_localFiles.end()) @@ -792,7 +791,7 @@ void Storage::OnMapFileDownloadFinished(HttpRequest::Status status, } } - OnMapDownloadFinished(countryId, status, queuedCountry.GetDownloadingType()); + OnMapDownloadFinished(countryId, status, queuedCountry.GetFileType()); } void Storage::ReportProgress(CountryId const & countryId, MapFilesDownloader::Progress const & p) @@ -835,7 +834,7 @@ void Storage::DoDownload() return; QueuedCountry & queuedCountry = m_queue.front(); - if (queuedCountry.GetDownloadingType() == MapOptions::Diff) + if (queuedCountry.GetFileType() == MapFileType::Diff) { using diffs::Status; auto const status = m_diffManager.GetStatus(); @@ -843,17 +842,17 @@ void Storage::DoDownload() { case Status::Undefined: SetDeferDownloading(); return; case Status::NotAvailable: - queuedCountry.SetDownloadingType(MapOptions::Map); + queuedCountry.SetFileType(MapFileType::Map); break; case Status::Available: if (!m_diffManager.HasDiffFor(queuedCountry.GetCountryId())) - queuedCountry.SetDownloadingType(MapOptions::Map); + queuedCountry.SetFileType(MapFileType::Map); break; } } auto const & id = queuedCountry.GetCountryId(); - auto const options = queuedCountry.GetDownloadingType(); + auto const options = queuedCountry.GetFileType(); auto const relativeUrl = GetDownloadRelativeUrl(id, options); auto const filePath = GetFileDownloadPath(id, options); @@ -894,14 +893,14 @@ void Storage::OnMapFileDownloadProgress(MapFilesDownloader::Progress const & pro ReportProgressForHierarchy(m_queue.front().GetCountryId(), progress); } -void Storage::RegisterDownloadedFiles(CountryId const & countryId, MapOptions options) +void Storage::RegisterDownloadedFiles(CountryId const & countryId, MapFileType type) { CHECK_THREAD_CHECKER(m_threadChecker, ()); - auto const fn = [this, countryId, options](bool isSuccess) { + auto const fn = [this, countryId, type](bool isSuccess) { CHECK_THREAD_CHECKER(m_threadChecker, ()); - LOG(LINFO, ("Registering downloaded file:", countryId, options, "; success:", isSuccess)); + LOG(LINFO, ("Registering downloaded file:", countryId, type, "; success:", isSuccess)); if (!isSuccess) { @@ -924,7 +923,7 @@ void Storage::RegisterDownloadedFiles(CountryId const & countryId, MapOptions op DownloadNextCountryFromQueue(); }; - if (options == MapOptions::Diff) + if (type == MapFileType::Diff) { ApplyDiff(countryId, fn); return; @@ -937,26 +936,23 @@ void Storage::RegisterDownloadedFiles(CountryId const & countryId, MapOptions op if (!localFile) { LOG(LERROR, ("Local file data structure can't be prepared for downloaded file(", countryFile, - options, ").")); + type, ").")); fn(false /* isSuccess */); return; } - if (options == MapOptions::Map) + string const path = GetFileDownloadPath(countryId, type); + if (!base::RenameFileX(path, localFile->GetPath(type))) { - string const path = GetFileDownloadPath(countryId, options); - if (!base::RenameFileX(path, localFile->GetPath(options))) - { - localFile->DeleteFromDisk(options); - fn(false); - return; - } + localFile->DeleteFromDisk(type); + fn(false); + return; } static string const kSourceKey = "map"; if (m_integrityValidationEnabled && !ValidateIntegrity(localFile, countryId, kSourceKey)) { - base::DeleteFileX(localFile->GetPath(MapOptions::Map)); + base::DeleteFileX(localFile->GetPath(MapFileType::Map)); fn(false /* isSuccess */); return; } @@ -966,7 +962,7 @@ void Storage::RegisterDownloadedFiles(CountryId const & countryId, MapOptions op } void Storage::OnMapDownloadFinished(CountryId const & countryId, HttpRequest::Status status, - MapOptions options) + MapFileType type) { CHECK_THREAD_CHECKER(m_threadChecker, ()); ASSERT(m_didDownload != nullptr, ("Storage::Init wasn't called")); @@ -976,13 +972,13 @@ void Storage::OnMapDownloadFinished(CountryId const & countryId, HttpRequest::St {{"name", countryId}, {"status", status == HttpRequest::Status::Completed ? "ok" : "failed"}, {"version", strings::to_string(GetCurrentDataVersion())}, - {"option", DebugPrint(options)}})); + {"option", DebugPrint(type)}})); GetPlatform().GetMarketingService().SendMarketingEvent(marketing::kDownloaderMapActionFinished, {{"action", "download"}}); if (status != HttpRequest::Status::Completed) { - if (status == HttpRequest::Status::FileNotFound && options == MapOptions::Diff) + if (status == HttpRequest::Status::FileNotFound && type == MapFileType::Diff) { m_diffManager.AbortDiffScheme(); NotifyStatusChanged(GetRootId()); @@ -992,17 +988,17 @@ void Storage::OnMapDownloadFinished(CountryId const & countryId, HttpRequest::St return; } - RegisterDownloadedFiles(countryId, options); + RegisterDownloadedFiles(countryId, type); } -string Storage::GetDownloadRelativeUrl(CountryId const & countryId, MapOptions options) const +string Storage::GetDownloadRelativeUrl(CountryId const & countryId, MapFileType type) const { auto const & countryFile = GetCountryFile(countryId); auto const dataVersion = GetCurrentDataVersion(); - auto const fileName = GetFileName(countryFile.GetName(), options, dataVersion); + auto const fileName = GetFileName(countryFile.GetName(), type, dataVersion); uint64_t diffVersion = 0; - if (options == MapOptions::Diff) + if (type == MapFileType::Diff) CHECK(m_diffManager.VersionFor(countryId, diffVersion), ()); return MapFilesDownloader::MakeRelativeUrl(fileName, dataVersion, diffVersion); @@ -1153,7 +1149,7 @@ void Storage::RegisterFakeCountryFiles(platform::LocalCountryFile const & localF m_localFilesForFakeCountries[fakeCountryLocalFile->GetCountryFile()] = fakeCountryLocalFile; } -void Storage::DeleteCountryFiles(CountryId const & countryId, MapOptions opt, bool deferredDelete) +void Storage::DeleteCountryFiles(CountryId const & countryId, MapFileType type, bool deferredDelete) { auto const it = m_localFiles.find(countryId); if (it == m_localFiles.end()) @@ -1168,7 +1164,7 @@ void Storage::DeleteCountryFiles(CountryId const & countryId, MapOptions opt, bo auto & localFiles = it->second; for (auto & localFile : localFiles) { - DeleteFromDiskWithIndexes(*localFile, opt); + DeleteFromDiskWithIndexes(*localFile, type); localFile->SyncWithDisk(); if (!localFile->HasFiles()) localFile.reset(); @@ -1221,7 +1217,7 @@ uint64_t Storage::GetDownloadSize(QueuedCountry const & queuedCountry) const { CountryId const & countryId = queuedCountry.GetCountryId(); uint64_t size; - if (queuedCountry.GetDownloadingType() == MapOptions::Diff) + if (queuedCountry.GetFileType() == MapFileType::Diff) { CHECK(m_diffManager.SizeToDownloadFor(countryId, size), ()); return size; @@ -1231,10 +1227,10 @@ uint64_t Storage::GetDownloadSize(QueuedCountry const & queuedCountry) const return GetRemoteSize(file, GetCurrentDataVersion()); } -string Storage::GetFileDownloadPath(CountryId const & countryId, MapOptions options) const +string Storage::GetFileDownloadPath(CountryId const & countryId, MapFileType type) const { return platform::GetFileDownloadPath(GetCurrentDataVersion(), m_dataDir, - GetCountryFile(countryId), options); + GetCountryFile(countryId), type); } bool Storage::CheckFailedCountries(CountriesVec const & countries) const @@ -1380,7 +1376,7 @@ void Storage::DownloadNode(CountryId const & countryId, bool isUpdate /* = false if (descendantNode.ChildrenCount() == 0 && GetNodeStatus(descendantNode).status != NodeStatus::OnDisk) { - DownloadCountry(descendantNode.Value().Name(), isUpdate ? MapOptions::Diff : MapOptions::Map); + DownloadCountry(descendantNode.Value().Name(), isUpdate ? MapFileType::Diff : MapFileType::Map); } }; @@ -1399,7 +1395,7 @@ void Storage::DeleteNode(CountryId const & countryId) auto deleteAction = [this](CountryTree::Node const & descendantNode) { bool onDisk = m_localFiles.find(descendantNode.Value().Name()) != m_localFiles.end(); if (descendantNode.ChildrenCount() == 0 && onDisk) - this->DeleteCountry(descendantNode.Value().Name(), MapOptions::Map); + this->DeleteCountry(descendantNode.Value().Name(), MapFileType::Map); }; node->ForEachInSubtree(deleteAction); } @@ -1473,7 +1469,7 @@ void Storage::ApplyDiff(CountryId const & countryId, functionGetCountryName(), kSourceKey)) { GetPlatform().RunTask(Platform::Thread::File, - [path = diffFile->GetPath(MapOptions::Map)] { base::DeleteFileX(path); }); + [path = diffFile->GetPath(MapFileType::Map)] { base::DeleteFileX(path); }); result = DiffApplicationResult::Failed; } @@ -1504,7 +1500,7 @@ void Storage::ApplyDiff(CountryId const & countryId, functionGetPath(MapOptions::Map)); + Platform::DisableBackupForFile(diffFile->GetPath(MapFileType::Map)); m_diffManager.MarkAsApplied(countryId); fn(true); break; @@ -1568,7 +1564,7 @@ void Storage::OnDiffStatusReceived(diffs::NameDiffInfoMap && diffs) if (m_diffManager.HasDiffFor(countryId)) UpdateNode(countryId); else - localDiff.DeleteFromDisk(MapOptions::Diff); + localDiff.DeleteFromDisk(MapFileType::Diff); } m_notAppliedDiffs.clear(); @@ -1704,7 +1700,7 @@ void Storage::GetNodeAttrs(CountryId const & countryId, NodeAttrs & nodeAttrs) c return; nodeAttrs.m_localMwmCounter += 1; - nodeAttrs.m_localMwmSize += localFile->GetSize(MapOptions::Map); + nodeAttrs.m_localMwmSize += localFile->GetSize(MapFileType::Map); }); nodeAttrs.m_present = m_localFiles.find(countryId) != m_localFiles.end(); diff --git a/storage/storage.hpp b/storage/storage.hpp index 2d0fb26fe7..ab8379573e 100644 --- a/storage/storage.hpp +++ b/storage/storage.hpp @@ -294,10 +294,10 @@ private: /// during the downloading process. void OnMapFileDownloadProgress(MapFilesDownloader::Progress const & progress); - void RegisterDownloadedFiles(CountryId const & countryId, MapOptions files); + void RegisterDownloadedFiles(CountryId const & countryId, MapFileType type); void OnMapDownloadFinished(CountryId const & countryId, downloader::HttpRequest::Status status, - MapOptions files); + MapFileType type); /// Initiates downloading of the next file from the queue. void DownloadNextFile(QueuedCountry const & country); @@ -557,11 +557,11 @@ public: /// Puts country denoted by countryId into the downloader's queue. /// During downloading process notifies observers about downloading /// progress and status changes. - void DownloadCountry(CountryId const & countryId, MapOptions opt); + void DownloadCountry(CountryId const & countryId, MapFileType type); /// Removes country files (for all versions) from the device. /// Notifies observers about country status change. - void DeleteCountry(CountryId const & countryId, MapOptions opt); + void DeleteCountry(CountryId const & countryId, MapFileType type); /// Removes country files of a particular version from the device. /// Notifies observers about country status change. @@ -572,7 +572,7 @@ public: CountryId GetCurrentDownloadingCountryId() const; void EnableKeepDownloadingQueue(bool enable) {m_keepDownloadingQueue = enable;} - std::string GetDownloadRelativeUrl(CountryId const & countryId, MapOptions options) const; + std::string GetDownloadRelativeUrl(CountryId const & countryId, MapFileType type) const; /// @param[out] res Populated with oudated countries. void GetOutdatedCountries(std::vector & countries) const; @@ -638,7 +638,7 @@ private: void RegisterFakeCountryFiles(platform::LocalCountryFile const & localFile); // Removes disk files for all versions of a country. - void DeleteCountryFiles(CountryId const & countryId, MapOptions opt, bool deferredDelete); + void DeleteCountryFiles(CountryId const & countryId, MapFileType type, bool deferredDelete); // Removes country files from downloader. bool DeleteCountryFilesFromDownloader(CountryId const & countryId); @@ -649,9 +649,9 @@ private: // Returns a path to a place on disk downloader can use for // downloaded files. - std::string GetFileDownloadPath(CountryId const & countryId, MapOptions file) const; + std::string GetFileDownloadPath(CountryId const & countryId, MapFileType file) const; - void CountryStatusEx(CountryId const & countryId, Status & status, MapOptions & options) const; + void CountryStatusEx(CountryId const & countryId, Status & status, MapFileType & type) const; /// Fast version, doesn't check if country is out of date Status CountryStatus(CountryId const & countryId) const; diff --git a/storage/storage_integration_tests/storage_downloading_tests.cpp b/storage/storage_integration_tests/storage_downloading_tests.cpp index 40bed26ebf..d5e2780441 100644 --- a/storage/storage_integration_tests/storage_downloading_tests.cpp +++ b/storage/storage_integration_tests/storage_downloading_tests.cpp @@ -153,7 +153,7 @@ UNIT_CLASS_TEST(Runner, DownloadIntegrity_Test) testing::RunEventLoop(); auto localFile = storage.GetLatestLocalFile(kCountryId); - mapPath = localFile->GetPath(MapOptions::Map); + mapPath = localFile->GetPath(MapFileType::Map); mapHash = coding::SHA1::Calculate(mapPath); } TEST_NOT_EQUAL(mapHash, coding::SHA1::Hash(), ()); diff --git a/storage/storage_tests/storage_tests.cpp b/storage/storage_tests/storage_tests.cpp index 019dc0bcf1..438df2baf0 100644 --- a/storage/storage_tests/storage_tests.cpp +++ b/storage/storage_tests/storage_tests.cpp @@ -279,12 +279,12 @@ bool ParentOf(Storage const & storage, string const & parent, string const & cou class CountryDownloaderChecker { public: - CountryDownloaderChecker(Storage & storage, CountryId const & countryId, MapOptions files, + CountryDownloaderChecker(Storage & storage, CountryId const & countryId, MapFileType type, vector const & transitionList) : m_storage(storage) , m_countryId(countryId) , m_countryFile(storage.GetCountryFile(m_countryId)) - , m_files(files) + , m_type(type) , m_bytesDownloaded(0) , m_totalBytesToDownload(0) , m_slot(0) @@ -309,7 +309,7 @@ public: TEST_EQUAL(0, m_currStatus, (m_countryFile)); TEST_LESS(m_currStatus, m_transitionList.size(), (m_countryFile)); TEST_EQUAL(m_transitionList[m_currStatus], m_storage.CountryStatusEx(m_countryId), (m_countryFile)); - m_storage.DownloadCountry(m_countryId, m_files); + m_storage.DownloadCountry(m_countryId, m_type); } protected: @@ -352,7 +352,7 @@ protected: Storage & m_storage; CountryId const m_countryId; CountryFile const m_countryFile; - MapOptions const m_files; + MapFileType const m_type; int64_t m_bytesDownloaded; int64_t m_totalBytesToDownload; int m_slot; @@ -367,8 +367,8 @@ public: CancelDownloadingWhenAlmostDoneChecker(Storage & storage, CountryId const & countryId, TaskRunner & runner) : CountryDownloaderChecker( - storage, countryId, MapOptions::Map, - vector{Status::ENotDownloaded, Status::EDownloading, Status::ENotDownloaded}) + storage, countryId, MapFileType::Map, + vector{Status::ENotDownloaded, Status::EDownloading, Status::ENotDownloaded}) , m_runner(runner) { } @@ -397,10 +397,10 @@ protected: // NotDownloaded -> Downloading -> OnDisk. unique_ptr AbsentCountryDownloaderChecker(Storage & storage, CountryId const & countryId, - MapOptions files) + MapFileType type) { return make_unique( - storage, countryId, files, + storage, countryId, type, vector{Status::ENotDownloaded, Status::EDownloading, Status::EOnDisk}); } @@ -408,10 +408,10 @@ unique_ptr AbsentCountryDownloaderChecker(Storage & st // NotDownloaded -> InQueue -> Downloading -> OnDisk. unique_ptr QueuedCountryDownloaderChecker(Storage & storage, CountryId const & countryId, - MapOptions files) + MapFileType type) { return make_unique( - storage, countryId, files, vector{Status::ENotDownloaded, Status::EInQueue, + storage, countryId, type, vector{Status::ENotDownloaded, Status::EInQueue, Status::EDownloading, Status::EOnDisk}); } @@ -419,10 +419,10 @@ unique_ptr QueuedCountryDownloaderChecker(Storage & st // NotDownloaded -> Downloading -> NotDownloaded. unique_ptr CancelledCountryDownloaderChecker(Storage & storage, CountryId const & countryId, - MapOptions files) + MapFileType type) { return make_unique( - storage, countryId, files, + storage, countryId, type, vector{Status::ENotDownloaded, Status::EDownloading, Status::ENotDownloaded}); } @@ -530,12 +530,12 @@ LocalFilePtr CreateDummyMapFile(CountryFile const & countryFile, int64_t version TEST(localFile.get(), ("Can't prepare place for", countryFile, "(version", version, ")")); { string const zeroes(size, '\0'); - FileWriter writer(localFile->GetPath(MapOptions::Map)); + FileWriter writer(localFile->GetPath(MapFileType::Map)); writer.Write(zeroes.data(), zeroes.size()); } localFile->SyncWithDisk(); - TEST(localFile->OnDisk(MapOptions::Map), ()); - TEST_EQUAL(size, localFile->GetSize(MapOptions::Map), ()); + TEST(localFile->OnDisk(MapFileType::Map), ()); + TEST_EQUAL(size, localFile->GetSize(MapFileType::Map), ()); return localFile; } @@ -583,7 +583,7 @@ UNIT_TEST(StorageTest_Smoke) CountryId const georgiaCountryId = storage.FindCountryIdByFile("Georgia"); TEST(IsCountryIdValid(georgiaCountryId), ()); CountryFile usaGeorgiaFile = storage.GetCountryFile(georgiaCountryId); - TEST_EQUAL(platform::GetFileName(usaGeorgiaFile.GetName(), MapOptions::Map, + TEST_EQUAL(platform::GetFileName(usaGeorgiaFile.GetName(), MapFileType::Map, version::FOR_TESTING_TWO_COMPONENT_MWM1), "Georgia" DATA_FILE_EXTENSION, ()); } @@ -595,22 +595,22 @@ UNIT_CLASS_TEST(StorageTest, CountryDownloading) TEST(IsCountryIdValid(azerbaijanCountryId), ()); CountryFile azerbaijanFile = storage.GetCountryFile(azerbaijanCountryId); - storage.DeleteCountry(azerbaijanCountryId, MapOptions::Map); + storage.DeleteCountry(azerbaijanCountryId, MapFileType::Map); { SCOPE_GUARD(cleanupCountryFiles, - bind(&Storage::DeleteCountry, &storage, azerbaijanCountryId, MapOptions::Map)); + bind(&Storage::DeleteCountry, &storage, azerbaijanCountryId, MapFileType::Map)); unique_ptr checker = - AbsentCountryDownloaderChecker(storage, azerbaijanCountryId, MapOptions::Map); + AbsentCountryDownloaderChecker(storage, azerbaijanCountryId, MapFileType::Map); checker->StartDownload(); runner.Run(); } { SCOPE_GUARD(cleanupCountryFiles, - bind(&Storage::DeleteCountry, &storage, azerbaijanCountryId, MapOptions::Map)); + bind(&Storage::DeleteCountry, &storage, azerbaijanCountryId, MapFileType::Map)); unique_ptr checker = - AbsentCountryDownloaderChecker(storage, azerbaijanCountryId, MapOptions::Map); + AbsentCountryDownloaderChecker(storage, azerbaijanCountryId, MapFileType::Map); checker->StartDownload(); runner.Run(); } @@ -620,20 +620,20 @@ UNIT_CLASS_TEST(TwoComponentStorageTest, CountriesDownloading) { CountryId const uruguayCountryId = storage.FindCountryIdByFile("Uruguay"); TEST(IsCountryIdValid(uruguayCountryId), ()); - storage.DeleteCountry(uruguayCountryId, MapOptions::Map); + storage.DeleteCountry(uruguayCountryId, MapFileType::Map); SCOPE_GUARD(cleanupUruguayFiles, - bind(&Storage::DeleteCountry, &storage, uruguayCountryId, MapOptions::Map)); + bind(&Storage::DeleteCountry, &storage, uruguayCountryId, MapFileType::Map)); CountryId const venezuelaCountryId = storage.FindCountryIdByFile("Venezuela"); TEST(IsCountryIdValid(venezuelaCountryId), ()); - storage.DeleteCountry(venezuelaCountryId, MapOptions::Map); + storage.DeleteCountry(venezuelaCountryId, MapFileType::Map); SCOPE_GUARD(cleanupVenezuelaFiles, - bind(&Storage::DeleteCountry, &storage, venezuelaCountryId, MapOptions::Map)); + bind(&Storage::DeleteCountry, &storage, venezuelaCountryId, MapFileType::Map)); unique_ptr uruguayChecker = - AbsentCountryDownloaderChecker(storage, uruguayCountryId, MapOptions::Map); + AbsentCountryDownloaderChecker(storage, uruguayCountryId, MapFileType::Map); unique_ptr venezuelaChecker = - QueuedCountryDownloaderChecker(storage, venezuelaCountryId, MapOptions::Map); + QueuedCountryDownloaderChecker(storage, venezuelaCountryId, MapFileType::Map); uruguayChecker->StartDownload(); venezuelaChecker->StartDownload(); runner.Run(); @@ -657,7 +657,7 @@ UNIT_TEST(StorageTest_DeleteTwoVersionsOfTheSameCountry) TEST(IsCountryIdValid(countryId), ()); CountryFile const countryFile = storage.GetCountryFile(countryId); - storage.DeleteCountry(countryId, MapOptions::Map); + storage.DeleteCountry(countryId, MapFileType::Map); LocalFilePtr latestLocalFile = storage.GetLatestLocalFile(countryId); TEST(!latestLocalFile.get(), ("Country wasn't deleted from disk.")); TEST_EQUAL(Status::ENotDownloaded, storage.CountryStatusEx(countryId), ()); @@ -676,7 +676,7 @@ UNIT_TEST(StorageTest_DeleteTwoVersionsOfTheSameCountry) TEST_EQUAL(latestLocalFile->GetVersion(), localFileV2->GetVersion(), ()); TEST_EQUAL(Status::EOnDiskOutOfDate, storage.CountryStatusEx(countryId), ()); - storage.DeleteCountry(countryId, MapOptions::Map); + storage.DeleteCountry(countryId, MapFileType::Map); localFileV1->SyncWithDisk(); TEST(!localFileV1->HasFiles(), ()); @@ -691,13 +691,13 @@ UNIT_CLASS_TEST(StorageTest, DeletePendingCountry) { CountryId const countryId = storage.FindCountryIdByFile("Azerbaijan"); TEST(IsCountryIdValid(countryId), ()); - storage.DeleteCountry(countryId, MapOptions::Map); + storage.DeleteCountry(countryId, MapFileType::Map); { unique_ptr checker = - CancelledCountryDownloaderChecker(storage, countryId, MapOptions::Map); + CancelledCountryDownloaderChecker(storage, countryId, MapFileType::Map); checker->StartDownload(); - storage.DeleteCountry(countryId, MapOptions::Map); + storage.DeleteCountry(countryId, MapFileType::Map); runner.Run(); } } @@ -709,24 +709,24 @@ UNIT_CLASS_TEST(TwoComponentStorageTest, CountriesAndDeleteSingleMwm) CountryId const uruguayCountryId = storage.FindCountryIdByFile("Uruguay"); TEST(IsCountryIdValid(uruguayCountryId), ()); - storage.DeleteCountry(uruguayCountryId, MapOptions::Map); + storage.DeleteCountry(uruguayCountryId, MapFileType::Map); SCOPE_GUARD(cleanupUruguayFiles, - bind(&Storage::DeleteCountry, &storage, uruguayCountryId, MapOptions::Map)); + bind(&Storage::DeleteCountry, &storage, uruguayCountryId, MapFileType::Map)); CountryId const venezuelaCountryId = storage.FindCountryIdByFile("Venezuela"); TEST(IsCountryIdValid(venezuelaCountryId), ()); - storage.DeleteCountry(venezuelaCountryId, MapOptions::Map); + storage.DeleteCountry(venezuelaCountryId, MapFileType::Map); SCOPE_GUARD(cleanupVenezuelaFiles, - bind(&Storage::DeleteCountry, &storage, venezuelaCountryId, MapOptions::Map)); + bind(&Storage::DeleteCountry, &storage, venezuelaCountryId, MapFileType::Map)); { unique_ptr uruguayChecker = make_unique( - storage, uruguayCountryId, MapOptions::Map, - vector{Status::ENotDownloaded, Status::EDownloading, Status::EOnDisk}); + storage, uruguayCountryId, MapFileType::Map, + vector{Status::ENotDownloaded, Status::EDownloading, Status::EOnDisk}); unique_ptr venezuelaChecker = make_unique( - storage, venezuelaCountryId, MapOptions::Map, - vector{Status::ENotDownloaded, Status::EInQueue, + storage, venezuelaCountryId, MapFileType::Map, + vector{Status::ENotDownloaded, Status::EInQueue, Status::EDownloading, Status::EOnDisk}); uruguayChecker->StartDownload(); @@ -736,15 +736,15 @@ UNIT_CLASS_TEST(TwoComponentStorageTest, CountriesAndDeleteSingleMwm) { unique_ptr uruguayChecker = make_unique( - storage, uruguayCountryId, MapOptions::Map, - vector{Status::EOnDisk, Status::ENotDownloaded}); + storage, uruguayCountryId, MapFileType::Map, + vector{Status::EOnDisk, Status::ENotDownloaded}); unique_ptr venezuelaChecker = make_unique( - storage, venezuelaCountryId, MapOptions::Map, - vector{Status::EOnDisk, Status::ENotDownloaded}); + storage, venezuelaCountryId, MapFileType::Map, + vector{Status::EOnDisk, Status::ENotDownloaded}); - storage.DeleteCountry(uruguayCountryId, MapOptions::Map); - storage.DeleteCountry(venezuelaCountryId, MapOptions::Map); + storage.DeleteCountry(uruguayCountryId, MapFileType::Map); + storage.DeleteCountry(venezuelaCountryId, MapFileType::Map); runner.Run(); } @@ -762,32 +762,32 @@ UNIT_CLASS_TEST(TwoComponentStorageTest, DownloadTwoCountriesAndDelete) CountryId const uruguayCountryId = storage.FindCountryIdByFile("Uruguay"); TEST(IsCountryIdValid(uruguayCountryId), ()); - storage.DeleteCountry(uruguayCountryId, MapOptions::Map); + storage.DeleteCountry(uruguayCountryId, MapFileType::Map); SCOPE_GUARD(cleanupUruguayFiles, bind(&Storage::DeleteCountry, &storage, uruguayCountryId, - MapOptions::Map)); + MapFileType::Map)); CountryId const venezuelaCountryId = storage.FindCountryIdByFile("Venezuela"); TEST(IsCountryIdValid(venezuelaCountryId), ()); - storage.DeleteCountry(venezuelaCountryId, MapOptions::Map); + storage.DeleteCountry(venezuelaCountryId, MapFileType::Map); SCOPE_GUARD(cleanupVenezuelaFiles, bind(&Storage::DeleteCountry, &storage, venezuelaCountryId, - MapOptions::Map)); + MapFileType::Map)); { // Map file will be deleted for Uruguay, thus, routing file should also be deleted. Therefore, // Uruguay should pass through following states: NotDownloaded -> Downloading -> NotDownloaded. unique_ptr uruguayChecker = make_unique( - storage, uruguayCountryId, MapOptions::Map, - vector{Status::ENotDownloaded, Status::EDownloading, Status::ENotDownloaded}); + storage, uruguayCountryId, MapFileType::Map, + vector{Status::ENotDownloaded, Status::EDownloading, Status::ENotDownloaded}); // Venezuela should pass through the following states: // NotDownloaded -> InQueue (Venezuela is added after Uruguay) -> Downloading -> NotDownloaded. unique_ptr venezuelaChecker = make_unique( - storage, venezuelaCountryId, MapOptions::Map, - vector{Status::ENotDownloaded, Status::EInQueue, Status::EDownloading, + storage, venezuelaCountryId, MapFileType::Map, + vector{Status::ENotDownloaded, Status::EInQueue, Status::EDownloading, Status::ENotDownloaded}); uruguayChecker->StartDownload(); venezuelaChecker->StartDownload(); - storage.DeleteCountry(uruguayCountryId, MapOptions::Map); - storage.DeleteCountry(venezuelaCountryId, MapOptions::Map); + storage.DeleteCountry(uruguayCountryId, MapFileType::Map); + storage.DeleteCountry(venezuelaCountryId, MapFileType::Map); runner.Run(); } @@ -802,8 +802,8 @@ UNIT_CLASS_TEST(StorageTest, CancelDownloadingWhenAlmostDone) { CountryId const countryId = storage.FindCountryIdByFile("Uruguay"); TEST(IsCountryIdValid(countryId), ()); - storage.DeleteCountry(countryId, MapOptions::Map); - SCOPE_GUARD(cleanupFiles, bind(&Storage::DeleteCountry, &storage, countryId, MapOptions::Map)); + storage.DeleteCountry(countryId, MapFileType::Map); + SCOPE_GUARD(cleanupFiles, bind(&Storage::DeleteCountry, &storage, countryId, MapFileType::Map)); { CancelDownloadingWhenAlmostDoneChecker checker(storage, countryId, runner); @@ -820,12 +820,12 @@ UNIT_CLASS_TEST(StorageTest, DeleteCountry) LocalCountryFile file = LocalCountryFile::MakeForTesting("Wonderland", version::FOR_TESTING_SINGLE_MWM1); { - FileWriter writer(file.GetPath(MapOptions::Map)); + FileWriter writer(file.GetPath(MapFileType::Map)); string const data = "mwm"; writer.Write(data.data(), data.size()); } file.SyncWithDisk(); - TEST(file.OnDisk(MapOptions::Map), ()); + TEST(file.OnDisk(MapFileType::Map), ()); CountryIndexes::PreparePlaceOnDisk(file); string const bitsPath = CountryIndexes::GetPath(file, CountryIndexes::Index::Bits); @@ -852,12 +852,12 @@ UNIT_CLASS_TEST(TwoComponentStorageTest, DeleteCountry) LocalCountryFile file = LocalCountryFile::MakeForTesting("Wonderland", version::FOR_TESTING_TWO_COMPONENT_MWM1); { - FileWriter writer(file.GetPath(MapOptions::Map)); + FileWriter writer(file.GetPath(MapFileType::Map)); string const data = "mwm"; writer.Write(data.data(), data.size()); } file.SyncWithDisk(); - TEST(file.OnDisk(MapOptions::Map), ()); + TEST(file.OnDisk(MapFileType::Map), ()); CountryIndexes::PreparePlaceOnDisk(file); string const bitsPath = CountryIndexes::GetPath(file, CountryIndexes::Index::Bits); @@ -898,13 +898,13 @@ UNIT_TEST(StorageTest_FailedDownloading) { FailedDownloadingWaiter waiter(storage, countryId); - storage.DownloadCountry(countryId, MapOptions::Map); + storage.DownloadCountry(countryId, MapFileType::Map); testing::RunEventLoop(); } // File wasn't downloaded, but temprorary downloader files must exist. string const downloadPath = - GetFileDownloadPath(storage.GetCurrentDataVersion(), countryFile, MapOptions::Map); + GetFileDownloadPath(storage.GetCurrentDataVersion(), countryFile, MapFileType::Map); TEST(!Platform::IsFileExistsByFullPath(downloadPath), ()); TEST(Platform::IsFileExistsByFullPath(downloadPath + DOWNLOADING_FILE_EXTENSION), ()); TEST(Platform::IsFileExistsByFullPath(downloadPath + RESUME_FILE_EXTENSION), ()); @@ -917,11 +917,11 @@ UNIT_TEST(StorageTest_ObsoleteMapsRemoval) CountryFile country("Azerbaijan"); tests_support::ScopedDir dir1("1"); - tests_support::ScopedFile map1(dir1, country, MapOptions::Map); + tests_support::ScopedFile map1(dir1, country, MapFileType::Map); LocalCountryFile file1(dir1.GetFullPath(), country, 1 /* version */); tests_support::ScopedDir dir2("2"); - tests_support::ScopedFile map2(dir2, country, MapOptions::Map); + tests_support::ScopedFile map2(dir2, country, MapFileType::Map); LocalCountryFile file2(dir2.GetFullPath(), country, 2 /* version */); TEST(map1.Exists(), ()); @@ -1002,22 +1002,22 @@ UNIT_CLASS_TEST(StorageTest, DownloadedMap) TEST(IsCountryIdValid(algeriaCentralCountryId), ()); TEST(IsCountryIdValid(algeriaCoastCountryId), ()); - storage.DeleteCountry(algeriaCentralCountryId, MapOptions::Map); - storage.DeleteCountry(algeriaCoastCountryId, MapOptions::Map); + storage.DeleteCountry(algeriaCentralCountryId, MapFileType::Map); + storage.DeleteCountry(algeriaCoastCountryId, MapFileType::Map); SCOPE_GUARD(cleanupAlgeriaCentral, - bind(&Storage::DeleteCountry, &storage, algeriaCentralCountryId, MapOptions::Map)); + bind(&Storage::DeleteCountry, &storage, algeriaCentralCountryId, MapFileType::Map)); SCOPE_GUARD(cleanupAlgeriaCoast, - bind(&Storage::DeleteCountry, &storage, algeriaCoastCountryId, MapOptions::Map)); + bind(&Storage::DeleteCountry, &storage, algeriaCoastCountryId, MapFileType::Map)); { auto algeriaCentralChecker = make_unique( - storage, algeriaCentralCountryId, MapOptions::Map, - vector{Status::ENotDownloaded, Status::EDownloading, Status::EOnDisk}); + storage, algeriaCentralCountryId, MapFileType::Map, + vector{Status::ENotDownloaded, Status::EDownloading, Status::EOnDisk}); auto algeriaCoastChecker = make_unique( - storage, algeriaCoastCountryId, MapOptions::Map, - vector{Status::ENotDownloaded, Status::EInQueue, + storage, algeriaCoastCountryId, MapFileType::Map, + vector{Status::ENotDownloaded, Status::EInQueue, Status::EDownloading, Status::EOnDisk}); algeriaCentralChecker->StartDownload(); @@ -1068,7 +1068,7 @@ UNIT_CLASS_TEST(StorageTest, DownloadedMap) TEST_EQUAL(downloadedWithKeep.size(), 0, (downloadedWithKeep)); TEST_EQUAL(availableWithKeep.size(), 0, (availableWithKeep)); - storage.DeleteCountry(algeriaCentralCountryId, MapOptions::Map); + storage.DeleteCountry(algeriaCentralCountryId, MapFileType::Map); // Storage::GetChildrenInGroups test when Algeria_Coast has been downloaded and // Algeria_Central has been deleted. storage.GetChildrenInGroups(rootCountryId, downloaded, available); @@ -1088,7 +1088,7 @@ UNIT_CLASS_TEST(StorageTest, DownloadedMap) TEST(!storage.IsNodeDownloaded("Algeria_Central"), ()); TEST(storage.IsNodeDownloaded("Algeria_Coast"), ()); - storage.DeleteCountry(algeriaCoastCountryId, MapOptions::Map); + storage.DeleteCountry(algeriaCoastCountryId, MapFileType::Map); // Storage::GetChildrenInGroups test when Algeria_Coast and Algeria_Central have been deleted. storage.GetChildrenInGroups(rootCountryId, downloaded, available); sort(downloaded.begin(), downloaded.end()); @@ -1106,13 +1106,13 @@ UNIT_CLASS_TEST(StorageTest, IsPointCoveredByDownloadedMaps) string const uruguayId = string("Uruguay"); m2::PointD const montevideoUruguay = MercatorBounds::FromLatLon(-34.8094, -56.1558); - storage.DeleteCountry(uruguayId, MapOptions::Map); + storage.DeleteCountry(uruguayId, MapFileType::Map); TEST(!storage::IsPointCoveredByDownloadedMaps(montevideoUruguay, storage, *countryInfoGetter), ()); { SCOPE_GUARD(cleanupCountryFiles, - bind(&Storage::DeleteCountry, &storage, uruguayId, MapOptions::Map)); - auto const checker = AbsentCountryDownloaderChecker(storage, uruguayId, MapOptions::Map); + bind(&Storage::DeleteCountry, &storage, uruguayId, MapFileType::Map)); + auto const checker = AbsentCountryDownloaderChecker(storage, uruguayId, MapFileType::Map); checker->StartDownload(); runner.Run(); TEST(storage::IsPointCoveredByDownloadedMaps(montevideoUruguay, storage, *countryInfoGetter), ()); @@ -1147,21 +1147,21 @@ UNIT_TEST(StorageTest_TwoInstance) InitStorage(storage2, runner2); string const uruguayId = string("Uruguay"); // This countryId is valid for single and two component mwms. - storage1.DeleteCountry(uruguayId, MapOptions::Map); + storage1.DeleteCountry(uruguayId, MapFileType::Map); { SCOPE_GUARD(cleanupCountryFiles, - bind(&Storage::DeleteCountry, &storage1, uruguayId, MapOptions::Map)); - auto const checker = AbsentCountryDownloaderChecker(storage1, uruguayId, MapOptions::Map); + bind(&Storage::DeleteCountry, &storage1, uruguayId, MapFileType::Map)); + auto const checker = AbsentCountryDownloaderChecker(storage1, uruguayId, MapFileType::Map); checker->StartDownload(); runner1.Run(); TEST(platform.IsFileExistsByFullPath(base::JoinPath(writableDir, versionDir1)), ()); } - storage2.DeleteCountry(uruguayId, MapOptions::Map); + storage2.DeleteCountry(uruguayId, MapFileType::Map); { SCOPE_GUARD(cleanupCountryFiles, - bind(&Storage::DeleteCountry, &storage2, uruguayId, MapOptions::Map)); - auto const checker = AbsentCountryDownloaderChecker(storage2, uruguayId, MapOptions::Map); + bind(&Storage::DeleteCountry, &storage2, uruguayId, MapFileType::Map)); + auto const checker = AbsentCountryDownloaderChecker(storage2, uruguayId, MapFileType::Map); checker->StartDownload(); runner2.Run(); TEST(platform.IsFileExistsByFullPath(base::JoinPath(writableDir, versionDir1)), ()); @@ -1342,8 +1342,8 @@ UNIT_TEST(StorageTest_GetUpdateInfoSingleMwm) country1.SyncWithDisk(); country2.SyncWithDisk(); - auto const country1Size = country1.GetSize(MapOptions::Map); - auto const country2Size = country2.GetSize(MapOptions::Map); + auto const country1Size = country1.GetSize(MapFileType::Map); + auto const country2Size = country2.GetSize(MapFileType::Map); Storage::UpdateInfo updateInfo; @@ -1761,7 +1761,7 @@ UNIT_TEST(StorageTest_FalsePolicy) { FailedDownloadingWaiter waiter(storage, countryId); - storage.DownloadCountry(countryId, MapOptions::Map); + storage.DownloadCountry(countryId, MapFileType::Map); } } diff --git a/traffic/traffic_info.cpp b/traffic/traffic_info.cpp index e94a7fca3a..2d085b3a32 100644 --- a/traffic/traffic_info.cpp +++ b/traffic/traffic_info.cpp @@ -104,7 +104,7 @@ TrafficInfo::TrafficInfo(MwmSet::MwmId const & mwmId, int64_t currentDataVersion LOG(LWARNING, ("Attempt to create a traffic info for dead mwm.")); return; } - string const mwmPath = mwmId.GetInfo()->GetLocalFile().GetPath(MapOptions::Map); + string const mwmPath = mwmId.GetInfo()->GetLocalFile().GetPath(MapFileType::Map); try { FilesContainerR rcont(mwmPath); diff --git a/ugc/ugc_tests/storage_tests.cpp b/ugc/ugc_tests/storage_tests.cpp index 824700ab7e..62288670b6 100644 --- a/ugc/ugc_tests/storage_tests.cpp +++ b/ugc/ugc_tests/storage_tests.cpp @@ -141,7 +141,7 @@ public: ~MwmBuilder() { platform::CountryIndexes::DeleteFromDisk(m_testMwm); - m_testMwm.DeleteFromDisk(MapOptions::Map); + m_testMwm.DeleteFromDisk(MapFileType::Map); } private: @@ -149,7 +149,7 @@ private: MwmSet::MwmId BuildMwm(BuilderFn const & fn) { - if (m_testMwm.OnDisk(MapOptions::Map)) + if (m_testMwm.OnDisk(MapFileType::Map)) Cleanup(m_testMwm); m_testMwm = platform::LocalCountryFile(GetPlatform().WritableDir(), @@ -192,7 +192,7 @@ private: { m_dataSource.DeregisterMap(map.GetCountryFile()); platform::CountryIndexes::DeleteFromDisk(map); - map.DeleteFromDisk(MapOptions::Map); + map.DeleteFromDisk(MapFileType::Map); } FrozenDataSource m_dataSource;