FICImageCache now can be instantiated as a normal object. You're no longer required to use the singleton sharedImageCache.

Author: Mallory Paine

FastImageCache/FICImageCache.m

@@ -100,7 +100,7 @@ - (void)setFormats:(NSArray *)formats {
             FICImageFormatDevices devices = [imageFormat devices];
             if (devices & currentDevice) {
                 // Only initialize an image table for this format if it is needed on the current device.
-                FICImageTable *imageTable = [[FICImageTable alloc] initWithFormat:imageFormat];
+                FICImageTable *imageTable = [[FICImageTable alloc] initWithFormat:imageFormat imageCache:self];
                 [_imageTables setObject:imageTable forKey:formatName];
                 [_formats setObject:imageFormat forKey:formatName];
 

FastImageCache/FICImageTable.h

@@ -79,7 +79,7 @@ extern NSString *const FICImageTableScreenScaleKey;
  
  @warning `FICImageTable` raises an exception if `imageFormat` is `nil`. `FICImageTable`'s implementation of `-init` simply calls through to this initializer, passing `nil` for `imageFormat`.
  */
-- (instancetype)initWithFormat:(FICImageFormat *)imageFormat;
+- (instancetype)initWithFormat:(FICImageFormat *)imageFormat imageCache:(FICImageCache *)imageCache;
 
 ///------------------------------------------------
 /// @name Storing, Retrieving, and Deleting Entries

FastImageCache/FICImageTable.m

@@ -65,7 +65,7 @@ @interface FICImageTable () {
 
     BOOL _isFileDataProtected;
 }
-
+@property(nonatomic, weak) FICImageCache *imageCache;
 @end
 
 #pragma mark
@@ -123,13 +123,18 @@ + (NSString *)directoryPath {
 
 #pragma mark - Object Lifecycle
 
-- (instancetype)initWithFormat:(FICImageFormat *)imageFormat {
+- (instancetype)initWithFormat:(FICImageFormat *)imageFormat imageCache:(FICImageCache *)imageCache {
     self = [super init];
 
     if (self != nil) {
         if (imageFormat == nil) {
             [NSException raise:NSInvalidArgumentException format:@"*** FIC Exception: %s must pass in an image format.", __PRETTY_FUNCTION__];
         }
+        if (imageCache == nil) {
+            [NSException raise:NSInvalidArgumentException format:@"*** FIC Exception: %s must pass in an image cache.", __PRETTY_FUNCTION__];
+        }
+        
+        self.imageCache = imageCache;
 
         _lock = [[NSRecursiveLock alloc] init];
         _indexNumbers = CFDictionaryCreateMutable(kCFAllocatorDefault, 0, NULL, &kCFTypeDictionaryValueCallBacks);
@@ -185,7 +190,7 @@ - (instancetype)initWithFormat:(FICImageFormat *)imageFormat {
             _entriesPerChunk = MAX(4, goalEntriesPerChunk);
             if ([self _maximumCount] > [_imageFormat maximumCount]) {
                 NSString *message = [NSString stringWithFormat:@"*** FIC Warning: growing desired maximumCount (%ld) for format %@ to fill a chunk (%d)", (long)[_imageFormat maximumCount], [_imageFormat name], [self _maximumCount]];
-                [[FICImageCache sharedImageCache] _logMessage:message];
+                [self.imageCache _logMessage:message];
             }
             _chunkLength = (size_t)(_entryLength * _entriesPerChunk);
 
@@ -201,7 +206,7 @@ - (instancetype)initWithFormat:(FICImageFormat *)imageFormat {
         } else {
             // If something goes wrong and we can't open the image table file, then we have no choice but to release and nil self.
             NSString *message = [NSString stringWithFormat:@"*** FIC Error: %s could not open the image table file at path %@. The image table was not created.", __PRETTY_FUNCTION__, _filePath];
-            [[FICImageCache sharedImageCache] _logMessage:message];
+            [self.imageCache _logMessage:message];
 
             self = nil;
         }    
@@ -211,7 +216,7 @@ - (instancetype)initWithFormat:(FICImageFormat *)imageFormat {
 }
 
 - (instancetype)init {
-    return [self initWithFormat:nil];
+    return [self initWithFormat:nil imageCache:nil];
 }
 
 - (void)dealloc {
@@ -255,7 +260,7 @@ - (FICImageTableChunk *)_chunkAtIndex:(NSInteger)index {
 
     if (!chunk) {
         NSString *message = [NSString stringWithFormat:@"*** FIC Error: %s failed to get chunk for index %ld.", __PRETTY_FUNCTION__, (long)index];
-        [[FICImageCache sharedImageCache] _logMessage:message];
+        [self.imageCache _logMessage:message];
     }
 
     return chunk;
@@ -377,7 +382,7 @@ - (UIImage *)newImageForEntityUUID:(NSString *)entityUUID sourceImageUUID:(NSStr
                         CGImageRelease(imageRef);
                     } else {
                         NSString *message = [NSString stringWithFormat:@"*** FIC Error: %s could not create a new CGImageRef for entity UUID %@.", __PRETTY_FUNCTION__, entityUUID];
-                        [[FICImageCache sharedImageCache] _logMessage:message];
+                        [self.imageCache _logMessage:message];
                     }
 
                     if (image != nil && preheatData) {
@@ -467,7 +472,7 @@ - (void)_setEntryCount:(NSInteger)entryCount {
 
         if (result != 0) {
             NSString *message = [NSString stringWithFormat:@"*** FIC Error: %s ftruncate returned %d, error = %d, fd = %d, filePath = %@, length = %lld", __PRETTY_FUNCTION__, result, errno, _fileDescriptor, _filePath, fileLength];
-            [[FICImageCache sharedImageCache] _logMessage:message];
+            [self.imageCache _logMessage:message];
         } else {
             _fileLength = fileLength;
             _entryCount = entryCount;
@@ -516,6 +521,7 @@ - (FICImageTableEntry *)_entryDataAtIndex:(NSInteger)index {
             entryData = [[FICImageTableEntry alloc] initWithImageTableChunk:chunk bytes:mappedEntryAddress length:_entryLength];
 
             if (entryData) {
+                [entryData setImageCache:self.imageCache];
                 [entryData setIndex:index];
                 [_chunkSet addObject:chunk];
 
@@ -536,7 +542,7 @@ - (FICImageTableEntry *)_entryDataAtIndex:(NSInteger)index {
         } else {
             message = [NSString stringWithFormat:@"*** FIC Error: %s. Cannot get entry data because imageTable's file has data protection enabled and that data is not currently accessible.", __PRETTY_FUNCTION__];
         }
-        [[FICImageCache sharedImageCache] _logMessage:message];
+        [self.imageCache _logMessage:message];
     }
 
     return entryData;
@@ -572,7 +578,7 @@ - (NSInteger)_nextEntryIndex {
 
     if (index >= [self _maximumCount]) {
         NSString *message = [NSString stringWithFormat:@"FICImageTable - unable to evict entry from table '%@' to make room. New index %ld, desired max %d", [_imageFormat name], (long)index, [self _maximumCount]];
-        [[FICImageCache sharedImageCache] _logMessage:message];
+        [self.imageCache _logMessage:message];
     }
 
     return index;
@@ -662,7 +668,7 @@ - (void)saveMetadata {
         BOOL fileWriteResult = [data writeToFile:[self metadataFilePath] atomically:NO];
         if (fileWriteResult == NO) {
             NSString *message = [NSString stringWithFormat:@"*** FIC Error: %s couldn't write metadata for format %@", __PRETTY_FUNCTION__, [_imageFormat name]];
-            [[FICImageCache sharedImageCache] _logMessage:message];
+            [self.imageCache _logMessage:message];
         }
     });
 }
@@ -681,7 +687,7 @@ - (void)_loadMetadata {
             metadataDictionary = nil;
 
             NSString *message = [NSString stringWithFormat:@"*** FIC Notice: Image format %@ has changed; deleting data and starting over.", [_imageFormat name]];
-            [[FICImageCache sharedImageCache] _logMessage:message];
+            [self.imageCache _logMessage:message];
         }
 
         [_indexMap setDictionary:[metadataDictionary objectForKey:FICImageTableIndexMapKey]];

FastImageCache/FICImageTableEntry.h

@@ -9,6 +9,7 @@
 #import "FICImports.h"
 
 @class FICImageTableChunk;
+@class FICImageCache;
 
 typedef struct {
     CFUUIDBytes _entityUUIDBytes;
@@ -54,6 +55,8 @@ typedef struct {
 
 @property (nonatomic, readonly) FICImageTableChunk *imageTableChunk;
 
+@property (nonatomic, weak) FICImageCache *imageCache;
+
 @property (nonatomic, assign) NSInteger index;
 
 - (void)preheat;

FastImageCache/FICImageTableEntry.m

@@ -35,6 +35,7 @@ @implementation FICImageTableEntry
 @synthesize length = _length;
 @synthesize imageTableChunk = _imageTableChunk;
 @synthesize index = _index;
+@synthesize imageCache;
 
 #pragma mark - Property Accessors
 
@@ -113,7 +114,7 @@ - (void)flush {
 
     if (result) {
         NSString *message = [NSString stringWithFormat:@"*** FIC Error: %s msync(%p, %ld) returned %d errno=%d", __PRETTY_FUNCTION__, pageAlignedAddress, bytesToFlush, result, errno];
-        [[FICImageCache sharedImageCache] _logMessage:message];
+        [self.imageCache _logMessage:message];
     }
 }