Merge branch 'master' of github.com:itinance/react-native-fs

* 'master' of github.com:itinance/react-native-fs:
  Add ExternalCachesDirectoryPath
  Added some notes about stat() in README
  Improved stat resilience to deleted file
  Android only: support for originalFilapath with stat (content uri resolution)

Author: itinance

.gitignore

@@ -22,3 +22,8 @@ DerivedData
 # Pods - for those of you who use CocoaPods
 Pods
 update-test.sh
+.vscode/
+android/.gradle/*
+android/gradle/*
+android/*.iml
+android/local.properties

FS.common.js

@@ -42,12 +42,13 @@ type ReadDirItem = {
 };
 
 type StatResult = {
-  name: string;     // The name of the item
+  name: ?string;     // The name of the item TODO: why is this not documented?
   path: string;     // The absolute path to the item
   size: string;     // Size in bytes
   mode: number;     // UNIX file mode
   ctime: number;    // Created date
   mtime: number;    // Last modified date
+  originalFilepath: string;    // In case of content uri this is the pointed file path, otherwise is the same as path
   isFile: () => boolean;        // Is the file just a file?
   isDirectory: () => boolean;   // Is the file a directory?
 };
@@ -272,10 +273,12 @@ var RNFS = {
   stat(filepath: string): Promise<StatResult> {
     return RNFSManager.stat(normalizeFilePath(filepath)).then((result) => {
       return {
+        'path': filepath,
         'ctime': new Date(result.ctime * 1000),
         'mtime': new Date(result.mtime * 1000),
         'size': result.size,
         'mode': result.mode,
+        'originalFilepath': result.originalFilepath,
         isFile: () => result.type === RNFSFileTypeRegular,
         isDirectory: () => result.type === RNFSFileTypeDirectory,
       };
@@ -557,6 +560,7 @@ var RNFS = {
 
   MainBundlePath: RNFSManager.RNFSMainBundlePath,
   CachesDirectoryPath: RNFSManager.RNFSCachesDirectoryPath,
+  ExternalCachesDirectoryPath: RNFSManager.RNFSExternalCachesDirectoryPath,
   DocumentDirectoryPath: RNFSManager.RNFSDocumentDirectoryPath,
   ExternalDirectoryPath: RNFSManager.RNFSExternalDirectoryPath,
   ExternalStorageDirectoryPath: RNFSManager.RNFSExternalStorageDirectoryPath,

README.md

@@ -234,7 +234,7 @@ RNFS.readDir(RNFS.MainBundlePath) // On Android, use "RNFS.DocumentDirectoryPath
 var RNFS = require('react-native-fs');
 
 // create a path you want to write to
-// :warning: on iOS, you cannot write into `RNFS.MainBundlePath`, 
+// :warning: on iOS, you cannot write into `RNFS.MainBundlePath`,
 // but `RNFS.DocumentDirectoryPath` exists on both platforms and is writable
 var path = RNFS.DocumentDirectoryPath + '/test.txt';
 
@@ -333,6 +333,7 @@ The following constants are available on the `RNFS` export:
 
 - `MainBundlePath` (`String`) The absolute path to the main bundle directory (not available on Android)
 - `CachesDirectoryPath` (`String`) The absolute path to the caches directory
+- `ExternalCachesDirectoryPath` (`String`) The absolute path to the external caches directory (android only)
 - `DocumentDirectoryPath`  (`String`) The absolute path to the document directory
 - `TemporaryDirectoryPath` (`String`) The absolute path to the temporary directory (falls back to Caching-Directory on Android)
 - `LibraryDirectoryPath` (`String`) The absolute path to the NSLibraryDirectory (iOS only)
@@ -384,15 +385,17 @@ Node.js style version of `readDir` that returns only the names. Note the lowerca
 
 ### `stat(filepath: string): Promise<StatResult>`
 
-Stats an item at `path`.
+Stats an item at `filepath`. If the `filepath` is linked to a virtual file, for example Android Content URI, the `originalPath` can be used to find the pointed file path. 
 The promise resolves with an object with the following properties:
 
 ```
 type StatResult = {
+  path:            // The same as filepath argument
   ctime: date;     // The creation date of the file
   mtime: date;     // The last modified date of the file
   size: string;     // Size in bytes
   mode: number;     // UNIX file mode
+  originalFilepath: string;    // ANDROID: In case of content uri this is the pointed file path, otherwise is the same as path
   isFile: () => boolean;        // Is the file just a file?
   isDirectory: () => boolean;   // Is the file a directory?
 };
@@ -662,7 +665,7 @@ type FSInfoResult = {
 
 ### (Android only) `getAllExternalFilesDirs(): Promise<string[]>`
 
-Returns an array with the absolute paths to application-specific directories on all shared/external storage devices where the application can place persistent files it owns. 
+Returns an array with the absolute paths to application-specific directories on all shared/external storage devices where the application can place persistent files it owns.
 
 ### (iOS only) `pathForGroup(groupIdentifier: string): Promise<string>`
 

android/src/main/java/com/rnfs/RNFSManager.java

@@ -2,9 +2,11 @@
 
 import android.content.res.AssetFileDescriptor;
 import android.content.res.AssetManager;
+import android.database.Cursor;
 import android.net.Uri;
 import android.os.Environment;
 import android.os.StatFs;
+import android.provider.MediaStore;
 import android.support.annotation.Nullable;
 import android.util.Base64;
 import android.util.SparseArray;
@@ -43,6 +45,7 @@ public class RNFSManager extends ReactContextBaseJavaModule {
   private static final String RNFSPicturesDirectoryPath = "RNFSPicturesDirectoryPath";
   private static final String RNFSTemporaryDirectoryPath = "RNFSTemporaryDirectoryPath";
   private static final String RNFSCachesDirectoryPath = "RNFSCachesDirectoryPath";
+  private static final String RNFSExternalCachesDirectoryPath = "RNFSExternalCachesDirectoryPath";
   private static final String RNFSDocumentDirectory = "RNFSDocumentDirectory";
 
   private static final String RNFSFileTypeRegular = "RNFSFileTypeRegular";
@@ -76,6 +79,21 @@ private Uri getFileUri(String filepath) throws IORejectionException {
     return uri;
   }
 
+  private String getOriginalFilepath(String filepath) throws IORejectionException {
+    Uri uri = getFileUri(filepath);
+    String originalFilepath = "";
+    if (uri.getScheme().equals("content")) {
+      try {
+        Cursor cursor = reactContext.getContentResolver().query(uri, null, null, null, null);
+        if (cursor.moveToFirst()) {
+          originalFilepath = cursor.getString(cursor.getColumnIndexOrThrow(MediaStore.Images.Media.DATA));
+        }
+      } catch (IllegalArgumentException ignored) {
+      }
+    }
+    return originalFilepath;
+  }
+
   private InputStream getInputStream(String filepath) throws IORejectionException {
     Uri uri = getFileUri(filepath);
     InputStream stream;
@@ -514,16 +532,17 @@ public void setReadable(String filepath, Boolean readable, Boolean ownerOnly, Pr
   @ReactMethod
   public void stat(String filepath, Promise promise) {
     try {
-      File file = new File(filepath);
+      String originalFilepath = getOriginalFilepath(filepath);
+      File file = new File(originalFilepath);
 
       if (!file.exists()) throw new Exception("File does not exist");
 
       WritableMap statMap = Arguments.createMap();
-
       statMap.putInt("ctime", (int) (file.lastModified() / 1000));
       statMap.putInt("mtime", (int) (file.lastModified() / 1000));
       statMap.putInt("size", (int) file.length());
       statMap.putInt("type", file.isDirectory() ? 1 : 0);
+      statMap.putString("originalFilepath", originalFilepath);
 
       promise.resolve(statMap);
     } catch (Exception ex) {
@@ -846,6 +865,13 @@ public Map<String, Object> getConstants() {
       constants.put(RNFSExternalDirectoryPath, null);
     }
 
+    File externalCachesDirectory = this.getReactApplicationContext().getExternalCacheDir();
+    if (externalCachesDirectory != null) {
+      constants.put(RNFSExternalCachesDirectoryPath, externalCachesDirectory.getAbsolutePath());
+    } else {
+      constants.put(RNFSExternalCachesDirectoryPath, null);
+    }
+
     return constants;
   }
 }