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

[ios] background downloader finish callback is fixed

Browse source
This commit is contained in:
Arsentiy Milchakov 2020-11-20 11:46:29 +03:00 • committed by Aleksey Belousov
parent 6503b6f00c
commit dedab2f363
3 changed files with 41 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
platform/background_downloader_ios.h
View file

@ -9,7 +9,7 @@ NS_ASSUME_NONNULL_BEGIN
@end
typedef void (^DownloadCompleteBlock)( NSURL * _Nullable location, NSError * _Nullable error);
typedef void (^DownloadCompleteBlock)(NSError *_Nullable error);
typedef void (^DownloadProgressBlock)(int64_t bytesWritten, int64_t bytesExpected);
/// Note: this class is NOT thread-safe and must be used from main thread only.

48
platform/background_downloader_ios.mm
View file

@ -196,6 +196,23 @@
#pragma mark - NSURLSessionDownloadDelegate implementation
- (void)finishDownloading:(NSURLSessionTask *)downloadTask error:(nullable NSError *)error {
[self.restoredTasks removeObjectForKey:downloadTask.originalRequest.URL.path];
TaskInfo *info = [self.tasks objectForKey:@(downloadTask.taskIdentifier)];
if (!info)
return;
info.completion(error);
[self.tasks removeObjectForKey:@(downloadTask.taskIdentifier)];
if ([self.tasks count] == 0) {
for (id<BackgroundDownloaderSubscriber> subscriber in self.subscribers)
[subscriber didFinishDownloading];
}
}
- (void)URLSession:(NSURLSession *)session
downloadTask:(NSURLSessionDownloadTask *)downloadTask
didFinishDownloadingToURL:(NSURL *)location {
@ -204,20 +221,7 @@
[[NSFileManager defaultManager] moveItemAtURL:location.filePathURL toURL:destinationUrl error:&error];
dispatch_async(dispatch_get_main_queue(), ^{
[self.restoredTasks removeObjectForKey:downloadTask.originalRequest.URL.path];
TaskInfo *info = [self.tasks objectForKey:@(downloadTask.taskIdentifier)];
if (!info)
return;
info.completion(destinationUrl, error);
[self.tasks removeObjectForKey:@(downloadTask.taskIdentifier)];
if ([self.tasks count] == 0) {
for (id<BackgroundDownloaderSubscriber> subscriber in self.subscribers)
[subscriber didFinishDownloading];
}
[self finishDownloading:downloadTask error:error];
});
}
@ -236,20 +240,8 @@
- (void)URLSession:(NSURLSession *)session task:(NSURLSessionTask *)downloadTask didCompleteWithError:(NSError *)error {
dispatch_async(dispatch_get_main_queue(), ^{
[self.restoredTasks removeObjectForKey:downloadTask.originalRequest.URL.path];
TaskInfo *info = [self.tasks objectForKey:@(downloadTask.taskIdentifier)];
if (!info)
return;
info.completion(nil, error);
[self.tasks removeObjectForKey:@(downloadTask.taskIdentifier)];
if ([self.tasks count] == 0) {
for (id<BackgroundDownloaderSubscriber> subscriber in self.subscribers)
[subscriber didFinishDownloading];
}
if (error && error.code != NSURLErrorCancelled)
[self finishDownloading:downloadTask error:error];
});
}

30
storage/background_downloading/downloader_adapter_ios.mm
View file

@ -10,6 +10,21 @@
#include <memory>
#include <utility>
@interface NSError (ToDownloaderError)
- (downloader::DownloadStatus)toDownloaderError;
@end
@implementation NSError (ToDownloaderError)
- (downloader::DownloadStatus)toDownloaderError {
return self.code == NSURLErrorFileDoesNotExist ? downloader::DownloadStatus::FileNotFound
: downloader::DownloadStatus::Failed;
}
@end
namespace storage
{
BackgroundDownloaderAdapter::BackgroundDownloaderAdapter()
@ -77,15 +92,10 @@ void BackgroundDownloaderAdapter::DownloadFromAnyUrl(CountryId const & countryId
{
if (urls.empty())
return;
auto onFinish = [this, countryId, downloadPath, urls = urls](NSURL *location, NSError *error) mutable {
if (!error || error.code == NSURLErrorCancelled)
return;
downloader::DownloadStatus status = downloader::DownloadStatus::Completed;
status = error.code == NSURLErrorFileDoesNotExist ? downloader::DownloadStatus::FileNotFound
: downloader::DownloadStatus::Failed;
auto onFinish = [this, countryId, downloadPath, urls = urls](NSError *error) mutable {
downloader::DownloadStatus status = error ? [error toDownloaderError] : downloader::DownloadStatus::Completed;
if (!m_queue.Contains(countryId))
return;
@ -100,7 +110,7 @@ void BackgroundDownloaderAdapter::DownloadFromAnyUrl(CountryId const & countryId
m_queue.Remove(countryId);
}
};
auto onProgress = [this, countryId](int64_t totalWritten, int64_t totalExpected) {
if (!m_queue.Contains(countryId))
return;