Attachment #262286 for bug #495622

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

View | Details | Raw Unified | Return to bug 495622
Collapse All | Expand All

Lines 133-138 define(['i18n!orion/navigate/nls/messages', 'orion/webui/littlelib', 'orion/i18n Link Here

(-)a/bundles/org.eclipse.orion.client.ui/web/orion/fileCommands.js (+6 lines)
133	return;	133	return;
134	}	134	}
135	}	135	}
		136	if (result.Severity === "Error") {
		137	if (handlers && handlers.error) {
		138	handlers.error();
		139	return;
		140	}
		141	}
136	}	142	}
137	if (!preventNotification) {	143	if (!preventNotification) {
138	//TODO Not sure if we should send out event from file Client here	144	//TODO Not sure if we should send out event from file Client here




var fs = Promise.promisifyAll(require('fs'));
var fileUtil = require('./fileUtil');

/**
 * @callback
 */
module.exports = function(options) {
	var UPLOADS_FOLDER = path.join(options.configParams['orion.single.user'] ?
			path.join(os.homedir(), ".orion") : options.workspaceDir, ".uploads");

function getOptions(req) {
	return req.get("X-Xfer-Options").split(",");
}
	
function reportTransferFailure(res, err) {
	var message = "File transfer failed";
	if (err.message) {
		message += ": " + err.message;
	}
	return res.status(400).json({
				Severity: "Error",
				HttpCode: 400,
				Code: 0,
				Message: message,
				DetailedMessage: message
	});
}

function postImportXfer(req, res) {
	var filePath = req.params["0"];

	function upload(request) {
		var tempFile = path.join(UPLOADS_FOLDER, Date.now() + fileName);
		var ws = fs.createWriteStream(tempFile);
		ws.on('error', function(err) {
			reportTransferFailure(res, err);
		});
		ws.on('finish', function() {
			completeTransfer(req, res, tempFile, filePath, fileName, xferOptions, shouldUnzip);
		});

						entry.autodrain();
						return;
					}
					// make sure all sub folders exist
					var subfolderPath = path.join(filePath, path.dirname(entryName));
					if (!fs.existsSync(subfolderPath)) {
						mkdirp.sync(subfolderPath);
					}
					var writeStream = fs.createWriteStream(outputName);
					writeStream.on('error', function(err) {
						reportTransferFailure(res, err);
					});
					entry.pipe(writeStream);
				} else if (type === "Directory") {
					if (!fs.existsSync(outputName)) {
						mkdirp.sync(outputName);
					}
				}
			} else {
				entry.autodrain();

		zip.file(filePath, { name: filePath.substring(base.length).replace(/\\/g, "/") });
	});
}
};

Return to bug 495622

Lines 22-30 var mkdirp = require('mkdirp'); Link Here

(-)a/modules/orionode/lib/xfer.js (-6 / +34 lines)
22	var fs = Promise.promisifyAll(require('fs'));	22	var fs = Promise.promisifyAll(require('fs'));
23	var fileUtil = require('./fileUtil');	23	var fileUtil = require('./fileUtil');
24		24
25	/**	25	/**
26	* @callback	26	* @callback
27	*/	27	*/
28	module.exports = function(options) {	28	module.exports = function(options) {
29	var UPLOADS_FOLDER = path.join(options.configParams['orion.single.user'] ?	29	var UPLOADS_FOLDER = path.join(options.configParams['orion.single.user'] ?
30	path.join(os.homedir(), ".orion") : options.workspaceDir, ".uploads");	30	path.join(os.homedir(), ".orion") : options.workspaceDir, ".uploads");
Lines 41-46 module.exports = function(options) { Link Here
41	function getOptions(req) {	41	function getOptions(req) {
42	return req.get("X-Xfer-Options").split(",");	42	return req.get("X-Xfer-Options").split(",");
43	}	43	}
		44
		45	function reportTransferFailure(res, err) {
		46	var message = "File transfer failed";
		47	if (err.message) {
		48	message += ": " + err.message;
		49	}
		50	return res.status(400).json({
		51	Severity: "Error",
		52	HttpCode: 400,
		53	Code: 0,
		54	Message: message,
		55	DetailedMessage: message
		56	});
		57	}
44		58
45	function postImportXfer(req, res) {	59	function postImportXfer(req, res) {
46	var filePath = req.params["0"];	60	var filePath = req.params["0"];
Lines 63-68 function postImportXfer(req, res) { Link Here
63	function upload(request) {	77	function upload(request) {
64	var tempFile = path.join(UPLOADS_FOLDER, Date.now() + fileName);	78	var tempFile = path.join(UPLOADS_FOLDER, Date.now() + fileName);
65	var ws = fs.createWriteStream(tempFile);	79	var ws = fs.createWriteStream(tempFile);
		80	ws.on('error', function(err) {
		81	reportTransferFailure(res, err);
		82	});
66	ws.on('finish', function() {	83	ws.on('finish', function() {
67	completeTransfer(req, res, tempFile, filePath, fileName, xferOptions, shouldUnzip);	84	completeTransfer(req, res, tempFile, filePath, fileName, xferOptions, shouldUnzip);
68	});	85	});
Lines 142-150 function completeTransfer(req, res, tempFile, filePath, fileName, xferOptions, s Link Here
142	entry.autodrain();	159	entry.autodrain();
143	return;	160	return;
144	}	161	}
145	entry.pipe(fs.createWriteStream(outputName));	162	// make sure all sub folders exist
		163	var subfolderPath = path.join(filePath, path.dirname(entryName));
		164	if (!fs.existsSync(subfolderPath)) {
		165	mkdirp.sync(subfolderPath);
		166	}
		167	var writeStream = fs.createWriteStream(outputName);
		168	writeStream.on('error', function(err) {
		169	reportTransferFailure(res, err);
		170	});
		171	entry.pipe(writeStream);
146	} else if (type === "Directory") {	172	} else if (type === "Directory") {
147	mkdirp.sync(outputName);	173	if (!fs.existsSync(outputName)) {
		174	mkdirp.sync(outputName);
		175	}
148	}	176	}
149	} else {	177	} else {
150	entry.autodrain();	178	entry.autodrain();
Lines 210-213 function write (zip, base, filePath) { Link Here
210	zip.file(filePath, { name: filePath.substring(base.length).replace(/\\/g, "/") });	238	zip.file(filePath, { name: filePath.substring(base.length).replace(/\\/g, "/") });
211	});	239	});
212	}	240	}
213	};	241	};