From ee9af6406cc52fccaac75fd760d28ca6ee7fb86a Mon Sep 17 00:00:00 2001 From: Andrew Vyazovoy Date: Wed, 27 Mar 2013 23:43:42 +0700 Subject: [PATCH] SDWebImageDownloaderQueueMode type renamed. Fixed typo. Added description for renamed type. Type renamed because "queue" notion is a FIFO only, but LIFO is a stack, and if we give the type a neutral name, we can avoid logical inconsistencies. --- Examples/SDWebImage Demo/MasterViewController.m | 2 +- SDWebImage/SDWebImageDownloader.h | 16 +++++++++++----- SDWebImage/SDWebImageDownloader.m | 6 +++--- 3 files changed, 15 insertions(+), 9 deletions(-) diff --git a/Examples/SDWebImage Demo/MasterViewController.m b/Examples/SDWebImage Demo/MasterViewController.m index 8d7edba..4fd6ce3 100644 --- a/Examples/SDWebImage Demo/MasterViewController.m +++ b/Examples/SDWebImage Demo/MasterViewController.m @@ -333,7 +333,7 @@ nil]; } [SDWebImageManager.sharedManager.imageDownloader setValue:@"SDWebImage Demo" forHTTPHeaderField:@"AppName"]; - SDWebImageManager.sharedManager.imageDownloader.queueMode = SDWebImageDownloaderLIFOQueueMode; + SDWebImageManager.sharedManager.imageDownloader.executionOrder = SDWebImageDownloaderLIFOExecutionOrder; return self; } diff --git a/SDWebImage/SDWebImageDownloader.h b/SDWebImage/SDWebImageDownloader.h index 3fdf948..7f5ff0c 100644 --- a/SDWebImage/SDWebImageDownloader.h +++ b/SDWebImage/SDWebImageDownloader.h @@ -28,9 +28,15 @@ typedef enum typedef enum { - SDWebImageDownloaderFILOQueueMode, - SDWebImageDownloaderLIFOQueueMode -} SDWebImageDownloaderQueueMode; + SDWebImageDownloaderFIFOExecutionOrder, + /** + * Default value. All download operations will execute in queue style (first-in-first-out). + */ + SDWebImageDownloaderLIFOExecutionOrder + /** + * All download operations will execute in stack style (last-in-first-out). + */ +} SDWebImageDownloaderExecutionOrder; extern NSString *const SDWebImageDownloadStartNotification; extern NSString *const SDWebImageDownloadStopNotification; @@ -46,9 +52,9 @@ typedef void(^SDWebImageDownloaderCompletedBlock)(UIImage *image, NSData *data, @property (assign, nonatomic) NSInteger maxConcurrentDownloads; /** - * Changes download operations unqueue mode. Default value is `SDWebImageDownloaderFILOQueueMode`. + * Changes download operations execution order. Default value is `SDWebImageDownloaderFIFOExecutionOrder`. */ -@property (assign, nonatomic) SDWebImageDownloaderQueueMode queueMode; +@property (assign, nonatomic) SDWebImageDownloaderExecutionOrder executionOrder; + (SDWebImageDownloader *)sharedDownloader; diff --git a/SDWebImage/SDWebImageDownloader.m b/SDWebImage/SDWebImageDownloader.m index ae8c9eb..af17cd2 100644 --- a/SDWebImage/SDWebImageDownloader.m +++ b/SDWebImage/SDWebImageDownloader.m @@ -67,7 +67,7 @@ static NSString *const kCompletedCallbackKey = @"completed"; { if ((self = [super init])) { - _queueMode = SDWebImageDownloaderFILOQueueMode; + _executionOrder = SDWebImageDownloaderFIFOExecutionOrder; _downloadQueue = NSOperationQueue.new; _downloadQueue.maxConcurrentOperationCount = 2; _URLCallbacks = NSMutableDictionary.new; @@ -158,9 +158,9 @@ static NSString *const kCompletedCallbackKey = @"completed"; [sself removeCallbacksForURL:url]; }]; [wself.downloadQueue addOperation:operation]; - if (wself.queueMode == SDWebImageDownloaderLIFOQueueMode) + if (wself.executionOrder == SDWebImageDownloaderLIFOExecutionOrder) { - // Emulate LIFO queue mode by systematically adding new operations as last operation's dependency + // Emulate LIFO execution order by systematically adding new operations as last operation's dependency [wself.lastAddedOperation addDependency:operation]; wself.lastAddedOperation = operation; }