mirror
/
c9-core
kopia lustrzana https://github.com/c9/core
1
0
Forkuj 0
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

Merge pull request +6255 from c9/download 

allow downloading multiple files, and fix support for non-ascii filenames
pull/39/head
Lennart Kats 2015-02-19 15:57:55 +01:00
rodzic da9a5ea6a9 4976bf5bfd
commit 61ba91aca1
3 zmienionych plików z 54 dodań i 22 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

13
plugins/c9.vfs.client/vfs_client.js
Wyświetl plik

@ -188,8 +188,17 @@ define(function(require, exports, module) {
}
function download(path, filename, isfile) {
window.open(vfsUrl(path) + "?download"
+ (filename ? "=" + encodeURIComponent(filename) : "")
var extraPaths = "";
if (Array.isArray(path)) {
extraPaths = path;
path = path[0];
extraPaths = "," + extraPaths.map(function(p) {
return p[0] == path[0] && p != path ? escape(p) : "";
}).filter(Boolean).join(",");
}
window.open(vfsUrl(path) + extraPaths
+ "?download"
+ (filename ? "=" + escape(filename) : "")
+ (isfile ? "&isfile=1" : ""));
}

59
plugins/c9.vfs.server/download.js
Wyświetl plik

@ -31,18 +31,22 @@ define(function(require, exports, module) {
});
function download(vfs, root, req, res, next) {
var path = Path.join(root, Path.normalize(decodeURI(req.uri.pathname).replace(/^(\/?\.\.)?\/?/, "")));
var dir = Path.dirname(path);
var name = Path.basename(path).replace(/\/*$/, "");
var paths = req.uri.pathname.split(",").map(function(path) {
return Path.join(root, Path.normalize(unescape(path).replace(/^(\/?\.\.)?\/?/, "")));
});
var path = paths[0];
var name = Path.basename(path);
var filename;
if (req.uri.query.download)
filename = req.uri.query.download;
else
filename = name + ".tar.gz";
var process;
var filename = req.uri.query.download;
if (!filename) {
filename = name;
if (!req.uri.query.isfile) {
filename += (paths.length > 1 ? "[+" + (paths.length - 1) + "]" : "") + ".tar.gz";
}
}
var filenameHeader = "attachment; filename*=utf-8''" + encodeURIComponent(filename);
var process;
req.on("close", function() {
if (process) process.kill();
});
@ -56,14 +60,14 @@ define(function(require, exports, module) {
return next(err);
}
// once we receive data on stdout pipe it to the response
meta.stream.once("data", function (data) {
// once we receive data on stdout pipe it to the response
meta.stream.once("data", function(data) {
if (res.headerSent)
return;
res.writeHead(200, {
"Content-Type": "octet/stream",
"Content-Disposition": "attachment; filename=" + name
"Content-Disposition": filenameHeader
});
res.write(data);
meta.stream.pipe(res);
@ -76,10 +80,29 @@ define(function(require, exports, module) {
});
}
else {
vfs.spawn("tar", {
args: ["-zcf", "-", name],
cwd: dir
}, function (err, meta) {
// TODO add support for downloding as zip on windows
// var cwd;
// var args = ["-r", "-"];
// paths.forEach(function(path) {
// if (!path) return;
// var dir = Path.dirname(path);
// if (!cwd) cwd = dir;
// var name = Path.relative(cwd, path);
// if (name[0] == "-") name = "./" + name;
// args.push(name);
// });
// vfs.spawn("zip", { args: args, cwd: cwd }
var args = ["-zcf", "-"];
paths.forEach(function(path) {
if (!path) return;
var dir = Path.dirname(path);
var name = Path.basename(path);
if (name[0] == "-")
name = "--add-file=" + name;
args.push("-C" + dir, name);
});
vfs.spawn("tar", { args: args }, function (err, meta) {
if (err)
return next(err);
@ -92,7 +115,7 @@ define(function(require, exports, module) {
res.writeHead(200, {
"Content-Type": "application/x-gzip",
"Content-Disposition": "attachment; filename=" + filename
"Content-Disposition": filenameHeader
});
res.write(data);
process.stdout.pipe(res);

4
plugins/c9.vfs.server/download_test.js
Wyświetl plik

@ -53,7 +53,7 @@ module.exports = {
var file = fs.createWriteStream(filename);
http.get("http://localhost:8787/?download=download.tar.gz", function(res) {
assert.equal(res.headers["content-type"], "application/x-gzip");
assert.equal(res.headers["content-disposition"], "attachment; filename=download.tar.gz");
assert.equal(res.headers["content-disposition"], "attachment; filename*=utf-8''download.tar.gz");
res.pipe(file);
@ -98,7 +98,7 @@ module.exports = {
var file = fs.createWriteStream(filename);
http.get("http://localhost:8787/views?download", function(res) {
assert.equal(res.headers["content-type"], "application/x-gzip");
assert.equal(res.headers["content-disposition"], "attachment; filename=views.tar.gz");
assert.equal(res.headers["content-disposition"], "attachment; filename*=utf-8''views.tar.gz");
res.pipe(file);