modify gzip logic

Author: YangSen-qn

QiniuSDK/Storage/QNUploadInfoReporter.m

@@ -517,7 +517,8 @@ - (void)innerReport:(NSString *)jsonString token:(NSString *)token {
             [request setHTTPMethod:@"POST"];
             [request setTimeoutInterval:_config.timeoutInterval];
 
-            NSData *reportData = [[NSData dataWithContentsOfFile:_recorderFilePath] qn_gZip];
+            NSData *reportData = [NSData dataWithContentsOfFile:_recorderFilePath];
+            reportData = [NSData qn_gZip:reportData];
             __block NSURLSession *session = [NSURLSession sessionWithConfiguration:[NSURLSessionConfiguration defaultSessionConfiguration]];
             NSURLSessionUploadTask *uploadTask = [session uploadTaskWithRequest:request fromData:reportData completionHandler:^(NSData * _Nullable data, NSURLResponse * _Nullable response, NSError * _Nullable error) {
                 NSHTTPURLResponse *httpResponse = (NSHTTPURLResponse *)response;

QiniuSDK/Utils/NSData+QNGZip.h

@@ -12,9 +12,9 @@ NS_ASSUME_NONNULL_BEGIN
 
 @interface NSData(QNGZip)
 
-- (NSData *)qn_gZip;
++ (NSData *)qn_gZip:(NSData *)data;
 
-- (NSData *)qn_gUnzip;
++ (NSData *)qn_gUnzip:(NSData *)data;
 
 @end
 

QiniuSDK/Utils/NSData+QNGZip.m

@@ -13,10 +13,10 @@
 
 @implementation NSData(QNGZip)
 
-- (NSData *)qn_gZip{
++ (NSData *)qn_gZip:(NSData *)data{
 
-    if (self.length == 0 || [self qn_isGzippedData]){
-        return self;
+    if (data.length == 0 || [self qn_isGzippedData:data]){
+        return data;
     }
 
     z_stream stream;
@@ -25,8 +25,8 @@ - (NSData *)qn_gZip{
     stream.zfree = Z_NULL;
     stream.total_out = 0;
     stream.avail_out = 0;
-    stream.avail_in = (uint)self.length;
-    stream.next_in = (Bytef *)(void *)self.bytes;
+    stream.avail_in = (uint)data.length;
+    stream.next_in = (Bytef *)(void *)data.bytes;
 
     static const NSUInteger chunkSize = 16384;
 
@@ -49,26 +49,26 @@ - (NSData *)qn_gZip{
     return gzippedData;
 }
 
-- (NSData *)qn_gUnzip{
-    if (self.length == 0 || ![self qn_isGzippedData]){
-        return self;
++ (NSData *)qn_gUnzip:(NSData *)data{
+    if (data.length == 0 || ![self qn_isGzippedData:data]){
+        return data;
     }
 
     z_stream stream;
     stream.zalloc = Z_NULL;
     stream.zfree = Z_NULL;
     stream.total_out = 0;
     stream.avail_out = 0;
-    stream.avail_in = (uint)self.length;
-    stream.next_in = (Bytef *)self.bytes;
+    stream.avail_in = (uint)data.length;
+    stream.next_in = (Bytef *)data.bytes;
 
     NSMutableData *gunzippedData = nil;
     if (inflateInit2(&stream, 47) == Z_OK) {
         int status = Z_OK;
-        gunzippedData = [NSMutableData dataWithCapacity:self.length * 2];
+        gunzippedData = [NSMutableData dataWithCapacity:data.length * 2];
         while (status == Z_OK) {
             if (stream.total_out >= gunzippedData.length) {
-                gunzippedData.length += self.length / 2;
+                gunzippedData.length += data.length / 2;
             }
             stream.next_out = (uint8_t *)gunzippedData.mutableBytes + stream.total_out;
             stream.avail_out = (uInt)(gunzippedData.length - stream.total_out);
@@ -84,9 +84,12 @@ - (NSData *)qn_gUnzip{
     return gunzippedData;
 }
 
-- (BOOL)qn_isGzippedData{
-    const UInt8 *bytes = (const UInt8 *)self.bytes;
-    return (self.length >= 2 && bytes[0] == 0x1f && bytes[1] == 0x8b);
++ (BOOL)qn_isGzippedData:(NSData *)data{
+    if (!data || data.length == 0) {
+        return false;
+    }
+    const UInt8 *bytes = (const UInt8 *)data.bytes;
+    return (data.length >= 2 && bytes[0] == 0x1f && bytes[1] == 0x8b);
 }
 
 @end

QiniuSDKTests/QNGZipTest.m

@@ -26,19 +26,19 @@ - (void)tearDown {
 - (void)testGZip {
 
     NSData *data = [NSData data];
-    NSData *gzip = [data qn_gZip];
-    XCTAssertTrue([gzip isEqualToData:gzip], "pass");
+    NSData *gzip = [NSData qn_gZip:data];
+    XCTAssertTrue([data isEqualToData:gzip], "pass");
 
     NSString *string = @"ABCDEFG";
     data = [string dataUsingEncoding:NSUTF8StringEncoding];
-    gzip = [data qn_gZip];
+    gzip = [NSData qn_gZip:data];
 
-    NSData *gUnzip =  [gzip qn_gUnzip];
+    NSData *gUnzip = [NSData qn_gUnzip:gzip];
     NSString *stringGUnzip =  [[NSString alloc] initWithData:gUnzip encoding:NSUTF8StringEncoding];
     XCTAssertTrue([string isEqualToString:stringGUnzip], "pass");
 
-    NSData *reGUnzip =  [gzip qn_gZip];
-    XCTAssertTrue([gzip isEqualToData:reGUnzip], "pass");
+    NSData *reGUnzip = [NSData qn_gUnzip:gUnzip];
+    XCTAssertTrue([gUnzip isEqualToData:reGUnzip], "pass");
 }