diff options
| author | Sergey Yershov <yershov@corp.mail.ru> | 2016-02-10 19:24:27 +0300 |
|---|---|---|
| committer | Sergey Yershov <yershov@corp.mail.ru> | 2016-03-23 16:22:41 +0300 |
| commit | ce262278776d99eeaab8f18217708804676fe05e (patch) | |
| tree | 6b15473c701e60537d5d4ed3620785ec3dd3d8bc /platform | |
| parent | f185191c34036b254e82bfba1bc1d6b7428eac68 (diff) | |
[new downloader][MAPSME-89] Fix delete non-existing files
Diffstat (limited to 'platform')
| -rw-r--r-- | platform/http_request.cpp | 4 | ||||
| -rw-r--r-- | platform/servers_list.cpp | 10 |
2 files changed, 6 insertions, 8 deletions
diff --git a/platform/http_request.cpp b/platform/http_request.cpp index 1787b05294..4afdbcffc5 100644 --- a/platform/http_request.cpp +++ b/platform/http_request.cpp @@ -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); diff --git a/platform/servers_list.cpp b/platform/servers_list.cpp index f705a6f3f2..a87485454a 100644 --- a/platform/servers_list.cpp +++ b/platform/servers_list.cpp @@ -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 |