pastk/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

[new downloader][MAPSME-89] Fix delete non-existing files

Browse source
This commit is contained in:
Sergey Yershov 2016-02-10 19:24:27 +03:00
parent f185191c34
commit ce26227877
3 changed files with 6 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
platform/http_request.cpp
View file

@ -277,7 +277,9 @@ class FileHttpRequest : public HttpRequest, public IHttpThreadCallback
(void)my::DeleteFileX(m_filePath + RESUME_FILE_EXTENSION);
// Rename finished file to it's original name.
(void)my::DeleteFileX(m_filePath);
uint64_t sz = 0;
if (my::GetFileSize(m_filePath, sz))
(void)my::DeleteFileX(m_filePath);
CHECK(my::RenameFileX(m_filePath + DOWNLOADING_FILE_EXTENSION, m_filePath), ());
DisableBackupForFile(m_filePath);

10
platform/servers_list.cpp
View file

@ -35,14 +35,10 @@ bool ParseServerList(string const & jsonStr, vector<string> & outUrls)
void GetServerListFromRequest(HttpRequest const & request, vector<string> & urls)
{
if (request.Status() == HttpRequest::ECompleted && ParseServerList(request.Data(), urls))
{
return;
}
else
{
VERIFY(ParseServerList(GetPlatform().DefaultUrlsJSON(), urls), ());
LOG(LWARNING, ("Can't get servers list from request, using default servers:", urls));
}
VERIFY(ParseServerList(GetPlatform().DefaultUrlsJSON(), urls), ());
LOG(LWARNING, ("Can't get servers list from request, using default servers:", urls));
}
} // namespace downloader

4
storage/storage_integration_tests/storage_http_tests.cpp
View file

@ -62,10 +62,6 @@ UNIT_TEST(StorageDownloadNodeAndDeleteNodeTests)
storage.SetDownloadingUrlsForTesting({kTestWebServer});
string const version = strings::to_string(storage.GetCurrentDataVersion());
tests_support::ScopedDir cleanupVersionDir(version);
MY_SCOPE_GUARD(cleanup,
bind(&Storage::DeleteNode, &storage, kCountryId));
DeleteDownloaderFilesForCountry(storage.GetCurrentDataVersion(),
kMapTestDir, CountryFile(kCountryId));
string const mwmFullPath = my::JoinFoldersToPath({GetPlatform().WritableDir(), version},
kCountryId + DATA_FILE_EXTENSION);