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

Fixed canceling when diff is applying.

Browse source
This commit is contained in:
VladiMihaylenko 2017-08-31 18:37:06 +03:00 • committed by Vladimir Byko-Ianko
parent e7bfd11dbd
commit 29eb449afb
3 changed files with 18 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
platform/local_country_file_utils.cpp
View file

@ -177,7 +177,7 @@ void DeleteDownloaderFilesForCountry(int64_t version, CountryFile const & countr
void DeleteDownloaderFilesForCountry(int64_t version, string const & dataDir,
CountryFile const & countryFile)
{
for (MapOptions file : {MapOptions::Map, MapOptions::CarRouting})
for (MapOptions file : {MapOptions::Map, MapOptions::CarRouting, MapOptions::Diff})
{
string const path = GetFileDownloadPath(version, dataDir, countryFile, file);
ASSERT(strings::EndsWith(path, READY_FILE_EXTENSION), ());

4
storage/queued_country.hpp
View file

@ -20,6 +20,9 @@ public:
void ResetToDefaultOptions();
bool SwitchToNextFile();
void SetFrozen() { m_isFrozen = true; }
bool IsFrozen() const { return m_isFrozen; }
inline TCountryId const & GetCountryId() const { return m_countryId; }
inline MapOptions GetInitOptions() const { return m_init; }
inline MapOptions GetCurrentFileOptions() const { return m_current; }
@ -32,5 +35,6 @@ private:
MapOptions m_init;
MapOptions m_left;
MapOptions m_current;
bool m_isFrozen = false;
};
} // namespace storage

16
storage/storage.cpp
View file

@ -632,8 +632,8 @@ void Storage::DeleteFromDownloader(TCountryId const & countryId)
{
ASSERT_THREAD_CHECKER(m_threadChecker, ());
DeleteCountryFilesFromDownloader(countryId);
NotifyStatusChangedForHierarchy(countryId);
if (DeleteCountryFilesFromDownloader(countryId))
NotifyStatusChangedForHierarchy(countryId);
}
bool Storage::IsDownloadInProgress() const
@ -820,6 +820,8 @@ void Storage::OnMapFileDownloadProgress(MapFilesDownloader::TProgress const & pr
void Storage::RegisterDownloadedFiles(TCountryId const & countryId, MapOptions options)
{
ASSERT_THREAD_CHECKER(m_threadChecker, ());
auto const fn = [this, countryId](bool isSuccess)
{
ASSERT_THREAD_CHECKER(m_threadChecker, ());
@ -834,6 +836,7 @@ void Storage::RegisterDownloadedFiles(TCountryId const & countryId, MapOptions o
DeleteCountryIndexes(*localFile);
m_didDownload(countryId, localFile);
CHECK(!m_queue.empty(), ());
CorrectJustDownloadedAndQueue(m_queue.begin());
SaveDownloadQueue();
@ -844,6 +847,10 @@ void Storage::RegisterDownloadedFiles(TCountryId const & countryId, MapOptions o
if (options == MapOptions::Diff)
{
/// At this point a diff applying process is going to start
/// and we can't stop the process.
/// TODO: Make the applying process cancellable.
m_queue.begin()->SetFrozen();
ApplyDiff(countryId, fn);
return;
}
@ -1142,8 +1149,10 @@ bool Storage::DeleteCountryFilesFromDownloader(TCountryId const & countryId)
if (!queuedCountry)
return false;
MapOptions const opt = queuedCountry->GetInitOptions();
if (queuedCountry->IsFrozen())
return false;
MapOptions const opt = queuedCountry->GetInitOptions();
if (IsCountryFirstInQueue(countryId))
{
// Abrupt downloading of the current file if it should be removed.
@ -1765,6 +1774,7 @@ bool Storage::GetUpdateInfo(TCountryId const & countryId, UpdateInfo & updateInf
void Storage::CorrectJustDownloadedAndQueue(TQueue::iterator justDownloadedItem)
{
m_justDownloaded.insert(justDownloadedItem->GetCountryId());
CHECK(!m_queue.empty(), ());
m_queue.erase(justDownloadedItem);
if (m_queue.empty())
m_justDownloaded.clear();