Merge pull request SDWebImage#562 from mknippen/master

Olivier Poitrey · Olivier Poitrey · commit 1872fed8f02b · 2013-11-26T19:34:49.000-08:00
added currentDownload Count, to allow someone to see how many operations are left.
diff --git a/SDWebImage/SDWebImageDownloader.h b/SDWebImage/SDWebImageDownloader.h
@@ -62,6 +62,12 @@ typedef void(^SDWebImageDownloaderCompletedBlock)(UIImage *image, NSData *data,
 
 @property (assign, nonatomic) NSInteger maxConcurrentDownloads;
 
+/**
+ * Shows the current amount of downloads that still need to be downloaded
+ */
+
+@property (readonly, nonatomic) NSUInteger currentDownloadCount;
+
 /**
  * Changes download operations execution order. Default value is `SDWebImageDownloaderFIFOExecutionOrder`.
  */
diff --git a/SDWebImage/SDWebImageDownloader.m b/SDWebImage/SDWebImageDownloader.m
@@ -104,6 +104,11 @@ - (void)setMaxConcurrentDownloads:(NSInteger)maxConcurrentDownloads
     _downloadQueue.maxConcurrentOperationCount = maxConcurrentDownloads;
 }
 
+- (NSUInteger)currentDownloadCount
+{
+    return _downloadQueue.operationCount;
+}
+
 - (NSInteger)maxConcurrentDownloads
 {
     return _downloadQueue.maxConcurrentOperationCount;

Original file line number	Diff line number	Diff line change
`@@ -104,6 +104,11 @@ - (void)setMaxConcurrentDownloads:(NSInteger)maxConcurrentDownloads`
`104`	`104`	`_downloadQueue.maxConcurrentOperationCount = maxConcurrentDownloads;`
`105`	`105`	`}`
`106`	`106`
	`107`	`+- (NSUInteger)currentDownloadCount`
	`108`	`+{`
	`109`	`+ return _downloadQueue.operationCount;`
	`110`	`+}`
	`111`	`+`
`107`	`112`	`- (NSInteger)maxConcurrentDownloads`
`108`	`113`	`{`
`109`	`114`	`return _downloadQueue.maxConcurrentOperationCount;`