Update SDImageCache.m
This commit is contained in:
jourhuang
parent
88b3ba211c
commit
5c88cf19ed
|
|
@ -194,71 +194,73 @@ static NSString * _defaultDiskCacheDirectory;
|
||||||
[self.memoryCache setObject:image forKey:key cost:cost];
|
[self.memoryCache setObject:image forKey:key cost:cost];
|
||||||
}
|
}
|
||||||
|
|
||||||
if (toDisk) {
|
if (!toDisk) {
|
||||||
dispatch_async(self.ioQueue, ^{
|
|
||||||
@autoreleasepool {
|
|
||||||
NSData *data = imageData;
|
|
||||||
if (!data && [image conformsToProtocol:@protocol(SDAnimatedImage)]) {
|
|
||||||
// If image is custom animated image class, prefer its original animated data
|
|
||||||
data = [((id<SDAnimatedImage>)image) animatedImageData];
|
|
||||||
}
|
|
||||||
if (!data && image) {
|
|
||||||
// Check image's associated image format, may return .undefined
|
|
||||||
SDImageFormat format = image.sd_imageFormat;
|
|
||||||
if (format == SDImageFormatUndefined) {
|
|
||||||
// If image is animated, use GIF (APNG may be better, but has bugs before macOS 10.14)
|
|
||||||
if (image.sd_isAnimated) {
|
|
||||||
format = SDImageFormatGIF;
|
|
||||||
} else {
|
|
||||||
// If we do not have any data to detect image format, check whether it contains alpha channel to use PNG or JPEG format
|
|
||||||
if ([SDImageCoderHelper CGImageContainsAlpha:image.CGImage]) {
|
|
||||||
format = SDImageFormatPNG;
|
|
||||||
} else {
|
|
||||||
format = SDImageFormatJPEG;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
data = [[SDImageCodersManager sharedManager] encodedDataWithImage:image format:format options:nil];
|
|
||||||
}
|
|
||||||
[self _storeImageDataToDisk:data forKey:key];
|
|
||||||
if (image) {
|
|
||||||
// Check extended data
|
|
||||||
id extendedObject = image.sd_extendedObject;
|
|
||||||
if ([extendedObject conformsToProtocol:@protocol(NSCoding)]) {
|
|
||||||
NSData *extendedData;
|
|
||||||
if (@available(iOS 11, tvOS 11, macOS 10.13, watchOS 4, *)) {
|
|
||||||
NSError *error;
|
|
||||||
extendedData = [NSKeyedArchiver archivedDataWithRootObject:extendedObject requiringSecureCoding:NO error:&error];
|
|
||||||
if (error) {
|
|
||||||
NSLog(@"NSKeyedArchiver archive failed with error: %@", error);
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
@try {
|
|
||||||
#pragma clang diagnostic push
|
|
||||||
#pragma clang diagnostic ignored "-Wdeprecated-declarations"
|
|
||||||
extendedData = [NSKeyedArchiver archivedDataWithRootObject:extendedObject];
|
|
||||||
#pragma clang diagnostic pop
|
|
||||||
} @catch (NSException *exception) {
|
|
||||||
NSLog(@"NSKeyedArchiver archive failed with exception: %@", exception);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if (extendedData) {
|
|
||||||
[self.diskCache setExtendedData:extendedData forKey:key];
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (completionBlock) {
|
|
||||||
dispatch_async(dispatch_get_main_queue(), ^{
|
|
||||||
completionBlock();
|
|
||||||
});
|
|
||||||
}
|
|
||||||
});
|
|
||||||
} else {
|
|
||||||
if (completionBlock) {
|
if (completionBlock) {
|
||||||
completionBlock();
|
completionBlock();
|
||||||
}
|
}
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
dispatch_async(self.ioQueue, ^{
|
||||||
|
@autoreleasepool {
|
||||||
|
NSData *data = imageData;
|
||||||
|
if (!data && [image conformsToProtocol:@protocol(SDAnimatedImage)]) {
|
||||||
|
// If image is custom animated image class, prefer its original animated data
|
||||||
|
data = [((id<SDAnimatedImage>)image) animatedImageData];
|
||||||
|
}
|
||||||
|
if (!data && image) {
|
||||||
|
// Check image's associated image format, may return .undefined
|
||||||
|
SDImageFormat format = image.sd_imageFormat;
|
||||||
|
if (format == SDImageFormatUndefined) {
|
||||||
|
// If image is animated, use GIF (APNG may be better, but has bugs before macOS 10.14)
|
||||||
|
if (image.sd_isAnimated) {
|
||||||
|
format = SDImageFormatGIF;
|
||||||
|
} else {
|
||||||
|
// If we do not have any data to detect image format, check whether it contains alpha channel to use PNG or JPEG format
|
||||||
|
format = [SDImageCoderHelper CGImageContainsAlpha:image.CGImage] ? SDImageFormatPNG : SDImageFormatJPEG;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
data = [[SDImageCodersManager sharedManager] encodedDataWithImage:image format:format options:nil];
|
||||||
|
}
|
||||||
|
[self _storeImageDataToDisk:data forKey:key];
|
||||||
|
[self _archivedDataWithImage:image forKey:key];
|
||||||
|
}
|
||||||
|
|
||||||
|
if (completionBlock) {
|
||||||
|
dispatch_async(dispatch_get_main_queue(), ^{
|
||||||
|
completionBlock();
|
||||||
|
});
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
- (void)_archivedDataWithImage:(UIImage *)image forKey:(NSString *)key {
|
||||||
|
if (!image) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
// Check extended data
|
||||||
|
id extendedObject = image.sd_extendedObject;
|
||||||
|
if (![extendedObject conformsToProtocol:@protocol(NSCoding)]) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
NSData *extendedData;
|
||||||
|
if (@available(iOS 11, tvOS 11, macOS 10.13, watchOS 4, *)) {
|
||||||
|
NSError *error;
|
||||||
|
extendedData = [NSKeyedArchiver archivedDataWithRootObject:extendedObject requiringSecureCoding:NO error:&error];
|
||||||
|
if (error) {
|
||||||
|
NSLog(@"NSKeyedArchiver archive failed with error: %@", error);
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
@try {
|
||||||
|
#pragma clang diagnostic push
|
||||||
|
#pragma clang diagnostic ignored "-Wdeprecated-declarations"
|
||||||
|
extendedData = [NSKeyedArchiver archivedDataWithRootObject:extendedObject];
|
||||||
|
#pragma clang diagnostic pop
|
||||||
|
} @catch (NSException *exception) {
|
||||||
|
NSLog(@"NSKeyedArchiver archive failed with exception: %@", exception);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (extendedData) {
|
||||||
|
[self.diskCache setExtendedData:extendedData forKey:key];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -414,38 +416,43 @@ static NSString * _defaultDiskCacheDirectory;
|
||||||
}
|
}
|
||||||
|
|
||||||
- (nullable UIImage *)diskImageForKey:(nullable NSString *)key data:(nullable NSData *)data options:(SDImageCacheOptions)options context:(SDWebImageContext *)context {
|
- (nullable UIImage *)diskImageForKey:(nullable NSString *)key data:(nullable NSData *)data options:(SDImageCacheOptions)options context:(SDWebImageContext *)context {
|
||||||
if (data) {
|
if (!data) {
|
||||||
UIImage *image = SDImageCacheDecodeImageData(data, key, [[self class] imageOptionsFromCacheOptions:options], context);
|
|
||||||
if (image) {
|
|
||||||
// Check extended data
|
|
||||||
NSData *extendedData = [self.diskCache extendedDataForKey:key];
|
|
||||||
if (extendedData) {
|
|
||||||
id extendedObject;
|
|
||||||
if (@available(iOS 11, tvOS 11, macOS 10.13, watchOS 4, *)) {
|
|
||||||
NSError *error;
|
|
||||||
NSKeyedUnarchiver *unarchiver = [[NSKeyedUnarchiver alloc] initForReadingFromData:extendedData error:&error];
|
|
||||||
unarchiver.requiresSecureCoding = NO;
|
|
||||||
extendedObject = [unarchiver decodeTopLevelObjectForKey:NSKeyedArchiveRootObjectKey error:&error];
|
|
||||||
if (error) {
|
|
||||||
NSLog(@"NSKeyedUnarchiver unarchive failed with error: %@", error);
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
@try {
|
|
||||||
#pragma clang diagnostic push
|
|
||||||
#pragma clang diagnostic ignored "-Wdeprecated-declarations"
|
|
||||||
extendedObject = [NSKeyedUnarchiver unarchiveObjectWithData:extendedData];
|
|
||||||
#pragma clang diagnostic pop
|
|
||||||
} @catch (NSException *exception) {
|
|
||||||
NSLog(@"NSKeyedUnarchiver unarchive failed with exception: %@", exception);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
image.sd_extendedObject = extendedObject;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return image;
|
|
||||||
} else {
|
|
||||||
return nil;
|
return nil;
|
||||||
}
|
}
|
||||||
|
UIImage *image = SDImageCacheDecodeImageData(data, key, [[self class] imageOptionsFromCacheOptions:options], context);
|
||||||
|
[self _unarchiveObjectWithImage:image forKey:key];
|
||||||
|
return image;
|
||||||
|
}
|
||||||
|
|
||||||
|
- (void)_unarchiveObjectWithImage:(UIImage *)image forKey:(NSString *)key {
|
||||||
|
if (!image) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
// Check extended data
|
||||||
|
NSData *extendedData = [self.diskCache extendedDataForKey:key];
|
||||||
|
if (!extendedData) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
id extendedObject;
|
||||||
|
if (@available(iOS 11, tvOS 11, macOS 10.13, watchOS 4, *)) {
|
||||||
|
NSError *error;
|
||||||
|
NSKeyedUnarchiver *unarchiver = [[NSKeyedUnarchiver alloc] initForReadingFromData:extendedData error:&error];
|
||||||
|
unarchiver.requiresSecureCoding = NO;
|
||||||
|
extendedObject = [unarchiver decodeTopLevelObjectForKey:NSKeyedArchiveRootObjectKey error:&error];
|
||||||
|
if (error) {
|
||||||
|
NSLog(@"NSKeyedUnarchiver unarchive failed with error: %@", error);
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
@try {
|
||||||
|
#pragma clang diagnostic push
|
||||||
|
#pragma clang diagnostic ignored "-Wdeprecated-declarations"
|
||||||
|
extendedObject = [NSKeyedUnarchiver unarchiveObjectWithData:extendedData];
|
||||||
|
#pragma clang diagnostic pop
|
||||||
|
} @catch (NSException *exception) {
|
||||||
|
NSLog(@"NSKeyedUnarchiver unarchive failed with exception: %@", exception);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
image.sd_extendedObject = extendedObject;
|
||||||
}
|
}
|
||||||
|
|
||||||
- (nullable NSOperation *)queryCacheOperationForKey:(NSString *)key done:(SDImageCacheQueryCompletionBlock)doneBlock {
|
- (nullable NSOperation *)queryCacheOperationForKey:(NSString *)key done:(SDImageCacheQueryCompletionBlock)doneBlock {
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue