From 8396b0599273091f0266c2fb17cd340f27876949 Mon Sep 17 00:00:00 2001
From: christophe-g <christophe.geiser@gmail.com>
Date: Fri, 28 Apr 2017 11:12:41 +0200
Subject: [PATCH] added cache and make sure we are not fetching invalid path

---
 file-fire-cache-behavior.html |  31 ++++++++
 file-fire-fetch.html          | 144 +++++++++++++++++++---------------
 2 files changed, 112 insertions(+), 63 deletions(-)
 create mode 100644 file-fire-cache-behavior.html

diff --git a/file-fire-cache-behavior.html b/file-fire-cache-behavior.html
new file mode 100644
index 0000000..a13c0f8
--- /dev/null
+++ b/file-fire-cache-behavior.html
@@ -0,0 +1,31 @@
+/** * Using a Map to efficiently cache url that have already been fetched */
+<script>
+(function() {
+  var cache = new Map();
+
+  window.myBehaviors = window.myBehaviors || {};
+
+  /* @polymerBehavior myBehaviors.FileFireCache */
+  myBehaviors.FileFireCache = {
+    /* 
+     * `_pathReady` returns true if the path is a valid path 
+     */
+    __pathReady: function(path) {
+      return path && path.split('/').slice(1).indexOf('') < 0;
+    },
+
+    setCache: function(path, url) {
+      cache.set(path, url);
+    },
+
+    getCache: function(path) {
+      return cache.get(path);
+    },
+
+    cleaCache: function() {
+      cache.clear();
+    }
+  };
+
+})();
+</script>
diff --git a/file-fire-fetch.html b/file-fire-fetch.html
index 925df1f..104a184 100644
--- a/file-fire-fetch.html
+++ b/file-fire-fetch.html
@@ -1,77 +1,95 @@
 <link rel="import" href="../polymer/polymer.html">
 <link rel="import" href="../polymerfire/firebase.html">
-
+<link rel="import" href="file-fire-cache-behavior.html">
 <dom-module id="file-fire-fetch">
   <script>
-    /**
-     * An element that provides the url to a file based on the FireBase storage path
-     * Example:
-     * ```
-     * <firebase-app
-     *   name="demo"
-     *   api-key="API_KEY"
-     *   auth-domain="AUTH_DOMAIN"
-     *   database-url="DATABASE_URL"
-     *   storage-bucket="convoofire.appspot.com">
-     * </firebase-app>
-     * <!-- A file-fire-fetch element allowing image upload to firebase storage -->
-     *  <file-fire-fetch
-     *    app-name="demo"
-     *    path="/my/path/to/file.jpg"
-     *    file-url="{{myFileURL}}"   
-     *   ></file-fire-fetch>
-     * ```
-     *
-     *
-     * @demo demo/file-fire-fetch.html
-     */
-    Polymer({
-        is: 'file-fire-fetch',
-        properties: {
-        /**
-         * `appName` represents the name of the firebase-app that was instantiated
-         */
-        appName: {
-            type: String,
-        },
-        /**
-         * `path` represents where the file should be saved, if the path doesnt exist it will be created
-         */
-        path: {
-            type: String,
-            observer: "_updateFile"
-        },
-        /**
-         * `fileUrl` represents the file's direct url'
-         */
-        fileUrl: {
-            type: String,
-            notify: true,
-            reflectToAttribute: true
-        },
-        fileExists: {
-            type: Boolean,
-            value: false,
-            notify: true
-        }
+  /**
+   * An element that provides the url to a file based on the FireBase storage path
+   * Example:
+   * ```
+   * <firebase-app
+   *   name="demo"
+   *   api-key="API_KEY"
+   *   auth-domain="AUTH_DOMAIN"
+   *   database-url="DATABASE_URL"
+   *   storage-bucket="convoofire.appspot.com">
+   * </firebase-app>
+   * <!-- A file-fire-fetch element allowing image upload to firebase storage -->
+   *  <file-fire-fetch
+   *    app-name="demo"
+   *    path="/my/path/to/file.jpg"
+   *    file-url="{{myFileURL}}"   
+   *   ></file-fire-fetch>
+   * ```
+   *
+   *
+   * @demo demo/file-fire-fetch.html
+   */
+  Polymer({
+    is: 'file-fire-fetch',
+
+    behaviors: [
+      myBehaviors.FileFireCache
+    ],
+
+    properties: {
+      /**
+       * `appName` represents the name of the firebase-app that was instantiated
+       */
+      appName: {
+        type: String,
+      },
+
+      /**
+       * `path` represents where the file should be saved, if the path doesnt exist it will be created
+       */
+      path: {
+        type: String,
+        observer: "_updateFile"
+      },
+
+      /**
+       * `fileUrl` represents the file's direct url'
+       */
+      fileUrl: {
+        type: String,
+        notify: true,
+        reflectToAttribute: true
+      },
+
+      fileExists: {
+        type: Boolean,
+        value: false,
+        notify: true
+      }
     },
 
-    _updateFile: function(newVal){
-      if(newVal){
-          var storage = firebase.storage(firebase.app(this.appName));
-          var storageRef = storage.ref();
-          storageRef.child(this.path).getDownloadURL().then(function(url) {
-              this.fileUrl = url;
-              this.fileExists = true;
+    _updateFile: function(path) {
+      if (path && this.__pathReady(path)) {
+        var cached = this.getCache(path);
+        if(cached) {
+            this.fileUrl = cached;
+            this.fileExists = true;
+            return;
+        }
+        var storage = firebase.storage(firebase.app(this.appName));
+        var storageRef = storage.ref();
+        storageRef.child(path).getDownloadURL().then(function(url) {
+            this.fileUrl = url;
+            this.fileExists = true;
+            this.setCache(path, url);
           }.bind(this))
           .catch(function(error) {
-              this.fire("no-file", {message:"No file exists at this location", error: error});
-              this.fileExists = false;
-              // console.log(error);
+            this.fire("no-file", {
+              message: "No file exists at this location",
+              error: error
+            });
+            this.fileExists = false;
+            // console.log(error);
           }.bind(this));
       }
     }
 
-    });
+  });
   </script>
 </dom-module>