Commit 37cf8a3f authored by Alex Beregszaszi's avatar Alex Beregszaszi

Remove code duplication in handleImport

parent 36473dea
...@@ -544,37 +544,29 @@ var run = function () { ...@@ -544,37 +544,29 @@ var run = function () {
} }
function handleImportCall (url, cb) { function handleImportCall (url, cb) {
var match
if (files.exists(url)) { if (files.exists(url)) {
cb(null, files.get(url)) cb(null, files.get(url))
} else if ((match = /^(https?:\/\/)?(www.)?github.com\/([^/]*\/[^/]*)\/(.*)/.exec(url))) {
$('#output').append($('<div/>').append($('<pre/>').text('Loading github.com/' + match[3] + '/' + match[4] + ' ...')))
handleGithubCall(match[3], match[4], function (err, content) {
if (err) {
cb('Unable to import "' + url + '": ' + err)
return return
} }
// FIXME: at some point we should invalidate the cache var handlers = [
files.addReadOnly(url, content) { match: /^https?:\/\/?www.?github.com\/([^/]*\/[^/]*)\/(.*)/, handler: function (match, cb) { handleGithubCall(match[3], match[4], cb) } },
cb(null, content) { match: /^(bzz[ri]?:\/\/?.*)$/, handler: function (match, cb) { handleSwarmImport(match[1], cb) } },
}) { match: /^(ipfs:\/\/?.+)/, handler: function (match, cb) { handleIPFS(match[1], cb) } }
} else if ((match = /^(bzz[ri]?:\/\/?.*)$/.exec(url))) { ]
// Supported: bzz:, bzzr:, bzzi:
$('#output').append($('<div/>').append($('<pre/>').text('Loading ' + url + ' ...'))) var found = false
handleSwarmImport(match[1], function (err, content) { handlers.forEach(function (handler) {
if (err) { if (found) {
cb('Unable to import "' + url + '": ' + err)
return return
} }
// FIXME: at some point we should invalidate the cache var match = handler.match.exec(url)
files.addReadOnly(url, content) if (match) {
cb(null, content) found = true
})
} else if ((match = /^(ipfs:\/\/?.+)/.exec(url))) {
$('#output').append($('<div/>').append($('<pre/>').text('Loading ' + url + ' ...'))) $('#output').append($('<div/>').append($('<pre/>').text('Loading ' + url + ' ...')))
handleIPFS(match[1], function (err, content) { handler.handler(match, function (err, content) {
if (err) { if (err) {
cb('Unable to import "' + url + '": ' + err) cb('Unable to import "' + url + '": ' + err)
return return
...@@ -584,8 +576,13 @@ var run = function () { ...@@ -584,8 +576,13 @@ var run = function () {
files.addReadOnly(url, content) files.addReadOnly(url, content)
cb(null, content) cb(null, content)
}) })
}
})
if (found) {
return
} else if (/^[^:]*:\/\//.exec(url)) { } else if (/^[^:]*:\/\//.exec(url)) {
cb('Unable to import "' + url + '": Unsupported URL') cb('Unable to import "' + url + '": Unsupported URL schema')
} else { } else {
cb('Unable to import "' + url + '": File not found') cb('Unable to import "' + url + '": File not found')
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment