Merge pull request #461 from ethereum/refactor-imports

src/app.js

@@ -503,7 +503,6 @@ var run = function () {
   // ----------------- compiler ----------------------
 
   function handleGithubCall (root, path, cb) {
-    $('#output').append($('<div/>').append($('<pre/>').text('Loading github.com/' + root + '/' + path + ' ...')))
     return $.getJSON('https://api.github.com/repos/' + root + '/contents/' + path)
       .done(function (data) {
         if ('content' in data) {
@@ -534,7 +533,6 @@ var run = function () {
     // replace ipfs:// with /ipfs/
     url = url.replace(/^ipfs:\/\/?/, 'ipfs/')
 
-    $('#output').append($('<div/>').append($('<pre/>').text('Loading ' + url + ' ...')))
     return $.ajax({ type: 'GET', url: 'https://gateway.ipfs.io/' + url })
       .done(function (data) {
         cb(null, data)
@@ -546,35 +544,29 @@ var run = function () {
   }
 
   function handleImportCall (url, cb) {
-    var match
     if (files.exists(url)) {
       cb(null, files.get(url))
-    } else if ((match = /^(https?:\/\/)?(www.)?github.com\/([^/]*\/[^/]*)\/(.*)/.exec(url))) {
-      handleGithubCall(match[3], match[4], function (err, content) {
-        if (err) {
-          cb('Unable to import "' + url + '": ' + err)
       return
     }
 
-        // FIXME: at some point we should invalidate the cache
-        files.addReadOnly(url, content)
-        cb(null, content)
-      })
-    } else if ((match = /^(bzz[ri]?:\/\/?.*)$/.exec(url))) {
-      // Supported: bzz:, bzzr:, bzzi:
-      $('#output').append($('<div/>').append($('<pre/>').text('Loading ' + url + ' ...')))
-      handleSwarmImport(match[1], function (err, content) {
-        if (err) {
-          cb('Unable to import "' + url + '": ' + err)
+    var handlers = [
+      { match: /^https?:\/\/?www.?github.com\/([^/]*\/[^/]*)\/(.*)/, handler: function (match, cb) { handleGithubCall(match[3], match[4], cb) } },
+      { match: /^(bzz[ri]?:\/\/?.*)$/, handler: function (match, cb) { handleSwarmImport(match[1], cb) } },
+      { match: /^(ipfs:\/\/?.+)/, handler: function (match, cb) { handleIPFS(match[1], cb) } }
+    ]
+
+    var found = false
+    handlers.forEach(function (handler) {
+      if (found) {
         return
       }
 
-        // FIXME: at some point we should invalidate the cache
-        files.addReadOnly(url, content)
-        cb(null, content)
-      })
-    } else if ((match = /^(ipfs:\/\/?.+)/.exec(url))) {
-      handleIPFS(match[1], function (err, content) {
+      var match = handler.match.exec(url)
+      if (match) {
+        found = true
+
+        $('#output').append($('<div/>').append($('<pre/>').text('Loading ' + url + ' ...')))
+        handler.handler(match, function (err, content) {
           if (err) {
             cb('Unable to import "' + url + '": ' + err)
             return
@@ -584,8 +576,13 @@ var run = function () {
           files.addReadOnly(url, content)
           cb(null, content)
         })
+      }
+    })
+
+    if (found) {
+      return
     } else if (/^[^:]*:\/\//.exec(url)) {
-      cb('Unable to import "' + url + '": Unsupported URL')
+      cb('Unable to import "' + url + '": Unsupported URL schema')
     } else {
       cb('Unable to import "' + url + '": File not found')
     }