Refactor

Author: wkh237

src/ios/RNFetchBlobNetwork.m

@@ -515,47 +515,46 @@ - (void) URLSession:(NSURLSession *)session task:(NSURLSessionTask *)task didCom
     {
         errMsg = [error localizedDescription];
     }
-//    else
-//    {
-        if(respFile == YES)
+
+    if(respFile == YES)
+    {
+        [writeStream close];
+        rnfbRespType = RESP_TYPE_PATH;
+        respStr = destPath;
+    }
+    // base64 response
+    else {
+        // #73 fix unicode data encoding issue :
+        // when response type is BASE64, we should first try to encode the response data to UTF8 format
+        // if it turns out not to be `nil` that means the response data contains valid UTF8 string,
+        // in order to properly encode the UTF8 string, use URL encoding before BASE64 encoding.
+        NSString * utf8 = [[NSString alloc] initWithData:respData encoding:NSUTF8StringEncoding];
+        
+        if(responseFormat == BASE64)
         {
-            [writeStream close];
-            rnfbRespType = RESP_TYPE_PATH;
-            respStr = destPath;
+            rnfbRespType = RESP_TYPE_BASE64;
+            respStr = [respData base64EncodedStringWithOptions:0];
         }
-        // base64 response
-        else {
-            // #73 fix unicode data encoding issue :
-            // when response type is BASE64, we should first try to encode the response data to UTF8 format
-            // if it turns out not to be `nil` that means the response data contains valid UTF8 string,
-            // in order to properly encode the UTF8 string, use URL encoding before BASE64 encoding.
-            NSString * utf8 = [[NSString alloc] initWithData:respData encoding:NSUTF8StringEncoding];
-
-            if(responseFormat == BASE64)
-            {
-                rnfbRespType = RESP_TYPE_BASE64;
-                respStr = [respData base64EncodedStringWithOptions:0];
-            }
-            else if (responseFormat == UTF8)
+        else if (responseFormat == UTF8)
+        {
+            rnfbRespType = RESP_TYPE_UTF8;
+            respStr = utf8;
+        }
+        else
+        {
+            if(utf8 != nil)
             {
                 rnfbRespType = RESP_TYPE_UTF8;
                 respStr = utf8;
             }
             else
             {
-                if(utf8 != nil)
-                {
-                    rnfbRespType = RESP_TYPE_UTF8;
-                    respStr = utf8;
-                }
-                else
-                {
-                    rnfbRespType = RESP_TYPE_BASE64;
-                    respStr = [respData base64EncodedStringWithOptions:0];
-                }
+                rnfbRespType = RESP_TYPE_BASE64;
+                respStr = [respData base64EncodedStringWithOptions:0];
             }
         }
-//    }
+        }
+
 
     callback(@[ errMsg, rnfbRespType, respStr]);
 

test/test-0.10.0.js

@@ -13,8 +13,10 @@ import {
   AsyncStorage,
   Image,
 } from 'react-native';
+
 window.XMLHttpRequest = RNFetchBlob.polyfill.XMLHttpRequest
 window.Blob = RNFetchBlob.polyfill.Blob
+
 const JSONStream = RNFetchBlob.JSONStream
 const fs = RNFetchBlob.fs
 const { Assert, Comparer, Info, prop } = RNTest
@@ -99,11 +101,17 @@ describe('SSL test #159', (report, done) => {
       'Cache-Control' : 'no-store'
     })
     .then(res => {
-      report(<Assert key="trusty request should pass" expect={true} actual={true}/>)
+      report(<Assert
+        key="trusty request should pass"
+        expect={true}
+        actual={true}/>)
       return RNFetchBlob.fetch('GET',`${TEST_SERVER_URL_SSL}/public/github.png`)
     })
     .catch(e => {
-      report(<Assert key="non-trusty request should not pass" expect={true} actual={true}/>)
+      report(<Assert
+        key="non-trusty request should not pass"
+        expect={true}
+        actual={true}/>)
       done()
     })
 })
@@ -118,11 +126,18 @@ describe('#171 appendExt verify', (report, done) => {
     'Cache-Control' : 'no-store'
   })
   .then(res => {
-    report(<Assert key="extension appended to tmp path" actual={/.png$/.test(res.path())} expect={true}/>)
+    console.log(res.path())
+    report(<Assert
+      key="extension appended to tmp path"
+      actual={/.png$/.test(res.path())}
+      expect={true}/>)
     return fs.stat(res.path())
   })
   .then(stat => {
-    report(<Assert key="verify the file existence" expect="23975" actual={stat.size} />)
+    report(<Assert
+      key="verify the file existence"
+      expect="23975"
+      actual={stat.size} />)
     done()
   })
 
@@ -137,7 +152,10 @@ describe('#173 issue with append option', (report, done) => {
   .fetch('GET', `${TEST_SERVER_URL}/public/github.png`)
   .then((res) => fs.stat(res.path()))
   .then((stat) => {
-    report(<Assert key="file size check #1" expect="23975" actual={stat.size}/>)
+    report(<Assert
+      key="file size check #1"
+      expect="23975"
+      actual={stat.size}/>)
     return RNFetchBlob.config({
       path : dest,
       overwrite : false
@@ -146,7 +164,10 @@ describe('#173 issue with append option', (report, done) => {
   })
   .then((res) => fs.stat(res.path()))
   .then((stat) => {
-    report(<Assert key="file size check #2" expect="47950" actual={stat.size}/>)
+    report(<Assert
+      key="file size check #2"
+      expect="47950"
+      actual={stat.size}/>)
     return RNFetchBlob.config({
       path : dest,
       overwrite : true
@@ -155,18 +176,39 @@ describe('#173 issue with append option', (report, done) => {
   })
   .then((res) => fs.stat(res.path()))
   .then((stat) => {
-    report(<Assert key="file size check #3" expect="23975" actual={stat.size}/>)
+    report(<Assert
+      key="file size check #3"
+      expect="23975"
+      actual={stat.size}/>)
     return RNFetchBlob.config({
       path : dest,
     })
     .fetch('GET', `${TEST_SERVER_URL}/public/github.png`)
   })
   .then((res) => fs.stat(res.path()))
   .then((stat) => {
-    report(<Assert key="it should successfully overwrite existing file without config"
+    report(<Assert
+      key="it should successfully overwrite existing file without config"
       expect="23975"
       actual={stat.size}/>)
     done()
   })
 
 })
+
+describe('#171 verification ', (report, done) => {
+
+  RNFetchBlob
+    .config({
+      session: 'SESSION_NAME',
+      fileCache: true,
+      appendExt: 'mp4'
+    })
+    .fetch('GET', `${TEST_SERVER_URL}/public/cat-fu.mp4`)
+    .then(res => {
+      console.log(res.path())
+    })
+
+
+
+})