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

[new downloader] Fixed deferred mwm deleting.

Browse source
This commit is contained in:
Ilya Grechuhin 2016-03-17 13:36:07 +03:00 • committed by Sergey Yershov
parent 7e4fa5d171
commit 0f824fa412
2 changed files with 12 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
storage/storage.cpp
View file

@ -472,12 +472,10 @@ void Storage::DeleteCountry(TCountryId const & countryId, MapOptions opt)
ASSERT(m_willDelete != nullptr, ("Storage::Init wasn't called"));
TLocalFilePtr localFile = GetLatestLocalFile(countryId);
if(!m_willDelete(countryId, localFile))
{
opt = NormalizeDeleteFileSet(opt);
DeleteCountryFiles(countryId, opt);
DeleteCountryFilesFromDownloader(countryId, opt);
}
opt = NormalizeDeleteFileSet(opt);
bool const deferredDelete = m_willDelete(countryId, localFile);
DeleteCountryFiles(countryId, opt, deferredDelete);
DeleteCountryFilesFromDownloader(countryId, opt);
NotifyStatusChangedForHierarchy(countryId);
}
@ -501,25 +499,6 @@ void Storage::DeleteCustomCountryVersion(LocalCountryFile const & localFile)
LOG(LERROR, ("Removed files for an unknown country:", localFile));
return;
}
MY_SCOPE_GUARD(notifyStatusChanged, bind(&Storage::NotifyStatusChangedForHierarchy, this, countryId));
// If file version equals to current data version, delete from downloader all pending requests for
// the country.
if (localFile.GetVersion() == GetCurrentDataVersion())
DeleteCountryFilesFromDownloader(countryId, MapOptions::MapWithCarRouting);
auto countryFilesIt = m_localFiles.find(countryId);
if (countryFilesIt == m_localFiles.end())
{
LOG(LERROR, ("Deleted files of an unregistered country:", localFile));
return;
}
auto const equalsToLocalFile = [&localFile](TLocalFilePtr const & rhs)
{
return localFile == *rhs;
};
countryFilesIt->second.remove_if(equalsToLocalFile);
}
void Storage::NotifyStatusChanged(TCountryId const & countryId)
@ -1021,12 +1000,18 @@ void Storage::RegisterFakeCountryFiles(platform::LocalCountryFile const & localF
m_localFilesForFakeCountries[fakeCountryLocalFile->GetCountryFile()] = fakeCountryLocalFile;
}
void Storage::DeleteCountryFiles(TCountryId const & countryId, MapOptions opt)
void Storage::DeleteCountryFiles(TCountryId const & countryId, MapOptions opt, bool deferredDelete)
{
auto const it = m_localFiles.find(countryId);
if (it == m_localFiles.end())
return;
if (deferredDelete)
{
m_localFiles.erase(countryId);
return;
}
auto & localFiles = it->second;
for (auto & localFile : localFiles)
{

2
storage/storage.hpp
View file

@ -511,7 +511,7 @@ private:
void RegisterFakeCountryFiles(platform::LocalCountryFile const & localFile);
// Removes disk files for all versions of a country.
void DeleteCountryFiles(TCountryId const & countryId, MapOptions opt);
void DeleteCountryFiles(TCountryId const & countryId, MapOptions opt, bool deferredDelete);
// Removes country files from downloader.
bool DeleteCountryFilesFromDownloader(TCountryId const & countryId, MapOptions opt);