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

[new downloader] Fix error processing when device storage is full

Browse source
This commit is contained in:
Sergey Yershov 2016-03-22 12:06:07 +03:00
parent 8c49302db7
commit ce1d37afad
2 changed files with 24 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
platform/http_request.cpp
View file

@ -396,22 +396,6 @@ HttpRequest * HttpRequest::PostJson(string const & url, string const & postData,
return new MemoryHttpRequest(url, postData, onFinish, onProgress);
}
namespace
{
class ErrorHttpRequest : public HttpRequest
{
string m_filePath;
public:
ErrorHttpRequest(string const & filePath)
: HttpRequest(CallbackT(), CallbackT()), m_filePath(filePath)
{
m_status = EFailed;
}
virtual string const & Data() const { return m_filePath; }
};
}
HttpRequest * HttpRequest::GetFile(vector<string> const & urls,
string const & filePath, int64_t fileSize,
CallbackT const & onFinish, CallbackT const & onProgress,
@ -425,13 +409,8 @@ HttpRequest * HttpRequest::GetFile(vector<string> const & urls,
{
// Can't create or open file for writing.
LOG(LWARNING, ("Can't create file", filePath, "with size", fileSize, e.Msg()));
// Mark the end of download with error.
ErrorHttpRequest error(filePath);
onFinish(error);
return 0;
}
return nullptr;
}
} // namespace downloader

23
storage/http_map_files_downloader.cpp
View file

@ -8,6 +8,22 @@
#include "std/bind.hpp"
#include "base/string_utils.hpp"
namespace
{
class ErrorHttpRequest : public downloader::HttpRequest
{
string m_filePath;
public:
ErrorHttpRequest(string const & filePath)
: HttpRequest(CallbackT(), CallbackT()), m_filePath(filePath)
{
m_status = EFailed;
}
virtual string const & Data() const { return m_filePath; }
};
} // anonymous namespace
namespace storage
{
HttpMapFilesDownloader::~HttpMapFilesDownloader()
@ -33,6 +49,13 @@ void HttpMapFilesDownloader::DownloadMapFile(vector<string> const & urls, string
m_request.reset(downloader::HttpRequest::GetFile(
urls, path, size, bind(&HttpMapFilesDownloader::OnMapFileDownloaded, this, onDownloaded, _1),
bind(&HttpMapFilesDownloader::OnMapFileDownloadingProgress, this, onProgress, _1)));
if (!m_request)
{
// Mark the end of download with error.
ErrorHttpRequest error(path);
OnMapFileDownloaded(onDownloaded, error);
}
}
MapFilesDownloader::TProgress HttpMapFilesDownloader::GetDownloadingProgress()