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

Merge pull request #5342 from syershov/MAPSME-3753

Browse source 
Fixed calculation of size in downloader
This commit is contained in:
Vlad Mihaylenko 2017-02-02 17:51:29 +03:00 • committed by GitHub
commit 5e7fd698e4
1 changed files with 23 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
iphone/Maps/UI/Downloader/Cells/MWMMapDownloaderTableViewCell.mm
View file

@ -61,9 +61,30 @@
self.title.attributedText = [self matchedString:@(nodeAttrs.m_nodeLocalName.c_str())
selectedAttrs:selectedTitleAttrs
unselectedAttrs:unselectedTitleAttrs];
TMwmSize const size = self.mode == mwm::DownloaderMode::Downloaded
? nodeAttrs.m_downloadingMwmSize
TMwmSize size = nodeAttrs.m_mwmSize;
bool const isModeDownloaded = self.mode == mwm::DownloaderMode::Downloaded;
switch (nodeAttrs.m_status)
{
case storage::NodeStatus::Error:
case storage::NodeStatus::Undefined:
case storage::NodeStatus::NotDownloaded:
case storage::NodeStatus::OnDiskOutOfDate:
size = isModeDownloaded ? nodeAttrs.m_localMwmSize : nodeAttrs.m_mwmSize;
break;
case storage::NodeStatus::Downloading:
size = isModeDownloaded ? nodeAttrs.m_downloadingMwmSize
: nodeAttrs.m_mwmSize - nodeAttrs.m_downloadingMwmSize;
break;
case storage::NodeStatus::InQueue:
case storage::NodeStatus::Partly:
size = isModeDownloaded ? nodeAttrs.m_localMwmSize
: nodeAttrs.m_mwmSize - nodeAttrs.m_localMwmSize;
break;
case storage::NodeStatus::OnDisk: size = isModeDownloaded ? nodeAttrs.m_mwmSize : 0; break;
}
self.downloadSize.text = formattedSize(size);
self.downloadSize.hidden = (size == 0);
}