Skip to content

Commit 265b58e

Browse files
dreampiggydreampiggy
committed
Fix code format. Using 2-space indent instead of 4
1 parent c295210 commit 265b58e

File tree

4 files changed

+200
-200
lines changed

4 files changed

+200
-200
lines changed

‎Storage/FirebaseStorageUI/NSURL+SDWebImageFirebaseLoader.m

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -21,27 +21,27 @@
2121
@implementation NSURL (SDWebImageFirebaseLoader)
2222

2323
- (FIRStorageReference *)sd_storageReference {
24-
return objc_getAssociatedObject(self, @selector(sd_storageReference));
24+
return objc_getAssociatedObject(self, @selector(sd_storageReference));
2525
}
2626

2727
- (void)setSd_storageReference:(FIRStorageReference * _Nullable)sd_storageReference {
28-
objc_setAssociatedObject(self, @selector(sd_storageReference), sd_storageReference, OBJC_ASSOCIATION_RETAIN_NONATOMIC);
28+
objc_setAssociatedObject(self, @selector(sd_storageReference), sd_storageReference, OBJC_ASSOCIATION_RETAIN_NONATOMIC);
2929
}
3030

3131
+ (instancetype)sd_URLWithStorageReference:(FIRStorageReference *)storageRef {
32-
if (!storageRef.bucket || !storageRef.fullPath) {
33-
return nil;
34-
}
35-
// gs://bucket/path/to/object.txt
36-
NSString *urlString = [NSString stringWithFormat:@"%@://%@/%@", SDWebImageFirebaseScheme, storageRef.bucket, storageRef.fullPath];
37-
NSURL *url = [NSURL URLWithString:urlString];
38-
if (!url) {
39-
return nil;
40-
}
41-
42-
url.sd_storageReference = storageRef;
43-
44-
return url;
32+
if (!storageRef.bucket || !storageRef.fullPath) {
33+
return nil;
34+
}
35+
// gs://bucket/path/to/object.txt
36+
NSString *urlString = [NSString stringWithFormat:@"%@://%@/%@", SDWebImageFirebaseScheme, storageRef.bucket, storageRef.fullPath];
37+
NSURL *url = [NSURL URLWithString:urlString];
38+
if (!url) {
39+
return nil;
40+
}
41+
42+
url.sd_storageReference = storageRef;
43+
44+
return url;
4545
}
4646

4747
@end

‎Storage/FirebaseStorageUI/SDWebImageFirebaseLoader.m

Lines changed: 58 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -21,76 +21,76 @@
2121
@implementation SDWebImageFirebaseLoader
2222

2323
+ (SDWebImageFirebaseLoader *)sharedLoader {
24-
static dispatch_once_t onceToken;
25-
static SDWebImageFirebaseLoader *loader;
26-
dispatch_once(&onceToken, ^{
27-
loader = [[SDWebImageFirebaseLoader alloc] init];
28-
});
29-
return loader;
24+
static dispatch_once_t onceToken;
25+
static SDWebImageFirebaseLoader *loader;
26+
dispatch_once(&onceToken, ^{
27+
loader = [[SDWebImageFirebaseLoader alloc] init];
28+
});
29+
return loader;
3030
}
3131

3232
- (instancetype)init {
33-
self = [super init];
34-
if (self) {
35-
self.defaultMaxImageSize = 10e6;
36-
}
37-
return self;
33+
self = [super init];
34+
if (self) {
35+
self.defaultMaxImageSize = 10e6;
36+
}
37+
return self;
3838
}
3939

4040
#pragma mark - SDImageLoader
4141
- (BOOL)canLoadWithURL:(NSURL *)url {
42-
return url.sd_storageReference;
42+
return url.sd_storageReference;
4343
}
4444

4545
- (id<SDWebImageOperation>)loadImageWithURL:(NSURL *)url options:(SDWebImageOptions)options context:(SDWebImageContext *)context progress:(SDImageLoaderProgressBlock)progressBlock completed:(SDImageLoaderCompletedBlock)completedBlock {
46-
FIRStorageReference *storageRef = url.sd_storageReference;
47-
if (!storageRef) {
48-
if (completedBlock) {
49-
NSError *error = [NSError errorWithDomain:SDWebImageErrorDomain code:SDWebImageErrorInvalidURL userInfo:@{NSLocalizedDescriptionKey : @"Image url is Firebae Storage Reference"}];
50-
completedBlock(nil, nil, error, YES);
51-
}
52-
}
53-
54-
UInt64 size;
55-
if (context[SDWebImageContextFirebaseMaxImageSize]) {
56-
size = [context[SDWebImageContextFirebaseMaxImageSize] unsignedLongLongValue];
57-
} else {
58-
size = self.defaultMaxImageSize;
46+
FIRStorageReference *storageRef = url.sd_storageReference;
47+
if (!storageRef) {
48+
if (completedBlock) {
49+
NSError *error = [NSError errorWithDomain:SDWebImageErrorDomain code:SDWebImageErrorInvalidURL userInfo:@{NSLocalizedDescriptionKey : @"Image url is Firebae Storage Reference"}];
50+
completedBlock(nil, nil, error, YES);
5951
}
60-
// Download the image from Firebase Storage
61-
62-
// TODO: Support progressive image loading using the `GTMSessionFetcher`
63-
FIRStorageDownloadTask * download = [storageRef dataWithMaxSize:size
64-
completion:^(NSData * _Nullable data, NSError * _Nullable error) {
65-
if (error) {
66-
dispatch_main_async_safe(^{
67-
if (completedBlock) {
68-
completedBlock(nil, nil, error, YES);
69-
}
70-
});
71-
return;
52+
}
53+
54+
UInt64 size;
55+
if (context[SDWebImageContextFirebaseMaxImageSize]) {
56+
size = [context[SDWebImageContextFirebaseMaxImageSize] unsignedLongLongValue];
57+
} else {
58+
size = self.defaultMaxImageSize;
59+
}
60+
// Download the image from Firebase Storage
61+
62+
// TODO: Support progressive image loading using the `GTMSessionFetcher`
63+
FIRStorageDownloadTask * download = [storageRef dataWithMaxSize:size
64+
completion:^(NSData * _Nullable data, NSError * _Nullable error) {
65+
if (error) {
66+
dispatch_main_async_safe(^{
67+
if (completedBlock) {
68+
completedBlock(nil, nil, error, YES);
7269
}
73-
// Decode the image with data
74-
dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_HIGH, 0), ^{
75-
UIImage *image = SDImageLoaderDecodeImageData(data, url, options, context);
76-
dispatch_main_async_safe(^{
77-
if (completedBlock) {
78-
completedBlock(image, data, nil, YES);
79-
}
80-
});
81-
});
82-
}];
83-
// Observe the progress changes
84-
[download observeStatus:FIRStorageTaskStatusProgress handler:^(FIRStorageTaskSnapshot * _Nonnull snapshot) {
85-
NSProgress *progress = snapshot.progress;
86-
// completedUnitCount == totalBytesWritten;
87-
// totalUnitCount == totalBytesExpectedToWrite;
88-
if (progressBlock) {
89-
progressBlock(progress.completedUnitCount, progress.totalUnitCount, url);
90-
}
91-
}];
92-
93-
return download;
70+
});
71+
return;
72+
}
73+
// Decode the image with data
74+
dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_HIGH, 0), ^{
75+
UIImage *image = SDImageLoaderDecodeImageData(data, url, options, context);
76+
dispatch_main_async_safe(^{
77+
if (completedBlock) {
78+
completedBlock(image, data, nil, YES);
79+
}
80+
});
81+
});
82+
}];
83+
// Observe the progress changes
84+
[download observeStatus:FIRStorageTaskStatusProgress handler:^(FIRStorageTaskSnapshot * _Nonnull snapshot) {
85+
NSProgress *progress = snapshot.progress;
86+
// completedUnitCount == totalBytesWritten;
87+
// totalUnitCount == totalBytesExpectedToWrite;
88+
if (progressBlock) {
89+
progressBlock(progress.completedUnitCount, progress.totalUnitCount, url);
90+
}
91+
}];
92+
93+
return download;
9494
}
9595

9696
@end

‎Storage/FirebaseStorageUI/UIImageView+FirebaseStorage.m

Lines changed: 65 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -18,23 +18,23 @@
1818
#import "SDWebImageFirebaseLoader.h"
1919

2020
static SDWebImageManager *SharedFirebaseWebImageManager(void) {
21-
static dispatch_once_t onceToken;
22-
static SDWebImageManager *manager;
23-
dispatch_once(&onceToken, ^{
24-
manager = [[SDWebImageManager alloc] initWithCache:SDImageCache.sharedImageCache loader:SDWebImageFirebaseLoader.sharedLoader];
25-
});
26-
return manager;
21+
static dispatch_once_t onceToken;
22+
static SDWebImageManager *manager;
23+
dispatch_once(&onceToken, ^{
24+
manager = [[SDWebImageManager alloc] initWithCache:SDImageCache.sharedImageCache loader:SDWebImageFirebaseLoader.sharedLoader];
25+
});
26+
return manager;
2727
}
2828

2929
@implementation UIImageView (FirebaseStorage)
3030

3131
- (void)sd_setImageWithStorageReference:(FIRStorageReference *)storageRef {
32-
[self sd_setImageWithStorageReference:storageRef placeholderImage:nil completion:nil];
32+
[self sd_setImageWithStorageReference:storageRef placeholderImage:nil completion:nil];
3333
}
3434

3535
- (void)sd_setImageWithStorageReference:(FIRStorageReference *)storageRef
3636
placeholderImage:(UIImage *)placeholder {
37-
[self sd_setImageWithStorageReference:storageRef placeholderImage:placeholder completion:nil];
37+
[self sd_setImageWithStorageReference:storageRef placeholderImage:placeholder completion:nil];
3838
}
3939

4040
- (void)sd_setImageWithStorageReference:(FIRStorageReference *)storageRef
@@ -43,10 +43,10 @@ - (void)sd_setImageWithStorageReference:(FIRStorageReference *)storageRef
4343
NSError *_Nullable,
4444
SDImageCacheType,
4545
FIRStorageReference *))completionBlock {
46-
[self sd_setImageWithStorageReference:storageRef
47-
maxImageSize:SDWebImageFirebaseLoader.sharedLoader.defaultMaxImageSize
48-
placeholderImage:placeholder
49-
completion:completionBlock];
46+
[self sd_setImageWithStorageReference:storageRef
47+
maxImageSize:SDWebImageFirebaseLoader.sharedLoader.defaultMaxImageSize
48+
placeholderImage:placeholder
49+
completion:completionBlock];
5050
}
5151

5252
- (void)sd_setImageWithStorageReference:(FIRStorageReference *)storageRef
@@ -56,11 +56,11 @@ - (void)sd_setImageWithStorageReference:(FIRStorageReference *)storageRef
5656
NSError *,
5757
SDImageCacheType,
5858
FIRStorageReference *))completionBlock{
59-
[self sd_setImageWithStorageReference:storageRef
60-
maxImageSize:size
61-
placeholderImage:placeholder
62-
options:0
63-
completion:completionBlock];
59+
[self sd_setImageWithStorageReference:storageRef
60+
maxImageSize:size
61+
placeholderImage:placeholder
62+
options:0
63+
completion:completionBlock];
6464
}
6565

6666
- (void)sd_setImageWithStorageReference:(FIRStorageReference *)storageRef
@@ -71,12 +71,12 @@ - (void)sd_setImageWithStorageReference:(FIRStorageReference *)storageRef
7171
NSError *,
7272
SDImageCacheType,
7373
FIRStorageReference *))completionBlock {
74-
[self sd_setImageWithStorageReference:storageRef
75-
maxImageSize:size
76-
placeholderImage:placeholder
77-
options:options
78-
progress:nil
79-
completion:completionBlock];
74+
[self sd_setImageWithStorageReference:storageRef
75+
maxImageSize:size
76+
placeholderImage:placeholder
77+
options:options
78+
progress:nil
79+
completion:completionBlock];
8080
}
8181

8282
- (void)sd_setImageWithStorageReference:(FIRStorageReference *)storageRef
@@ -90,13 +90,13 @@ - (void)sd_setImageWithStorageReference:(FIRStorageReference *)storageRef
9090
NSError *,
9191
SDImageCacheType,
9292
FIRStorageReference *))completionBlock {
93-
[self sd_setImageWithStorageReference:storageRef
94-
maxImageSize:size
95-
placeholderImage:placeholder
96-
options:options
97-
context:nil
98-
progress:progressBlock
99-
completion:completionBlock];
93+
[self sd_setImageWithStorageReference:storageRef
94+
maxImageSize:size
95+
placeholderImage:placeholder
96+
options:options
97+
context:nil
98+
progress:progressBlock
99+
completion:completionBlock];
100100
}
101101

102102
- (void)sd_setImageWithStorageReference:(FIRStorageReference *)storageRef
@@ -111,47 +111,47 @@ - (void)sd_setImageWithStorageReference:(FIRStorageReference *)storageRef
111111
NSError *,
112112
SDImageCacheType,
113113
FIRStorageReference *))completionBlock {
114-
NSParameterAssert(storageRef != nil);
115-
116-
NSURL *url = [NSURL sd_URLWithStorageReference:storageRef];
117-
118-
SDWebImageMutableContext *mutableContext;
119-
if (context) {
120-
mutableContext = [context mutableCopy];
121-
} else {
122-
mutableContext = [NSMutableDictionary dictionary];
114+
NSParameterAssert(storageRef != nil);
115+
116+
NSURL *url = [NSURL sd_URLWithStorageReference:storageRef];
117+
118+
SDWebImageMutableContext *mutableContext;
119+
if (context) {
120+
mutableContext = [context mutableCopy];
121+
} else {
122+
mutableContext = [NSMutableDictionary dictionary];
123+
}
124+
mutableContext[SDWebImageContextCustomManager] = SharedFirebaseWebImageManager();
125+
mutableContext[SDWebImageContextFirebaseMaxImageSize] = @(size);
126+
127+
// TODO: Current version use `fullpath` as cache key, but not the URL. Do we need to keep compabitle ?
128+
SDWebImageCacheKeyFilter *cacheKeyFilter = [SDWebImageCacheKeyFilter cacheKeyFilterWithBlock:^NSString * _Nullable(NSURL * _Nonnull url) {
129+
return url.sd_storageReference.fullPath;
130+
}];
131+
mutableContext[SDWebImageContextCacheKeyFilter] = cacheKeyFilter;
132+
133+
[self sd_setImageWithURL:url placeholderImage:placeholder options:options context:[mutableContext copy] progress:^(NSInteger receivedSize, NSInteger expectedSize, NSURL * _Nullable targetURL) {
134+
if (progressBlock) {
135+
progressBlock(receivedSize, expectedSize, storageRef);
123136
}
124-
mutableContext[SDWebImageContextCustomManager] = SharedFirebaseWebImageManager();
125-
mutableContext[SDWebImageContextFirebaseMaxImageSize] = @(size);
126-
127-
// TODO: Current version use `fullpath` as cache key, but not the URL. Do we need to keep compabitle ?
128-
SDWebImageCacheKeyFilter *cacheKeyFilter = [SDWebImageCacheKeyFilter cacheKeyFilterWithBlock:^NSString * _Nullable(NSURL * _Nonnull url) {
129-
return url.sd_storageReference.fullPath;
130-
}];
131-
mutableContext[SDWebImageContextCacheKeyFilter] = cacheKeyFilter;
132-
133-
[self sd_setImageWithURL:url placeholderImage:placeholder options:options context:[mutableContext copy] progress:^(NSInteger receivedSize, NSInteger expectedSize, NSURL * _Nullable targetURL) {
134-
if (progressBlock) {
135-
progressBlock(receivedSize, expectedSize, storageRef);
136-
}
137-
} completed:^(UIImage * _Nullable image, NSError * _Nullable error, SDImageCacheType cacheType, NSURL * _Nullable imageURL) {
138-
if (completionBlock) {
139-
completionBlock(image, error, cacheType, storageRef);
140-
}
141-
}];
137+
} completed:^(UIImage * _Nullable image, NSError * _Nullable error, SDImageCacheType cacheType, NSURL * _Nullable imageURL) {
138+
if (completionBlock) {
139+
completionBlock(image, error, cacheType, storageRef);
140+
}
141+
}];
142142
}
143143

144144
#pragma mark - Getter
145145
- (FIRStorageDownloadTask *)sd_currentDownloadTask {
146-
SDWebImageCombinedOperation *operation = [self sd_imageLoadOperationForKey:NSStringFromClass(self.class)];
147-
if (operation) {
148-
id<SDWebImageOperation> loaderOperation = operation.loaderOperation;
149-
// This is a protocol, check the class
150-
if ([loaderOperation isKindOfClass:[FIRStorageDownloadTask class]]) {
151-
return (FIRStorageDownloadTask *)loaderOperation;
152-
}
146+
SDWebImageCombinedOperation *operation = [self sd_imageLoadOperationForKey:NSStringFromClass(self.class)];
147+
if (operation) {
148+
id<SDWebImageOperation> loaderOperation = operation.loaderOperation;
149+
// This is a protocol, check the class
150+
if ([loaderOperation isKindOfClass:[FIRStorageDownloadTask class]]) {
151+
return (FIRStorageDownloadTask *)loaderOperation;
153152
}
154-
return nil;
153+
}
154+
return nil;
155155
}
156156

157157
@end

0 commit comments

Comments
 (0)