feat(Filesystem): make writeFile return the file uri (#2484)

ionic-team · Feb 25, 2020 · e1a00bd · e1a00bd
1 parent 2ec6cf5
commit e1a00bd
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 9 deletions.
diff --git a/android/capacitor/src/main/java/com/getcapacitor/plugin/Filesystem.java b/android/capacitor/src/main/java/com/getcapacitor/plugin/Filesystem.java
@@ -282,7 +282,9 @@ private void saveFile(PluginCall call, File file, String data) {
         MediaScannerConnection.scanFile(getContext(), new String[] {file.getAbsolutePath()}, null, null);
       }
       Log.d(getLogTag(), "File '" + file.getAbsolutePath() + "' saved!");
-      call.success();
+      JSObject result = new JSObject();
+      result.put("uri", Uri.fromFile(file).toString());
+      call.success(result);
     } else {
       call.error("FILE_NOTCREATED");
     }

diff --git a/core/package-lock.json b/core/package-lock.json
diff --git a/core/src/core-plugin-definitions.ts b/core/src/core-plugin-definitions.ts
@@ -754,6 +754,7 @@ export interface FileReadResult {
 export interface FileDeleteResult {
 }
 export interface FileWriteResult {
+  uri: string;
 }
 export interface FileAppendResult {
 }

diff --git a/core/src/web/filesystem.ts b/core/src/web/filesystem.ts
@@ -176,7 +176,9 @@ export class FilesystemPluginWeb extends WebPlugin implements FilesystemPlugin {
       content: !encoding && data.indexOf(',') >= 0 ? data.split(',')[1] : data,
     };
     await this.dbRequest('put', [pathObj]);
-    return {};
+    return {
+      uri: pathObj.path
+    };
   }
 
   /**

diff --git a/electron/src/electron/filesystem.ts b/electron/src/electron/filesystem.ts
@@ -71,7 +71,7 @@ export class FilesystemPluginElectron extends WebPlugin implements FilesystemPlu
           return;
         }
 
-        resolve();
+        resolve({uri: lookupPath});
       });
     });
   }

diff --git a/example/src/pages/filesystem/filesystem.ts b/example/src/pages/filesystem/filesystem.ts
@@ -27,18 +27,18 @@ export class FilesystemPage {
     console.log('ionViewDidLoad FilesystemPage');
   }
 
-  fileWrite() {
+  async fileWrite() {
     try {
-      Plugins.Filesystem.writeFile({
+      const result = await Plugins.Filesystem.writeFile({
         path: 'secrets/text.txt',
         data: "This is a test",
         directory: FilesystemDirectory.Documents,
         encoding: FilesystemEncoding.UTF8
       });
+      console.log('Wrote file', result);
     } catch(e) {
       console.error('Unable to write file (press mkdir first, silly)', e);
     }
-    console.log('Wrote file');
   }
 
   async fileRead() {
@@ -131,12 +131,13 @@ export class FilesystemPage {
 
   async directoryTest() {
     try {
-      await Plugins.Filesystem.writeFile({
+      const result = await Plugins.Filesystem.writeFile({
         path: 'text.txt',
         data: "This is a test",
         directory: FilesystemDirectory.Data,
         encoding: FilesystemEncoding.UTF8
       });
+      console.log('wrote file', result);
       let stat = await Plugins.Filesystem.stat({
         path: 'text.txt',
         directory: FilesystemDirectory.Data

diff --git a/ios/Capacitor/Capacitor/Plugins/Filesystem.swift b/ios/Capacitor/Capacitor/Plugins/Filesystem.swift
@@ -115,7 +115,9 @@ public class CAPFilesystemPlugin : CAPPlugin {
           return
         }
       }
-      call.success()
+      call.success([
+        "uri": fileUrl.absoluteString
+      ])
     } catch let error as NSError {
       handleError(call, error.localizedDescription, error)
     }