Added support for retrieving ingredients over HTTP

This makes it possible to directly reference recipes and tiddlers
stored on GitHub, for example.
This commit is contained in:
Jeremy Ruston 2011-11-29 18:27:03 +00:00
parent dc3546380a
commit 6bbc6c0dac
3 changed files with 48 additions and 4 deletions

View File

@ -5,6 +5,10 @@ throttling so that we don't get error EMFILE "Too many open files".
var fs = require("fs"),
path = require("path"),
url = require("url"),
util = require("util"),
http = require("http"),
https = require("https"),
utils = require("./Utils.js");
var FileRetriever = exports;
@ -12,15 +16,53 @@ var FileRetriever = exports;
var fileRequestQueue = utils.queue(function(task,callback) {
fs.readFile(task.filepath,"utf8", function(err,data) {
callback(err,data);
console.error("Retrieved " + task.filepath);
});
},10);
var httpRequestQueue = utils.queue(function(task,callback) {
var opts = url.parse(task.url);
var httpLib = opts.protocol === "http:" ? http : https;
var request = httpLib.get(opts,function(res) {
if(res.statusCode != 200) {
var err = new Error("HTTP error");
err.code = res.statusCode.toString();
callback(err);
} else {
var data = [];
res.on("data", function(chunk) {
data.push(chunk)
});
res.on("end", function() {
callback(null,data.join(""));
console.error("Retrieved " + task.url);
});
}
});
request.addListener("error", function(err) {
callback(err);
});
request.end();
},4);
// Retrieve a file given a filepath specifier and a context path. If the filepath isn't an absolute
// filepath or an absolute URL, then it is interpreted relative to the context path, which can also be
// a filepath or a URL. It returns the final path used to reach the file. On completion, the callback
// function is called as callback(err,data)
FileRetriever.retrieveFile = function(filepath,contextPath,callback) {
var newpath = path.resolve(path.dirname(contextPath),filepath);
fileRequestQueue.push({filepath: newpath},callback);
return newpath;
var httpRegExp = /^(https?:\/\/)/gi,
newpath,
filepathIsHttp = httpRegExp.test(filepath),
contextPathIsHttp = httpRegExp.test(contextPath);
if(contextPathIsHttp || filepathIsHttp) {
// If we've got a full HTTP URI then we're good to go
newpath = url.resolve(contextPath,filepath);
httpRequestQueue.push({url: newpath},callback);
return newpath;
} else {
// It's a file requested in a file context
newpath = path.resolve(path.dirname(contextPath),filepath);
fileRequestQueue.push({filepath: newpath},callback);
return newpath;
}
}

View File

@ -124,7 +124,7 @@ Recipe.prototype.readIngredient = function(filepath,contextPath,callback) {
var metafile = filepath + ".meta";
me.incFetchCount();
retrieveFile(metafile,contextPath,function(err,data) {
if(err && err.code !== 'ENOENT') {
if(err && err.code !== "ENOENT" && err.code !== "404") {
throw err;
}
if(!err) {

View File

@ -0,0 +1,2 @@
recipe: https://raw.github.com/TiddlyWiki/tiddlywiki/master/tiddlywikinonoscript.html.recipe
recipe: ../tiddlywiki.com/index.html.recipe