Merge pull request #1 from exalted/AL333Z-master

Aesthetic changes and improvements.
exalted · Feb 26, 2013 · 8adace6 · 8adace6
2 parents 2ca0c64 + 9ea52e2
commit 8adace6
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 8 deletions.
diff --git a/...oadManagerDemo/DownloadManagerDemo.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/...oadManagerDemo/DownloadManagerDemo.xcodeproj/project.xcworkspace/contents.xcworkspacedata
diff --git a/PTDownloadManager/PTFile.h b/PTDownloadManager/PTFile.h
@@ -24,16 +24,22 @@ typedef enum {
     PTFileContentStatusAvailable,
 } PTFileContentStatus;
 
-#pragma mark - Delegate protocol definition
+////////////////////////////////////////////////////////////////////////////////
+// Delegate protocol
+////////////////////////////////////////////////////////////////////////////////
 
 @protocol PTFileDelegate <NSObject>
 
 @optional
 
-- (void)PTFileDidFinishDownload:(PTFile *)file;
+- (void)fileDidFinishDownloading:(PTFile *)file;
 
 @end
 
+////////////////////////////////////////////////////////////////////////////////
+// Class interface
+////////////////////////////////////////////////////////////////////////////////
+
 @interface PTFile : NSObject
 
 // the location where file content should be stored

diff --git a/PTDownloadManager/PTFile.m b/PTDownloadManager/PTFile.m
@@ -140,19 +140,15 @@ - (void)updateStatusForRequest:(ASIHTTPRequest *)request
     if (!request || request.isCancelled || request.isFinished) {
         [self.progressView removeFromSuperview];
         self.label.text = self.savedLabelText;
+
+        [self.delegate fileDidFinishDownloading:self];
     }
     else if (request.isExecuting) {
         self.label.text = NSLocalizedString(@"Loading...", nil);
     }
     else if (request.isReady) {
         self.label.text = NSLocalizedString(@"Waiting...", nil);
     }
-
-    if (request.isFinished) {
-        if (self.delegate != nil && [self.delegate respondsToSelector:@selector(PTFileDidFinishDownload:)]) {
-            [self.delegate PTFileDidFinishDownload:self];
-        }
-    }
 }
 
 @end