updated -nameOfFileCurrentlyDownloading

ElectricWizardry · Dec 22, 2013 · d2e789c · d2e789c
1 parent 620259a
commit d2e789c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/EWCacheManager/EWCacheManager.h b/EWCacheManager/EWCacheManager.h
@@ -24,6 +24,7 @@
  */
 @interface EWCacheManager : NSObject {
 	NSString *path;
+    NSString *currentDownloadFilename;
 }
 
 @property (nonatomic, weak) id <EWCacheManagerDelegate> delegate;

diff --git a/EWCacheManager/EWCacheManager.m b/EWCacheManager/EWCacheManager.m
@@ -44,6 +44,9 @@ - (void)downloadFileWithRequest:(NSURLRequest *)request
 	    operation.outputStream = [NSOutputStream outputStreamToFileAtPath:[[EWCacheManager sharedManager] pathForFilename:filename] append:NO];
 
 	    [operation setDownloadProgressBlock: ^(NSUInteger bytesRead, long long totalBytesRead, long long totalBytesExpectedToRead) {
+            if (![filename isEqualToString:currentDownloadFilename]) {
+                currentDownloadFilename = filename;
+            }
             _fileProgress = (float)totalBytesRead / totalBytesExpectedToRead;
             _queueProgress = (float)(_fileProgress + self.requestedFilesCount - self.downloadClient.operationQueue.operationCount) / self.requestedFilesCount;
         }];
@@ -126,10 +129,9 @@ - (NSUInteger)requestedFilesCount {
 }
 
 - (NSString *)nameOfFileCurrentlyDownloading {
-    if (!_downloadClient) return nil;
+	if (!_downloadClient || !(_downloadClient.operationQueue.operationCount > 0) || currentDownloadFilename.length == 0) return nil;
 
-    return [_downloadClient.operationQueue.operations.lastObject description];
+	return currentDownloadFilename;
 }
 
-
 @end