Merge pull request #687 from rokemoon/master

Create NSOperation when start operation.
SDWebImage · Jun 15, 2014 · 689586f · 689586f
2 parents e6c0f56 + c285074
commit 689586f
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 9 deletions.
diff --git a/SDWebImage/SDImageCache.h b/SDWebImage/SDImageCache.h
@@ -190,7 +190,7 @@ typedef void(^SDWebImageQueryCompletedBlock)(UIImage *image, SDImageCacheType ca
 /**
  * Get the number of images in the disk cache
  */
-- (int)getDiskCount;
+- (NSUInteger)getDiskCount;
 
 /**
  * Asynchronously calculate the disk cache's size.

diff --git a/SDWebImage/SDImageCache.m b/SDWebImage/SDImageCache.m
@@ -265,9 +265,9 @@ - (UIImage *)scaledImageForKey:(NSString *)key image:(UIImage *)image {
 }
 
 - (NSOperation *)queryDiskCacheForKey:(NSString *)key done:(void (^)(UIImage *image, SDImageCacheType cacheType))doneBlock {
-    NSOperation *operation = [NSOperation new];
-
-    if (!doneBlock) return nil;
+    if (!doneBlock) {
+        return nil;
+    }
 
     if (!key) {
         doneBlock(nil, SDImageCacheTypeNone);
@@ -281,6 +281,7 @@ - (NSOperation *)queryDiskCacheForKey:(NSString *)key done:(void (^)(UIImage *im
         return nil;
     }
 
+    NSOperation *operation = [NSOperation new];
     dispatch_async(self.ioQueue, ^{
         if (operation.isCancelled) {
             return;
@@ -482,13 +483,11 @@ - (NSUInteger)getSize {
     return size;
 }
 
-- (int)getDiskCount {
-    __block int count = 0;
+- (NSUInteger)getDiskCount {
+    __block NSUInteger count = 0;
     dispatch_sync(self.ioQueue, ^{
         NSDirectoryEnumerator *fileEnumerator = [_fileManager enumeratorAtPath:self.diskCachePath];
-        for (__unused NSString *fileName in fileEnumerator) {
-            count += 1;
-        }
+        count = [[fileEnumerator allObjects] count];
     });
     return count;
 }