Adopt the current cache key filter and cache serializer to support using in context options. Using a protocol based object store block instead block itself.
This commit is contained in:
DreamPiggy
parent
7272cf78e5
commit
3d7896f663
|
|
@ -388,6 +388,30 @@
|
|||
327054DD206CD8B3006EA328 /* SDWebImageAPNGCoder.m in Sources */ = {isa = PBXBuildFile; fileRef = 327054D3206CD8B3006EA328 /* SDWebImageAPNGCoder.m */; };
|
||||
327054DE206CD8B3006EA328 /* SDWebImageAPNGCoder.m in Sources */ = {isa = PBXBuildFile; fileRef = 327054D3206CD8B3006EA328 /* SDWebImageAPNGCoder.m */; };
|
||||
327054DF206CD8B3006EA328 /* SDWebImageAPNGCoder.m in Sources */ = {isa = PBXBuildFile; fileRef = 327054D3206CD8B3006EA328 /* SDWebImageAPNGCoder.m */; };
|
||||
328BB69C2081FED200760D6C /* SDWebImageCacheKeyFilter.h in Headers */ = {isa = PBXBuildFile; fileRef = 328BB69A2081FED200760D6C /* SDWebImageCacheKeyFilter.h */; settings = {ATTRIBUTES = (Public, ); }; };
|
||||
328BB69D2081FED200760D6C /* SDWebImageCacheKeyFilter.h in Headers */ = {isa = PBXBuildFile; fileRef = 328BB69A2081FED200760D6C /* SDWebImageCacheKeyFilter.h */; settings = {ATTRIBUTES = (Public, ); }; };
|
||||
328BB69E2081FED200760D6C /* SDWebImageCacheKeyFilter.h in Headers */ = {isa = PBXBuildFile; fileRef = 328BB69A2081FED200760D6C /* SDWebImageCacheKeyFilter.h */; settings = {ATTRIBUTES = (Public, ); }; };
|
||||
328BB69F2081FED200760D6C /* SDWebImageCacheKeyFilter.h in Headers */ = {isa = PBXBuildFile; fileRef = 328BB69A2081FED200760D6C /* SDWebImageCacheKeyFilter.h */; settings = {ATTRIBUTES = (Public, ); }; };
|
||||
328BB6A02081FED200760D6C /* SDWebImageCacheKeyFilter.h in Headers */ = {isa = PBXBuildFile; fileRef = 328BB69A2081FED200760D6C /* SDWebImageCacheKeyFilter.h */; settings = {ATTRIBUTES = (Public, ); }; };
|
||||
328BB6A12081FED200760D6C /* SDWebImageCacheKeyFilter.h in Headers */ = {isa = PBXBuildFile; fileRef = 328BB69A2081FED200760D6C /* SDWebImageCacheKeyFilter.h */; settings = {ATTRIBUTES = (Public, ); }; };
|
||||
328BB6A22081FED200760D6C /* SDWebImageCacheKeyFilter.m in Sources */ = {isa = PBXBuildFile; fileRef = 328BB69B2081FED200760D6C /* SDWebImageCacheKeyFilter.m */; };
|
||||
328BB6A32081FED200760D6C /* SDWebImageCacheKeyFilter.m in Sources */ = {isa = PBXBuildFile; fileRef = 328BB69B2081FED200760D6C /* SDWebImageCacheKeyFilter.m */; };
|
||||
328BB6A42081FED200760D6C /* SDWebImageCacheKeyFilter.m in Sources */ = {isa = PBXBuildFile; fileRef = 328BB69B2081FED200760D6C /* SDWebImageCacheKeyFilter.m */; };
|
||||
328BB6A52081FED200760D6C /* SDWebImageCacheKeyFilter.m in Sources */ = {isa = PBXBuildFile; fileRef = 328BB69B2081FED200760D6C /* SDWebImageCacheKeyFilter.m */; };
|
||||
328BB6A62081FED200760D6C /* SDWebImageCacheKeyFilter.m in Sources */ = {isa = PBXBuildFile; fileRef = 328BB69B2081FED200760D6C /* SDWebImageCacheKeyFilter.m */; };
|
||||
328BB6A72081FED200760D6C /* SDWebImageCacheKeyFilter.m in Sources */ = {isa = PBXBuildFile; fileRef = 328BB69B2081FED200760D6C /* SDWebImageCacheKeyFilter.m */; };
|
||||
328BB6AA2081FEE500760D6C /* SDWebImageCacheSerializer.h in Headers */ = {isa = PBXBuildFile; fileRef = 328BB6A82081FEE500760D6C /* SDWebImageCacheSerializer.h */; settings = {ATTRIBUTES = (Public, ); }; };
|
||||
328BB6AB2081FEE500760D6C /* SDWebImageCacheSerializer.h in Headers */ = {isa = PBXBuildFile; fileRef = 328BB6A82081FEE500760D6C /* SDWebImageCacheSerializer.h */; settings = {ATTRIBUTES = (Public, ); }; };
|
||||
328BB6AC2081FEE500760D6C /* SDWebImageCacheSerializer.h in Headers */ = {isa = PBXBuildFile; fileRef = 328BB6A82081FEE500760D6C /* SDWebImageCacheSerializer.h */; settings = {ATTRIBUTES = (Public, ); }; };
|
||||
328BB6AD2081FEE500760D6C /* SDWebImageCacheSerializer.h in Headers */ = {isa = PBXBuildFile; fileRef = 328BB6A82081FEE500760D6C /* SDWebImageCacheSerializer.h */; settings = {ATTRIBUTES = (Public, ); }; };
|
||||
328BB6AE2081FEE500760D6C /* SDWebImageCacheSerializer.h in Headers */ = {isa = PBXBuildFile; fileRef = 328BB6A82081FEE500760D6C /* SDWebImageCacheSerializer.h */; settings = {ATTRIBUTES = (Public, ); }; };
|
||||
328BB6AF2081FEE500760D6C /* SDWebImageCacheSerializer.h in Headers */ = {isa = PBXBuildFile; fileRef = 328BB6A82081FEE500760D6C /* SDWebImageCacheSerializer.h */; settings = {ATTRIBUTES = (Public, ); }; };
|
||||
328BB6B02081FEE500760D6C /* SDWebImageCacheSerializer.m in Sources */ = {isa = PBXBuildFile; fileRef = 328BB6A92081FEE500760D6C /* SDWebImageCacheSerializer.m */; };
|
||||
328BB6B12081FEE500760D6C /* SDWebImageCacheSerializer.m in Sources */ = {isa = PBXBuildFile; fileRef = 328BB6A92081FEE500760D6C /* SDWebImageCacheSerializer.m */; };
|
||||
328BB6B22081FEE500760D6C /* SDWebImageCacheSerializer.m in Sources */ = {isa = PBXBuildFile; fileRef = 328BB6A92081FEE500760D6C /* SDWebImageCacheSerializer.m */; };
|
||||
328BB6B32081FEE500760D6C /* SDWebImageCacheSerializer.m in Sources */ = {isa = PBXBuildFile; fileRef = 328BB6A92081FEE500760D6C /* SDWebImageCacheSerializer.m */; };
|
||||
328BB6B42081FEE500760D6C /* SDWebImageCacheSerializer.m in Sources */ = {isa = PBXBuildFile; fileRef = 328BB6A92081FEE500760D6C /* SDWebImageCacheSerializer.m */; };
|
||||
328BB6B52081FEE500760D6C /* SDWebImageCacheSerializer.m in Sources */ = {isa = PBXBuildFile; fileRef = 328BB6A92081FEE500760D6C /* SDWebImageCacheSerializer.m */; };
|
||||
3290FA041FA478AF0047D20C /* SDWebImageFrame.h in Headers */ = {isa = PBXBuildFile; fileRef = 3290FA021FA478AF0047D20C /* SDWebImageFrame.h */; settings = {ATTRIBUTES = (Public, ); }; };
|
||||
3290FA051FA478AF0047D20C /* SDWebImageFrame.h in Headers */ = {isa = PBXBuildFile; fileRef = 3290FA021FA478AF0047D20C /* SDWebImageFrame.h */; settings = {ATTRIBUTES = (Public, ); }; };
|
||||
3290FA061FA478AF0047D20C /* SDWebImageFrame.h in Headers */ = {isa = PBXBuildFile; fileRef = 3290FA021FA478AF0047D20C /* SDWebImageFrame.h */; settings = {ATTRIBUTES = (Public, ); }; };
|
||||
|
|
@ -1492,6 +1516,10 @@
|
|||
325312C7200F09910046BF1E /* SDWebImageTransition.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SDWebImageTransition.m; sourceTree = "<group>"; };
|
||||
327054D2206CD8B3006EA328 /* SDWebImageAPNGCoder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDWebImageAPNGCoder.h; sourceTree = "<group>"; };
|
||||
327054D3206CD8B3006EA328 /* SDWebImageAPNGCoder.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDWebImageAPNGCoder.m; sourceTree = "<group>"; };
|
||||
328BB69A2081FED200760D6C /* SDWebImageCacheKeyFilter.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SDWebImageCacheKeyFilter.h; sourceTree = "<group>"; };
|
||||
328BB69B2081FED200760D6C /* SDWebImageCacheKeyFilter.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SDWebImageCacheKeyFilter.m; sourceTree = "<group>"; };
|
||||
328BB6A82081FEE500760D6C /* SDWebImageCacheSerializer.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SDWebImageCacheSerializer.h; sourceTree = "<group>"; };
|
||||
328BB6A92081FEE500760D6C /* SDWebImageCacheSerializer.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SDWebImageCacheSerializer.m; sourceTree = "<group>"; };
|
||||
3290FA021FA478AF0047D20C /* SDWebImageFrame.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SDWebImageFrame.h; sourceTree = "<group>"; };
|
||||
3290FA031FA478AF0047D20C /* SDWebImageFrame.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SDWebImageFrame.m; sourceTree = "<group>"; };
|
||||
329A18571FFF5DFD008C9A2F /* UIImage+WebCache.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "UIImage+WebCache.h"; path = "SDWebImage/UIImage+WebCache.h"; sourceTree = "<group>"; };
|
||||
|
|
@ -1824,6 +1852,37 @@
|
|||
name = ImageView;
|
||||
sourceTree = "<group>";
|
||||
};
|
||||
328BB6972081FDAB00760D6C /* Manager */ = {
|
||||
isa = PBXGroup;
|
||||
children = (
|
||||
53922D8E148C56230056699D /* SDWebImageManager.h */,
|
||||
53922D8F148C56230056699D /* SDWebImageManager.m */,
|
||||
328BB69A2081FED200760D6C /* SDWebImageCacheKeyFilter.h */,
|
||||
328BB69B2081FED200760D6C /* SDWebImageCacheKeyFilter.m */,
|
||||
328BB6A82081FEE500760D6C /* SDWebImageCacheSerializer.h */,
|
||||
328BB6A92081FEE500760D6C /* SDWebImageCacheSerializer.m */,
|
||||
);
|
||||
name = Manager;
|
||||
sourceTree = "<group>";
|
||||
};
|
||||
328BB6982081FDD800760D6C /* Prefetcher */ = {
|
||||
isa = PBXGroup;
|
||||
children = (
|
||||
53922D91148C56230056699D /* SDWebImagePrefetcher.h */,
|
||||
53922D92148C56230056699D /* SDWebImagePrefetcher.m */,
|
||||
);
|
||||
name = Prefetcher;
|
||||
sourceTree = "<group>";
|
||||
};
|
||||
328BB6992081FDDF00760D6C /* Transformer */ = {
|
||||
isa = PBXGroup;
|
||||
children = (
|
||||
32F7C06D2030114C00873181 /* SDWebImageTransformer.h */,
|
||||
32F7C06E2030114C00873181 /* SDWebImageTransformer.m */,
|
||||
);
|
||||
name = Transformer;
|
||||
sourceTree = "<group>";
|
||||
};
|
||||
4369C2851D9811BB007E863A /* WebCache Categories */ = {
|
||||
isa = PBXGroup;
|
||||
children = (
|
||||
|
|
@ -1940,12 +1999,12 @@
|
|||
53922D74148C55820056699D /* SDWebImage */ = {
|
||||
isa = PBXGroup;
|
||||
children = (
|
||||
53922D88148C56230056699D /* SDWebImageCompat.h */,
|
||||
5340674F167780C40042B59E /* SDWebImageCompat.m */,
|
||||
530E49E71646388E002868E7 /* SDWebImageOperation.h */,
|
||||
328BB6972081FDAB00760D6C /* Manager */,
|
||||
53922DAB148C56810056699D /* Downloader */,
|
||||
53922DAA148C56470056699D /* Cache */,
|
||||
321E60831F38E88F00405457 /* Decoder */,
|
||||
328BB6982081FDD800760D6C /* Prefetcher */,
|
||||
328BB6992081FDDF00760D6C /* Transformer */,
|
||||
32484756201775CE00AF9E5A /* ImageView */,
|
||||
53922DAC148C56DD0056699D /* Utils */,
|
||||
53922DA9148C562D0056699D /* Categories */,
|
||||
|
|
@ -2007,18 +2066,15 @@
|
|||
53922DAC148C56DD0056699D /* Utils */ = {
|
||||
isa = PBXGroup;
|
||||
children = (
|
||||
53922D8E148C56230056699D /* SDWebImageManager.h */,
|
||||
53922D8F148C56230056699D /* SDWebImageManager.m */,
|
||||
53922D91148C56230056699D /* SDWebImagePrefetcher.h */,
|
||||
53922D92148C56230056699D /* SDWebImagePrefetcher.m */,
|
||||
53922D88148C56230056699D /* SDWebImageCompat.h */,
|
||||
5340674F167780C40042B59E /* SDWebImageCompat.m */,
|
||||
530E49E71646388E002868E7 /* SDWebImageOperation.h */,
|
||||
324DF4B2200A14DC008A84CC /* SDWebImageDefine.h */,
|
||||
324DF4B3200A14DC008A84CC /* SDWebImageDefine.m */,
|
||||
325312C6200F09910046BF1E /* SDWebImageTransition.h */,
|
||||
325312C7200F09910046BF1E /* SDWebImageTransition.m */,
|
||||
32C0FDDF2013426C001B8F2D /* SDWebImageIndicator.h */,
|
||||
32C0FDE02013426C001B8F2D /* SDWebImageIndicator.m */,
|
||||
32F7C06D2030114C00873181 /* SDWebImageTransformer.h */,
|
||||
32F7C06E2030114C00873181 /* SDWebImageTransformer.m */,
|
||||
);
|
||||
name = Utils;
|
||||
sourceTree = "<group>";
|
||||
|
|
@ -2207,6 +2263,7 @@
|
|||
4317395A1CDFC8B70008FEB9 /* mux_types.h in Headers */,
|
||||
431739561CDFC8B70008FEB9 /* demux.h in Headers */,
|
||||
32B9B53A206ED4230026769D /* SDWebImageDownloaderConfig.h in Headers */,
|
||||
328BB6AD2081FEE500760D6C /* SDWebImageCacheSerializer.h in Headers */,
|
||||
80377C4A1F2F666300F89830 /* bit_writer_utils.h in Headers */,
|
||||
4397D2F81D0DF44200BB2784 /* MKAnnotationView+WebCache.h in Headers */,
|
||||
323F8BE71F38EF770092B609 /* vp8li_enc.h in Headers */,
|
||||
|
|
@ -2284,6 +2341,7 @@
|
|||
80377C551F2F666300F89830 /* quant_levels_dec_utils.h in Headers */,
|
||||
80377EC11F2F66D500F89830 /* vp8_dec.h in Headers */,
|
||||
00733A651BC4880E00A5A117 /* SDWebImageDownloader.h in Headers */,
|
||||
328BB69F2081FED200760D6C /* SDWebImageCacheKeyFilter.h in Headers */,
|
||||
);
|
||||
runOnlyForDeploymentPostprocessing = 0;
|
||||
};
|
||||
|
|
@ -2298,6 +2356,7 @@
|
|||
321E60B11F38E90100405457 /* SDWebImageWebPCoder.h in Headers */,
|
||||
80377E9A1F2F66D400F89830 /* common_dec.h in Headers */,
|
||||
327054D5206CD8B3006EA328 /* SDWebImageAPNGCoder.h in Headers */,
|
||||
328BB6AB2081FEE500760D6C /* SDWebImageCacheSerializer.h in Headers */,
|
||||
32B9B538206ED4230026769D /* SDWebImageDownloaderConfig.h in Headers */,
|
||||
80377C231F2F666300F89830 /* quant_levels_utils.h in Headers */,
|
||||
321E60BF1F38E91700405457 /* UIImage+ForceDecode.h in Headers */,
|
||||
|
|
@ -2305,6 +2364,7 @@
|
|||
807A12291F89636300EC2A9B /* SDWebImageCodersManager.h in Headers */,
|
||||
32F7C0852030719600873181 /* UIImage+Transform.h in Headers */,
|
||||
80377C141F2F666300F89830 /* bit_reader_utils.h in Headers */,
|
||||
328BB69D2081FED200760D6C /* SDWebImageCacheKeyFilter.h in Headers */,
|
||||
323F8C0F1F38EF770092B609 /* muxi.h in Headers */,
|
||||
32F7C0702030114C00873181 /* SDWebImageTransformer.h in Headers */,
|
||||
80377C2B1F2F666300F89830 /* utils.h in Headers */,
|
||||
|
|
@ -2379,6 +2439,7 @@
|
|||
buildActionMask = 2147483647;
|
||||
files = (
|
||||
80377C791F2F666400F89830 /* utils.h in Headers */,
|
||||
328BB6A02081FED200760D6C /* SDWebImageCacheKeyFilter.h in Headers */,
|
||||
323F8B721F38EF770092B609 /* delta_palettization_enc.h in Headers */,
|
||||
32CF1C0B1FA496B000004BD1 /* SDWebImageCoderHelper.h in Headers */,
|
||||
431BB6D71D06D2C1006A3455 /* UIImage+WebP.h in Headers */,
|
||||
|
|
@ -2424,6 +2485,7 @@
|
|||
431BB6EE1D06D2C1006A3455 /* NSData+ImageContentType.h in Headers */,
|
||||
431BB6EF1D06D2C1006A3455 /* SDWebImagePrefetcher.h in Headers */,
|
||||
80377C671F2F666400F89830 /* endian_inl_utils.h in Headers */,
|
||||
328BB6AE2081FEE500760D6C /* SDWebImageCacheSerializer.h in Headers */,
|
||||
80377C6B1F2F666400F89830 /* huffman_encode_utils.h in Headers */,
|
||||
323F8C121F38EF770092B609 /* muxi.h in Headers */,
|
||||
32C0FDE52013426C001B8F2D /* SDWebImageIndicator.h in Headers */,
|
||||
|
|
@ -2474,6 +2536,7 @@
|
|||
80377EDA1F2F66D500F89830 /* common_dec.h in Headers */,
|
||||
80377EE61F2F66D500F89830 /* webpi_dec.h in Headers */,
|
||||
32B9B53C206ED4230026769D /* SDWebImageDownloaderConfig.h in Headers */,
|
||||
328BB6AF2081FEE500760D6C /* SDWebImageCacheSerializer.h in Headers */,
|
||||
4397D2BA1D0DDD8C00BB2784 /* demux.h in Headers */,
|
||||
80377C8F1F2F666400F89830 /* rescaler_utils.h in Headers */,
|
||||
4397D2BD1D0DDD8C00BB2784 /* types.h in Headers */,
|
||||
|
|
@ -2551,6 +2614,7 @@
|
|||
4397D2ED1D0DDD8C00BB2784 /* mux_types.h in Headers */,
|
||||
80377C831F2F666400F89830 /* filters_utils.h in Headers */,
|
||||
80377E651F2F66A800F89830 /* msa_macro.h in Headers */,
|
||||
328BB6A12081FED200760D6C /* SDWebImageCacheKeyFilter.h in Headers */,
|
||||
);
|
||||
runOnlyForDeploymentPostprocessing = 0;
|
||||
};
|
||||
|
|
@ -2566,6 +2630,7 @@
|
|||
4317394F1CDFC8B70008FEB9 /* demux.h in Headers */,
|
||||
43CE757D1CFE9427006C64D0 /* FLAnimatedImageView.h in Headers */,
|
||||
32B9B539206ED4230026769D /* SDWebImageDownloaderConfig.h in Headers */,
|
||||
328BB6AC2081FEE500760D6C /* SDWebImageCacheSerializer.h in Headers */,
|
||||
80377C301F2F666300F89830 /* bit_writer_utils.h in Headers */,
|
||||
431739541CDFC8B70008FEB9 /* types.h in Headers */,
|
||||
323F8BE61F38EF770092B609 /* vp8li_enc.h in Headers */,
|
||||
|
|
@ -2643,6 +2708,7 @@
|
|||
80377EB11F2F66D400F89830 /* vp8_dec.h in Headers */,
|
||||
4A2CAE291AB4BB7500B6BC39 /* NSData+ImageContentType.h in Headers */,
|
||||
431739531CDFC8B70008FEB9 /* mux_types.h in Headers */,
|
||||
328BB69E2081FED200760D6C /* SDWebImageCacheKeyFilter.h in Headers */,
|
||||
);
|
||||
runOnlyForDeploymentPostprocessing = 0;
|
||||
};
|
||||
|
|
@ -2683,6 +2749,7 @@
|
|||
329A18591FFF5DFD008C9A2F /* UIImage+WebCache.h in Headers */,
|
||||
5376131A155AD0D5005750A4 /* SDWebImageDownloader.h in Headers */,
|
||||
4369C2771D9807EC007E863A /* UIView+WebCache.h in Headers */,
|
||||
328BB6AA2081FEE500760D6C /* SDWebImageCacheSerializer.h in Headers */,
|
||||
80377CEF1F2F66A100F89830 /* dsp.h in Headers */,
|
||||
32F21B5120788D8C0036B1D5 /* SDWebImageDownloaderRequestModifier.h in Headers */,
|
||||
80377C011F2F665300F89830 /* filters_utils.h in Headers */,
|
||||
|
|
@ -2700,6 +2767,7 @@
|
|||
5376131F155AD0D5005750A4 /* UIButton+WebCache.h in Headers */,
|
||||
327054D4206CD8B3006EA328 /* SDWebImageAPNGCoder.h in Headers */,
|
||||
53761320155AD0D5005750A4 /* UIImageView+WebCache.h in Headers */,
|
||||
328BB69C2081FED200760D6C /* SDWebImageCacheKeyFilter.h in Headers */,
|
||||
530E49E816464C25002868E7 /* SDWebImageOperation.h in Headers */,
|
||||
32484769201775F600AF9E5A /* SDAnimatedImageView.h in Headers */,
|
||||
80377E961F2F66D000F89830 /* webpi_dec.h in Headers */,
|
||||
|
|
@ -2969,6 +3037,7 @@
|
|||
323F8BE11F38EF770092B609 /* vp8l_enc.c in Sources */,
|
||||
80377DAB1F2F66A700F89830 /* alpha_processing_sse41.c in Sources */,
|
||||
80377DBA1F2F66A700F89830 /* dec_neon.c in Sources */,
|
||||
328BB6A52081FED200760D6C /* SDWebImageCacheKeyFilter.m in Sources */,
|
||||
80377C5C1F2F666300F89830 /* thread_utils.c in Sources */,
|
||||
00733A5A1BC4880000A5A117 /* SDWebImagePrefetcher.m in Sources */,
|
||||
80377DBF1F2F66A700F89830 /* enc_avx2.c in Sources */,
|
||||
|
|
@ -3105,6 +3174,7 @@
|
|||
80377DE21F2F66A700F89830 /* rescaler.c in Sources */,
|
||||
329A18621FFF5DFD008C9A2F /* UIImage+WebCache.m in Sources */,
|
||||
80377DAD1F2F66A700F89830 /* argb_mips_dsp_r2.c in Sources */,
|
||||
328BB6B32081FEE500760D6C /* SDWebImageCacheSerializer.m in Sources */,
|
||||
00733A601BC4880000A5A117 /* UIImageView+HighlightedWebCache.m in Sources */,
|
||||
323F8BAB1F38EF770092B609 /* picture_psnr_enc.c in Sources */,
|
||||
323F8BA51F38EF770092B609 /* picture_enc.c in Sources */,
|
||||
|
|
@ -3188,6 +3258,7 @@
|
|||
80377D5F1F2F66A700F89830 /* yuv_mips32.c in Sources */,
|
||||
80377D3C1F2F66A700F89830 /* enc.c in Sources */,
|
||||
4314D13B1D0E0E3B004B36C9 /* UIButton+WebCache.m in Sources */,
|
||||
328BB6A32081FED200760D6C /* SDWebImageCacheKeyFilter.m in Sources */,
|
||||
32F21B5820788D8C0036B1D5 /* SDWebImageDownloaderRequestModifier.m in Sources */,
|
||||
321E60C51F38E91700405457 /* UIImage+ForceDecode.m in Sources */,
|
||||
80377D461F2F66A700F89830 /* lossless_enc_neon.c in Sources */,
|
||||
|
|
@ -3238,6 +3309,7 @@
|
|||
80377C1A1F2F666300F89830 /* filters_utils.c in Sources */,
|
||||
323F8B9D1F38EF770092B609 /* picture_csp_enc.c in Sources */,
|
||||
4314D14B1D0E0E3B004B36C9 /* SDWebImageCompat.m in Sources */,
|
||||
328BB6B12081FEE500760D6C /* SDWebImageCacheSerializer.m in Sources */,
|
||||
4314D14D1D0E0E3B004B36C9 /* UIImage+GIF.m in Sources */,
|
||||
32CF1C0E1FA496B000004BD1 /* SDWebImageCoderHelper.m in Sources */,
|
||||
323F8B571F38EF770092B609 /* config_enc.c in Sources */,
|
||||
|
|
@ -3345,6 +3417,7 @@
|
|||
80377E2E1F2F66A800F89830 /* yuv_mips32.c in Sources */,
|
||||
80377E0B1F2F66A800F89830 /* enc.c in Sources */,
|
||||
431BB6AC1D06D2C1006A3455 /* SDWebImageCompat.m in Sources */,
|
||||
328BB6A62081FED200760D6C /* SDWebImageCacheKeyFilter.m in Sources */,
|
||||
32F21B5B20788D8C0036B1D5 /* SDWebImageDownloaderRequestModifier.m in Sources */,
|
||||
80377E151F2F66A800F89830 /* lossless_enc_neon.c in Sources */,
|
||||
321E60C81F38E91700405457 /* UIImage+ForceDecode.m in Sources */,
|
||||
|
|
@ -3395,6 +3468,7 @@
|
|||
80377E141F2F66A800F89830 /* lossless_enc_msa.c in Sources */,
|
||||
323F8BA01F38EF770092B609 /* picture_csp_enc.c in Sources */,
|
||||
80377C701F2F666400F89830 /* quant_levels_utils.c in Sources */,
|
||||
328BB6B42081FEE500760D6C /* SDWebImageCacheSerializer.m in Sources */,
|
||||
431BB6BD1D06D2C1006A3455 /* UIImage+GIF.m in Sources */,
|
||||
32CF1C111FA496B000004BD1 /* SDWebImageCoderHelper.m in Sources */,
|
||||
323F8B5A1F38EF770092B609 /* config_enc.c in Sources */,
|
||||
|
|
@ -3477,6 +3551,7 @@
|
|||
80377E6C1F2F66A800F89830 /* rescaler.c in Sources */,
|
||||
32484762201775F600AF9E5A /* SDAnimatedImageView.m in Sources */,
|
||||
80377EE31F2F66D500F89830 /* vp8l_dec.c in Sources */,
|
||||
328BB6B52081FEE500760D6C /* SDWebImageCacheSerializer.m in Sources */,
|
||||
80377ED71F2F66D500F89830 /* alpha_dec.c in Sources */,
|
||||
323F8B7F1F38EF770092B609 /* frame_enc.c in Sources */,
|
||||
80377E681F2F66A800F89830 /* rescaler_mips32.c in Sources */,
|
||||
|
|
@ -3504,6 +3579,7 @@
|
|||
80377E3B1F2F66A800F89830 /* cost_mips_dsp_r2.c in Sources */,
|
||||
4397D29B1D0DDD8C00BB2784 /* SDWebImageDownloader.m in Sources */,
|
||||
80377E711F2F66A800F89830 /* upsampling.c in Sources */,
|
||||
328BB6A72081FED200760D6C /* SDWebImageCacheKeyFilter.m in Sources */,
|
||||
4397D29C1D0DDD8C00BB2784 /* NSData+ImageContentType.m in Sources */,
|
||||
323F8BB31F38EF770092B609 /* picture_rescale_enc.c in Sources */,
|
||||
80377E6A1F2F66A800F89830 /* rescaler_neon.c in Sources */,
|
||||
|
|
@ -3603,6 +3679,7 @@
|
|||
323F8BE01F38EF770092B609 /* vp8l_enc.c in Sources */,
|
||||
80377D751F2F66A700F89830 /* dec_neon.c in Sources */,
|
||||
80377C421F2F666300F89830 /* thread_utils.c in Sources */,
|
||||
328BB6A42081FED200760D6C /* SDWebImageCacheKeyFilter.m in Sources */,
|
||||
4A2CAE2E1AB4BB7500B6BC39 /* UIImage+GIF.m in Sources */,
|
||||
80377D7A1F2F66A700F89830 /* enc_avx2.c in Sources */,
|
||||
80377D821F2F66A700F89830 /* filters_mips_dsp_r2.c in Sources */,
|
||||
|
|
@ -3739,6 +3816,7 @@
|
|||
80377D8B1F2F66A700F89830 /* lossless_enc_neon.c in Sources */,
|
||||
329A18611FFF5DFD008C9A2F /* UIImage+WebCache.m in Sources */,
|
||||
80377D9D1F2F66A700F89830 /* rescaler.c in Sources */,
|
||||
328BB6B22081FEE500760D6C /* SDWebImageCacheSerializer.m in Sources */,
|
||||
80377D681F2F66A700F89830 /* argb_mips_dsp_r2.c in Sources */,
|
||||
323F8BAA1F38EF770092B609 /* picture_psnr_enc.c in Sources */,
|
||||
323F8BA41F38EF770092B609 /* picture_enc.c in Sources */,
|
||||
|
|
@ -3764,6 +3842,7 @@
|
|||
323F8BDE1F38EF770092B609 /* vp8l_enc.c in Sources */,
|
||||
80377CEB1F2F66A100F89830 /* dec_neon.c in Sources */,
|
||||
80377C0E1F2F665300F89830 /* thread_utils.c in Sources */,
|
||||
328BB6A22081FED200760D6C /* SDWebImageCacheKeyFilter.m in Sources */,
|
||||
53761309155AD0D5005750A4 /* SDImageCache.m in Sources */,
|
||||
80377CF01F2F66A100F89830 /* enc_avx2.c in Sources */,
|
||||
80377CF81F2F66A100F89830 /* filters_mips_dsp_r2.c in Sources */,
|
||||
|
|
@ -3900,6 +3979,7 @@
|
|||
80377D011F2F66A100F89830 /* lossless_enc_neon.c in Sources */,
|
||||
329A185F1FFF5DFD008C9A2F /* UIImage+WebCache.m in Sources */,
|
||||
80377D131F2F66A100F89830 /* rescaler.c in Sources */,
|
||||
328BB6B02081FEE500760D6C /* SDWebImageCacheSerializer.m in Sources */,
|
||||
80377CDE1F2F66A100F89830 /* argb_mips_dsp_r2.c in Sources */,
|
||||
323F8BA81F38EF770092B609 /* picture_psnr_enc.c in Sources */,
|
||||
323F8BA21F38EF770092B609 /* picture_enc.c in Sources */,
|
||||
|
|
|
|||
|
|
@ -0,0 +1,26 @@
|
|||
/*
|
||||
* This file is part of the SDWebImage package.
|
||||
* (c) Olivier Poitrey <rs@dailymotion.com>
|
||||
*
|
||||
* For the full copyright and license information, please view the LICENSE
|
||||
* file that was distributed with this source code.
|
||||
*/
|
||||
|
||||
#import <Foundation/Foundation.h>
|
||||
#import "SDWebImageCompat.h"
|
||||
|
||||
typedef NSString * _Nullable(^SDWebImageCacheKeyFilterBlock)(NSURL * _Nonnull url);
|
||||
|
||||
// This is the protocol for cache key filter. We can use a block to specify the cache key filter. But Using protocol can make this extensible, and allow Swift user to use it easily instead of using `@convention(block)` to store a block into context options.
|
||||
@protocol SDWebImageCacheKeyFilter <NSObject>
|
||||
|
||||
- (nullable NSString *)cacheKeyForURL:(nonnull NSURL *)url;
|
||||
|
||||
@end
|
||||
|
||||
@interface SDWebImageCacheKeyFilter : NSObject <SDWebImageCacheKeyFilter>
|
||||
|
||||
- (nonnull instancetype)initWithBlock:(nonnull SDWebImageCacheKeyFilterBlock)block;
|
||||
+ (nonnull instancetype)cacheKeyFilterWithBlock:(nonnull SDWebImageCacheKeyFilterBlock)block;
|
||||
|
||||
@end
|
||||
|
|
@ -0,0 +1,39 @@
|
|||
/*
|
||||
* This file is part of the SDWebImage package.
|
||||
* (c) Olivier Poitrey <rs@dailymotion.com>
|
||||
*
|
||||
* For the full copyright and license information, please view the LICENSE
|
||||
* file that was distributed with this source code.
|
||||
*/
|
||||
|
||||
#import "SDWebImageCacheKeyFilter.h"
|
||||
|
||||
@interface SDWebImageCacheKeyFilter ()
|
||||
|
||||
@property (nonatomic, copy, nonnull) SDWebImageCacheKeyFilterBlock block;
|
||||
|
||||
@end
|
||||
|
||||
@implementation SDWebImageCacheKeyFilter
|
||||
|
||||
- (instancetype)initWithBlock:(SDWebImageCacheKeyFilterBlock)block {
|
||||
self = [super init];
|
||||
if (self) {
|
||||
self.block = block;
|
||||
}
|
||||
return self;
|
||||
}
|
||||
|
||||
+ (instancetype)cacheKeyFilterWithBlock:(SDWebImageCacheKeyFilterBlock)block {
|
||||
SDWebImageCacheKeyFilter *cacheKeyFilter = [[SDWebImageCacheKeyFilter alloc] initWithBlock:block];
|
||||
return cacheKeyFilter;
|
||||
}
|
||||
|
||||
- (NSString *)cacheKeyForURL:(NSURL *)url {
|
||||
if (!self.block) {
|
||||
return nil;
|
||||
}
|
||||
return self.block(url);
|
||||
}
|
||||
|
||||
@end
|
||||
|
|
@ -0,0 +1,26 @@
|
|||
/*
|
||||
* This file is part of the SDWebImage package.
|
||||
* (c) Olivier Poitrey <rs@dailymotion.com>
|
||||
*
|
||||
* For the full copyright and license information, please view the LICENSE
|
||||
* file that was distributed with this source code.
|
||||
*/
|
||||
|
||||
#import <Foundation/Foundation.h>
|
||||
#import "SDWebImageCompat.h"
|
||||
|
||||
typedef NSData * _Nullable(^SDWebImageCacheSerializerBlock)(UIImage * _Nonnull image, NSData * _Nullable data, NSURL * _Nullable imageURL);
|
||||
|
||||
// This is the protocol for cache serializer. We can use a block to specify the cache serializer. But Using protocol can make this extensible, and allow Swift user to use it easily instead of using `@convention(block)` to store a block into context options.
|
||||
@protocol SDWebImageCacheSerializer <NSObject>
|
||||
|
||||
- (nullable NSData *)cacheDataWithImage:(nonnull UIImage *)image originalData:(nullable NSData *)data imageURL:(nullable NSURL *)imageURL;
|
||||
|
||||
@end
|
||||
|
||||
@interface SDWebImageCacheSerializer : NSObject <SDWebImageCacheSerializer>
|
||||
|
||||
- (nonnull instancetype)initWithBlock:(nonnull SDWebImageCacheSerializerBlock)block;
|
||||
+ (nonnull instancetype)cacheSerializerWithBlock:(nonnull SDWebImageCacheSerializerBlock)block;
|
||||
|
||||
@end
|
||||
|
|
@ -0,0 +1,39 @@
|
|||
/*
|
||||
* This file is part of the SDWebImage package.
|
||||
* (c) Olivier Poitrey <rs@dailymotion.com>
|
||||
*
|
||||
* For the full copyright and license information, please view the LICENSE
|
||||
* file that was distributed with this source code.
|
||||
*/
|
||||
|
||||
#import "SDWebImageCacheSerializer.h"
|
||||
|
||||
@interface SDWebImageCacheSerializer ()
|
||||
|
||||
@property (nonatomic, copy, nonnull) SDWebImageCacheSerializerBlock block;
|
||||
|
||||
@end
|
||||
|
||||
@implementation SDWebImageCacheSerializer
|
||||
|
||||
- (instancetype)initWithBlock:(SDWebImageCacheSerializerBlock)block {
|
||||
self = [super init];
|
||||
if (self) {
|
||||
self.block = block;
|
||||
}
|
||||
return self;
|
||||
}
|
||||
|
||||
+ (instancetype)cacheSerializerWithBlock:(SDWebImageCacheSerializerBlock)block {
|
||||
SDWebImageCacheSerializer *cacheSerializer = [[SDWebImageCacheSerializer alloc] initWithBlock:block];
|
||||
return cacheSerializer;
|
||||
}
|
||||
|
||||
- (NSData *)cacheDataWithImage:(UIImage *)image originalData:(NSData *)data imageURL:(nullable NSURL *)imageURL {
|
||||
if (!self.block) {
|
||||
return nil;
|
||||
}
|
||||
return self.block(image, data, imageURL);
|
||||
}
|
||||
|
||||
@end
|
||||
|
|
@ -204,3 +204,13 @@ FOUNDATION_EXPORT SDWebImageContextOption _Nonnull const SDWebImageContextAnimat
|
|||
A id<SDWebImageDownloaderRequestModifier> instance to modify the image download request. It's used for downloader to modify the original request from URL and options. If you provide one, it will ignore the `requestModifier` in downloader and use provided one instead. (id<SDWebImageDownloaderRequestModifier>)
|
||||
*/
|
||||
FOUNDATION_EXPORT SDWebImageContextOption _Nonnull const SDWebImageContextDownloadRequestModifier;
|
||||
|
||||
/**
|
||||
A id<SDWebImageCacheKeyFilter> instance to convert an URL into a cache key. It's used when manager need cache key to use image cache. If you provide one, it will ignore the `cacheKeyFilter` in manager and use provided one instead. (id<SDWebImageCacheKeyFilter>)
|
||||
*/
|
||||
FOUNDATION_EXPORT SDWebImageContextOption _Nonnull const SDWebImageContextCacheKeyFilter;
|
||||
|
||||
/**
|
||||
A id<SDWebImageCacheSerializer> instance to convert the decoded image, the source downloaded data, to the actual data. It's used for manager to store image to the disk cache. If you provide one, it will ignore the `cacheSerializer` in manager and use provided one instead. (id<SDWebImageCacheSerializer>)
|
||||
*/
|
||||
FOUNDATION_EXPORT SDWebImageContextOption _Nonnull const SDWebImageContextCacheSerializer;
|
||||
|
|
|
|||
|
|
@ -123,3 +123,5 @@ SDWebImageContextOption const SDWebImageContextCustomTransformer = @"customTrans
|
|||
SDWebImageContextOption const SDWebImageContextImageScaleFactor = @"imageScaleFactor";
|
||||
SDWebImageContextOption const SDWebImageContextAnimatedImageClass = @"animatedImageClass";
|
||||
SDWebImageContextOption const SDWebImageContextDownloadRequestModifier = @"downloadRequestModifier";
|
||||
SDWebImageContextOption const SDWebImageContextCacheKeyFilter = @"cacheKeyFilter";
|
||||
SDWebImageContextOption const SDWebImageContextCacheSerializer = @"cacheSerializer";
|
||||
|
|
|
|||
|
|
@ -11,6 +11,7 @@
|
|||
|
||||
typedef NSURLRequest * _Nullable (^SDWebImageDownloaderRequestModifierBlock)(NSURLRequest * _Nonnull request);
|
||||
|
||||
// This is the protocol for downloader request modifier. We can use a block to specify the downloader request modifier. But Using protocol can make this extensible, and allow Swift user to use it easily instead of using `@convention(block)` to store a block into context options.
|
||||
@protocol SDWebImageDownloaderRequestModifier <NSObject>
|
||||
|
||||
- (nullable NSURLRequest *)modifiedRequestWithRequest:(nonnull NSURLRequest *)request;
|
||||
|
|
|
|||
|
|
@ -11,15 +11,13 @@
|
|||
#import "SDWebImageDownloader.h"
|
||||
#import "SDImageCache.h"
|
||||
#import "SDWebImageTransformer.h"
|
||||
#import "SDWebImageCacheKeyFilter.h"
|
||||
#import "SDWebImageCacheSerializer.h"
|
||||
|
||||
typedef void(^SDExternalCompletionBlock)(UIImage * _Nullable image, NSError * _Nullable error, SDImageCacheType cacheType, NSURL * _Nullable imageURL);
|
||||
|
||||
typedef void(^SDInternalCompletionBlock)(UIImage * _Nullable image, NSData * _Nullable data, NSError * _Nullable error, SDImageCacheType cacheType, BOOL finished, NSURL * _Nullable imageURL);
|
||||
|
||||
typedef NSString * _Nullable(^SDWebImageCacheKeyFilterBlock)(NSURL * _Nullable url);
|
||||
|
||||
typedef NSData * _Nullable(^SDWebImageCacheSerializerBlock)(UIImage * _Nonnull image, NSData * _Nullable data, NSURL * _Nullable imageURL);
|
||||
|
||||
// A combined operation representing the cache and download operation. You can it to cancel the load process.
|
||||
@interface SDWebImageCombinedOperation : NSObject <SDWebImageOperation>
|
||||
|
||||
|
|
@ -117,30 +115,27 @@ SDWebImageManager *manager = [SDWebImageManager sharedManager];
|
|||
@property (strong, nonatomic, nullable) id<SDWebImageTransformer> transformer;
|
||||
|
||||
/**
|
||||
* The cache filter is a block used each time SDWebImageManager need to convert an URL into a cache key. This can
|
||||
* be used to remove dynamic part of an image URL.
|
||||
* The cache filter is used to convert an URL into a cache key each time SDWebImageManager need cache key to use image cache.
|
||||
*
|
||||
* The following example sets a filter in the application delegate that will remove any query-string from the
|
||||
* URL before to use it as a cache key:
|
||||
*
|
||||
* @code
|
||||
|
||||
SDWebImageManager.sharedManager.cacheKeyFilter = ^(NSURL * _Nullable url) {
|
||||
SDWebImageManager.sharedManager.cacheKeyFilter =[SDWebImageCacheKeyFilter cacheKeyFilterWithBlock:^NSString * _Nullable(NSURL * _Nonnull url) {
|
||||
url = [[NSURL alloc] initWithScheme:url.scheme host:url.host path:url.path];
|
||||
return [url absoluteString];
|
||||
};
|
||||
|
||||
}];
|
||||
* @endcode
|
||||
*/
|
||||
@property (nonatomic, copy, nullable) SDWebImageCacheKeyFilterBlock cacheKeyFilter;
|
||||
@property (nonatomic, strong, nullable) id<SDWebImageCacheKeyFilter> cacheKeyFilter;
|
||||
|
||||
/**
|
||||
* The cache serializer is a block used to convert the decoded image, the source downloaded data, to the actual data used for storing to the disk cache. If you return nil, means to generate the data from the image instance, see `SDImageCache`.
|
||||
* The cache serializer is used to convert the decoded image, the source downloaded data, to the actual data used for storing to the disk cache. If you return nil, means to generate the data from the image instance, see `SDImageCache`.
|
||||
* For example, if you are using WebP images and facing the slow decoding time issue when later retriving from disk cache again. You can try to encode the decoded image to JPEG/PNG format to disk cache instead of source downloaded data.
|
||||
* @note The `image` arg is nonnull, but when you also provide a image transformer and the image is transformed, the `data` arg may be nil, take attention to this case.
|
||||
* @note This method is called from a global queue in order to not to block the main thread.
|
||||
* @code
|
||||
SDWebImageManager.sharedManager.cacheSerializer = ^NSData * _Nullable(UIImage * _Nonnull image, NSData * _Nullable data, NSURL * _Nullable imageURL) {
|
||||
SDWebImageManager.sharedManager.cacheSerializer = [SDWebImageCacheSerializer cacheSerializerWithBlock:^NSData * _Nullable(UIImage * _Nonnull image, NSData * _Nullable data, NSURL * _Nullable imageURL) {
|
||||
SDImageFormat format = [NSData sd_imageFormatForImageData:data];
|
||||
switch (format) {
|
||||
case SDImageFormatWebP:
|
||||
|
|
@ -148,11 +143,11 @@ SDWebImageManager.sharedManager.cacheKeyFilter = ^(NSURL * _Nullable url) {
|
|||
default:
|
||||
return data;
|
||||
}
|
||||
};
|
||||
}];
|
||||
* @endcode
|
||||
* The default value is nil. Means we just store the source downloaded data to disk cache.
|
||||
*/
|
||||
@property (nonatomic, copy, nullable) SDWebImageCacheSerializerBlock cacheSerializer;
|
||||
@property (nonatomic, strong, nullable) id<SDWebImageCacheSerializer> cacheSerializer;
|
||||
|
||||
/**
|
||||
* Check one or more operations running
|
||||
|
|
|
|||
|
|
@ -57,12 +57,16 @@
|
|||
}
|
||||
|
||||
- (nullable NSString *)cacheKeyForURL:(nullable NSURL *)url {
|
||||
return [self cacheKeyForURL:url cacheKeyFilter:self.cacheKeyFilter];
|
||||
}
|
||||
|
||||
- (nullable NSString *)cacheKeyForURL:(nullable NSURL *)url cacheKeyFilter:(id<SDWebImageCacheKeyFilter>)cacheKeyFilter {
|
||||
if (!url) {
|
||||
return @"";
|
||||
}
|
||||
|
||||
if (self.cacheKeyFilter) {
|
||||
return self.cacheKeyFilter(url);
|
||||
if (cacheKeyFilter) {
|
||||
return [cacheKeyFilter cacheKeyForURL:url];
|
||||
} else {
|
||||
return url.absoluteString;
|
||||
}
|
||||
|
|
@ -149,7 +153,6 @@
|
|||
@synchronized (self.runningOperations) {
|
||||
[self.runningOperations addObject:operation];
|
||||
}
|
||||
NSString *key = [self cacheKeyForURL:url];
|
||||
|
||||
SDImageCacheOptions cacheOptions = 0;
|
||||
if (options & SDWebImageQueryDataWhenInMemory) cacheOptions |= SDImageCacheQueryDataWhenInMemory;
|
||||
|
|
@ -174,6 +177,21 @@
|
|||
[mutableContext setValue:transformer forKey:SDWebImageContextCustomTransformer];
|
||||
context = [mutableContext copy];
|
||||
}
|
||||
// Cache key filter
|
||||
id<SDWebImageCacheKeyFilter> cacheKeyFilter;
|
||||
if ([context valueForKey:SDWebImageContextCacheKeyFilter]) {
|
||||
cacheKeyFilter = [context valueForKey:SDWebImageContextCacheKeyFilter];
|
||||
} else {
|
||||
cacheKeyFilter = self.cacheKeyFilter;
|
||||
}
|
||||
NSString *key = [self cacheKeyForURL:url cacheKeyFilter:cacheKeyFilter];
|
||||
// Cache serializer
|
||||
id<SDWebImageCacheSerializer> cacheSerializer;
|
||||
if ([context valueForKey:SDWebImageContextCacheSerializer]) {
|
||||
cacheSerializer = [context valueForKey:SDWebImageContextCacheSerializer];
|
||||
} else {
|
||||
cacheSerializer = self.cacheSerializer;
|
||||
}
|
||||
|
||||
__weak SDWebImageCombinedOperation *weakOperation = operation;
|
||||
operation.cacheOperation = [self.imageCache queryCacheOperationForKey:key options:cacheOptions context:context done:^(UIImage *cachedImage, NSData *cachedData, SDImageCacheType cacheType) {
|
||||
|
|
@ -255,7 +273,7 @@
|
|||
BOOL cacheOnDisk = !(options & SDWebImageCacheMemoryOnly);
|
||||
|
||||
// We've done the scale process in SDWebImageDownloader with the shared manager, this is used for custom manager and avoid extra scale.
|
||||
if (self != [SDWebImageManager sharedManager] && self.cacheKeyFilter && downloadedImage && ![downloadedImage conformsToProtocol:@protocol(SDAnimatedImage)]) {
|
||||
if (self != [SDWebImageManager sharedManager] && cacheKeyFilter && downloadedImage && ![downloadedImage conformsToProtocol:@protocol(SDAnimatedImage)]) {
|
||||
downloadedImage = [self scaledImageForKey:key image:downloadedImage];
|
||||
}
|
||||
|
||||
|
|
@ -270,8 +288,8 @@
|
|||
BOOL imageWasTransformed = ![transformedImage isEqual:downloadedImage];
|
||||
NSData *cacheData;
|
||||
// pass nil if the image was transformed, so we can recalculate the data from the image
|
||||
if (self.cacheSerializer) {
|
||||
cacheData = self.cacheSerializer(transformedImage, (imageWasTransformed ? nil : downloadedData), url);
|
||||
if (cacheSerializer) {
|
||||
cacheData = [cacheSerializer cacheDataWithImage:transformedImage originalData:(imageWasTransformed ? nil : downloadedData) imageURL:url];
|
||||
} else {
|
||||
cacheData = (imageWasTransformed ? nil : downloadedData);
|
||||
}
|
||||
|
|
@ -282,9 +300,9 @@
|
|||
});
|
||||
} else {
|
||||
if (downloadedImage && finished) {
|
||||
if (self.cacheSerializer) {
|
||||
if (cacheSerializer) {
|
||||
dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_HIGH, 0), ^{
|
||||
NSData *cacheData = self.cacheSerializer(downloadedImage, downloadedData, url);
|
||||
NSData *cacheData = [cacheSerializer cacheDataWithImage:downloadedImage originalData:downloadedData imageURL:url];
|
||||
[self.imageCache storeImage:downloadedImage imageData:cacheData forKey:key toDisk:cacheOnDisk completion:nil];
|
||||
});
|
||||
} else {
|
||||
|
|
|
|||
|
|
@ -22,6 +22,8 @@ FOUNDATION_EXPORT const unsigned char WebImageVersionString[];
|
|||
// In this header, you should import all the public headers of your framework using statements like #import <WebImage/PublicHeader.h>
|
||||
|
||||
#import <SDWebImage/SDWebImageManager.h>
|
||||
#import <SDWebImage/SDWebImageCacheKeyFilter.h>
|
||||
#import <SDWebImage/SDWebImageCacheSerializer.h>
|
||||
#import <SDWebImage/SDImageCacheConfig.h>
|
||||
#import <SDWebImage/SDImageCache.h>
|
||||
#import <SDWebImage/UIView+WebCache.h>
|
||||
|
|
|
|||
Loading…
Reference in New Issue