From bbcd0902d05f670cd6e4cc26d272bf8e4ebb8af3 Mon Sep 17 00:00:00 2001
From: yann300 <yann.levreau@gmail.com>
Date: Mon, 4 Dec 2017 16:21:05 +0100
Subject: [PATCH] make compiler import reurn type and clean path

---
 src/app.js                           |  4 ++--
 src/app/compiler/compiler-imports.js | 18 +++++++++---------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/app.js b/src/app.js
index 278ab5f9c6..50124b32df 100644
--- a/src/app.js
+++ b/src/app.js
@@ -200,10 +200,10 @@ function run () {
     if (provider && provider.exists(url)) {
       return provider.get(url, cb)
     }
-    handleImports.import(url, (error, content) => {
+    handleImports.import(url, (error, content, cleanUrl, type) => {
       if (!error) {
         // FIXME: at some point we should invalidate the browser cache
-        filesProviders['browser'].addReadOnly(url, content)
+        filesProviders[type].addReadOnly(cleanUrl, content)
         cb(null, content)
       } else {
         cb(error)
diff --git a/src/app/compiler/compiler-imports.js b/src/app/compiler/compiler-imports.js
index 29d86b8087..23e728fb6d 100644
--- a/src/app/compiler/compiler-imports.js
+++ b/src/app/compiler/compiler-imports.js
@@ -8,7 +8,7 @@ module.exports = {
     return $.getJSON('https://api.github.com/repos/' + root + '/contents/' + path)
       .done(function (data) {
         if ('content' in data) {
-          cb(null, base64.decode(data.content))
+          cb(null, base64.decode(data.content), root + '/' + path)
         } else {
           cb('Content not received')
         }
@@ -21,7 +21,7 @@ module.exports = {
 
   handleSwarmImport: function (url, cb) {
     swarmgw.get(url, function (err, content) {
-      cb(err, content)
+      cb(err, content, url)
     })
   },
 
@@ -31,7 +31,7 @@ module.exports = {
 
     return $.ajax({ type: 'GET', url: 'https://gateway.ipfs.io/' + url })
       .done(function (data) {
-        cb(null, data)
+        cb(null, data, url)
       })
       .fail(function (xhr, text, err) {
         // NOTE: on some browsers, err equals to '' for certain errors (such as offline browser)
@@ -41,9 +41,9 @@ module.exports = {
 
   import: function (url, cb) {
     var handlers = [
-      { match: /^(https?:\/\/)?(www.)?github.com\/([^/]*\/[^/]*)\/(.*)/, handler: (match, cb) => { this.handleGithubCall(match[3], match[4], cb) } },
-      { match: /^(bzz[ri]?:\/\/?.*)$/, handler: (match, cb) => { this.handleSwarmImport(match[1], cb) } },
-      { match: /^(ipfs:\/\/?.+)/, handler: (match, cb) => { this.handleIPFS(match[1], cb) } }
+      { type: 'github', match: /^(https?:\/\/)?(www.)?github.com\/([^/]*\/[^/]*)\/(.*)/, handler: (match, cb) => { this.handleGithubCall(match[3], match[4], cb) } },
+      { type: 'swarm', match: /^(bzz[ri]?:\/\/?.*)$/, handler: (match, cb) => { this.handleSwarmImport(match[1], cb) } },
+      { type: 'ipfs', match: /^(ipfs:\/\/?.+)/, handler: (match, cb) => { this.handleIPFS(match[1], cb) } }
     ]
 
     var found = false
@@ -57,13 +57,13 @@ module.exports = {
         found = true
 
         $('#output').append($('<div/>').append($('<pre/>').text('Loading ' + url + ' ...')))
-        handler.handler(match, function (err, content) {
+        handler.handler(match, function (err, content, cleanUrl) {
           if (err) {
-            cb('Unable to import "' + url + '": ' + err)
+            cb('Unable to import "' + cleanUrl + '": ' + err)
             return
           }
 
-          cb(null, content)
+          cb(null, content, cleanUrl, handler.type)
         })
       }
     })