IOS wip commit #140

Author: wkh237

src/ios/RNFetchBlob.xcodeproj/project.pbxproj

@@ -12,6 +12,7 @@
 		A158F4301D0539DB006FFD38 /* RNFetchBlobNetwork.m in Sources */ = {isa = PBXBuildFile; fileRef = A158F42F1D0539DB006FFD38 /* RNFetchBlobNetwork.m */; };
 		A15C30141CD25C330074CB35 /* RNFetchBlob.m in Sources */ = {isa = PBXBuildFile; fileRef = A15C30131CD25C330074CB35 /* RNFetchBlob.m */; };
 		A166D1AA1CE0647A00273590 /* RNFetchBlob.h in Sources */ = {isa = PBXBuildFile; fileRef = A15C30111CD25C330074CB35 /* RNFetchBlob.h */; };
+		A19B48251D98102400E6868A /* RNFetchBlobProgress.m in Sources */ = {isa = PBXBuildFile; fileRef = A19B48241D98102400E6868A /* RNFetchBlobProgress.m */; };
 		A1AAE2991D300E4D0051D11C /* RNFetchBlobReqBuilder.m in Sources */ = {isa = PBXBuildFile; fileRef = A1AAE2981D300E4D0051D11C /* RNFetchBlobReqBuilder.m */; };
 /* End PBXBuildFile section */
 
@@ -37,6 +38,8 @@
 		A15C300E1CD25C330074CB35 /* libRNFetchBlob.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libRNFetchBlob.a; sourceTree = BUILT_PRODUCTS_DIR; };
 		A15C30111CD25C330074CB35 /* RNFetchBlob.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = RNFetchBlob.h; path = RNFetchBlob/RNFetchBlob.h; sourceTree = "<group>"; };
 		A15C30131CD25C330074CB35 /* RNFetchBlob.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = RNFetchBlob.m; path = RNFetchBlob/RNFetchBlob.m; sourceTree = "<group>"; };
+		A19B48231D98100800E6868A /* RNFetchBlobProgress.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RNFetchBlobProgress.h; sourceTree = "<group>"; };
+		A19B48241D98102400E6868A /* RNFetchBlobProgress.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RNFetchBlobProgress.m; sourceTree = "<group>"; };
 		A1AAE2971D300E3E0051D11C /* RNFetchBlobReqBuilder.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RNFetchBlobReqBuilder.h; sourceTree = "<group>"; };
 		A1AAE2981D300E4D0051D11C /* RNFetchBlobReqBuilder.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RNFetchBlobReqBuilder.m; sourceTree = "<group>"; };
 		A1F950181D7E9134002A95A6 /* IOS7Polyfill.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = IOS7Polyfill.h; sourceTree = "<group>"; };
@@ -63,6 +66,8 @@
 		A15C30051CD25C330074CB35 = {
 			isa = PBXGroup;
 			children = (
+				A19B48241D98102400E6868A /* RNFetchBlobProgress.m */,
+				A19B48231D98100800E6868A /* RNFetchBlobProgress.h */,
 				A1F950181D7E9134002A95A6 /* IOS7Polyfill.h */,
 				A1AAE2981D300E4D0051D11C /* RNFetchBlobReqBuilder.m */,
 				A1AAE2971D300E3E0051D11C /* RNFetchBlobReqBuilder.h */,
@@ -147,6 +152,7 @@
 				A158F42D1D0535BB006FFD38 /* RNFetchBlobConst.m in Sources */,
 				A158F4271D052E49006FFD38 /* RNFetchBlobFS.m in Sources */,
 				A158F4301D0539DB006FFD38 /* RNFetchBlobNetwork.m in Sources */,
+				A19B48251D98102400E6868A /* RNFetchBlobProgress.m in Sources */,
 				A1AAE2991D300E4D0051D11C /* RNFetchBlobReqBuilder.m in Sources */,
 				A15C30141CD25C330074CB35 /* RNFetchBlob.m in Sources */,
 			);

src/ios/RNFetchBlob/RNFetchBlob.m

@@ -12,6 +12,7 @@
 #import "RNFetchBlobNetwork.h"
 #import "RNFetchBlobConst.h"
 #import "RNFetchBlobReqBuilder.h"
+#import "RNFetchBlobProgress.h"
 
 
 RCTBridge * bridgeRef;
@@ -413,13 +414,15 @@ - (NSDictionary *)constantsToExport
 }
 
 #pragma mark - net.enableProgressReport
-RCT_EXPORT_METHOD(enableProgressReport:(NSString *)taskId {
-    [RNFetchBlobNetwork enableProgressReport:taskId];
+RCT_EXPORT_METHOD(enableProgressReport:(NSString *)taskId interval:(NSNumber*)interval count:(NSNumber*)count  {
+    RNFetchBlobProgress * cfg = [[RNFetchBlobProgress alloc] initWithType:Download interval:interval count:count];
+    [RNFetchBlobNetwork enableProgressReport:taskId config:cfg];
 })
 
 #pragma mark - net.enableUploadProgressReport
-RCT_EXPORT_METHOD(enableUploadProgressReport:(NSString *)taskId {
-    [RNFetchBlobNetwork enableUploadProgress:taskId];
+RCT_EXPORT_METHOD(enableUploadProgressReport:(NSString *)taskId interval:(NSNumber*)interval count:(NSNumber*)count{
+    RNFetchBlobProgress * cfg = [[RNFetchBlobProgress alloc] initWithType:Upload interval:interval count:count];
+    [RNFetchBlobNetwork enableUploadProgress:taskId config:cfg];
 })
 
 #pragma mark - fs.slice

src/ios/RNFetchBlobNetwork.h

@@ -11,6 +11,7 @@
 
 #import <Foundation/Foundation.h>
 #import "RCTBridgeModule.h"
+#import "RNFetchBlobProgress.h"
 #import "RNFetchBlobFS.h"
 
 typedef void(^CompletionHander)(NSURL * _Nullable location, NSURLResponse * _Nullable response, NSError * _Nullable error);
@@ -36,8 +37,8 @@ typedef void(^DataTaskCompletionHander) (NSData * _Nullable resp, NSURLResponse
 
 + (NSMutableDictionary  * _Nullable ) normalizeHeaders:(NSDictionary * _Nullable)headers;
 + (void) cancelRequest:(NSString *)taskId;
-+ (void) enableProgressReport:(NSString *) taskId;
-+ (void) enableUploadProgress:(NSString *) taskId;
++ (void) enableProgressReport:(NSString *) taskId config:(RNFetchBlobProgress*)config;
++ (void) enableUploadProgress:(NSString *) taskId config:(RNFetchBlobProgress*)config;
 - (void) sendRequest:(NSDictionary  * _Nullable )options contentLength:(long)contentLength bridge:(RCTBridge * _Nullable)bridgeRef taskId:(NSString * _Nullable)taskId withRequest:(NSURLRequest * _Nullable)req callback:(_Nullable RCTResponseSenderBlock) callback;
 
 

src/ios/RNFetchBlobNetwork.m

@@ -16,6 +16,7 @@
 #import "RNFetchBlobReqBuilder.h"
 #import "IOS7Polyfill.h"
 #import <CommonCrypto/CommonDigest.h>
+#import "RNFetchBlobProgress.h"
 
 ////////////////////////////////////////
 //
@@ -294,9 +295,12 @@ - (void) URLSession:(NSURLSession *)session dataTask:(NSURLSessionDataTask *)dat
             BOOL appendToExistingFile = [destPath RNFBContainsString:@"?append=true"];
             // For solving #141 append response data if the file already exists
             // base on PR#139 @kejinliang
-            if (appendToExistingFile && ![fm fileExistsAtPath:destPath])
+            if(appendToExistingFile)
             {
                 destPath = [destPath stringByReplacingOccurrencesOfString:@"?append=true" withString:@""];
+            }
+            if (![fm fileExistsAtPath:destPath])
+            {
                 [fm createFileAtPath:destPath contents:[[NSData alloc] init] attributes:nil];
             }
             writeStream = [[NSOutputStream alloc] initToFileAtPath:destPath append:YES];

src/ios/RNFetchBlobProgress.h

@@ -0,0 +1,40 @@
+//
+//  RNFetchBlobProgress.h
+//  RNFetchBlob
+//
+//  Created by Ben Hsieh on 2016/9/25.
+//  Copyright © 2016年 wkh237.github.io. All rights reserved.
+//
+
+#ifndef RNFetchBlobProgress_h
+#define RNFetchBlobProgress_h
+
+#import <Foundation/Foundation.h>
+
+typedef NS_ENUM(NSUInteger, ProgressType) {
+    Download,
+    Upload,
+};
+
+@interface RNFetchBlobProgress : NSObject
+{
+    NSNumber * count;
+    NSNumber * interval;
+    ProgressType type;
+    BOOL enable;
+    
+}
+
+@property (nonatomic) NSNumber * count;
+@property (nonatomic) NSNumber * interval;
+@property (nonatomic) NSInteger type;
+@property (nonatomic) BOOL enable;
+
+-(id)initWithType:(ProgressType)type interval:(NSNumber*)interval count:(NSNumber *)count;
+-(BOOL)shouldReport;
+-(void)tick;
+
+
+@end
+
+#endif /* RNFetchBlobProgress_h */

src/ios/RNFetchBlobProgress.m

@@ -0,0 +1,56 @@
+//
+//  RNFetchBlobProgress.m
+//  RNFetchBlob
+//
+//  Created by Ben Hsieh on 2016/9/25.
+//  Copyright © 2016年 wkh237.github.io. All rights reserved.
+//
+
+#import "RNFetchBlobProgress.h"
+
+@interface RNFetchBlobProgress ()
+{
+    float progress;
+    int tick;
+    long lastTick;
+}
+@end
+
+@implementation RNFetchBlobProgress
+
+-(id)initWithType:(ProgressType)type interval:(NSNumber *)interval count:(NSNumber *)count
+{
+    self = [super init];
+    self.count = count;
+    self.interval = interval;
+    self.type = type;
+    self.enable = YES;
+    return self;
+}
+
+-(void)tick:(NSNumber *) nextProgress
+{
+    progress = [nextProgress floatValue];
+    tick++;
+    NSTimeInterval timeStamp = [[NSDate date] timeIntervalSince1970];
+    // NSTimeInterval is defined as double
+    NSNumber *timeStampObj = [NSNumber numberWithDouble: timeStamp];
+    lastTick = [timeStampObj longValue];
+}
+
+-(BOOL)shouldReport
+{
+    BOOL result = YES;
+    if(self.count > 0)
+    {
+        result = floorf(progress*100/[count floatValue]) > tick;
+    }
+    NSTimeInterval timeStamp = [[NSDate date] timeIntervalSince1970];
+    // NSTimeInterval is defined as double
+    NSNumber *timeStampObj = [NSNumber numberWithDouble: timeStamp];
+    return lastTick - [timeStampObj longValue] > [self.interval longValue] && self.enable && result;
+    
+}
+
+
+@end