infra
/
cryptpad
2
1
Fork 0
Code Issues Pull Requests Projects Releases 1 Activity

Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging

pull/1/head
yflory 2019-03-29 17:03:59 +01:00
parent f24d34c0af fc43c08baf
commit acf831e200
3 changed files with 14 additions and 9 deletions

2
expire-channels.js
View File

@ -60,7 +60,7 @@ var handleTask = function (str, path, cb) {
}
}).nThen(function () {
// remove the task file...
Fs.unlink(path, function (err) {
Fs.unlink(path, function (err) { // FIXME deletion
if (err) { console.error(err); }
cb();
});

9
storage/file.js
View File

@ -2,6 +2,7 @@
/* jshint esversion: 6 */
/* global Buffer */
var Fs = require("fs");
var Fse = require("fs-extra");
var Path = require("path");
var nThen = require("nthen");
const ToPull = require('stream-to-pull-stream');
@ -67,7 +68,7 @@ var closeChannel = function (env, channelName, cb) {
}
};
var clearChannel = function (env, channelId, cb) {
var clearChannel = function (env, channelId, cb) { // FIXME deletion
var path = mkPath(env, channelId);
getMetadataAtPath(env, path, function (e, metadata) {
if (e) { return cb(new Error(e)); }
@ -189,7 +190,7 @@ var checkPath = function (path, callback) {
return;
}
// 511 -> octal 777
Fs.mkdir(Path.dirname(path), 511, function (err) {
Fse.mkdirp(Path.dirname(path), 511, function (err) {
if (err && err.code !== 'EEXIST') {
callback(err);
return;
@ -199,7 +200,7 @@ var checkPath = function (path, callback) {
});
};
var removeChannel = function (env, channelName, cb) {
var removeChannel = function (env, channelName, cb) { // FIXME deletion
var filename = mkPath(env, channelName);
Fs.unlink(filename, cb);
};
@ -420,7 +421,7 @@ module.exports.create = function (
};
// 0x1ff -> 777
var it;
Fs.mkdir(env.root, 0x1ff, function (err) {
Fse.mkdirp(env.root, 0x1ff, function (err) {
if (err && err.code !== 'EEXIST') {
// TODO: somehow return a nice error
throw err;

12
storage/tasks.js
View File

@ -1,4 +1,5 @@
var Fs = require("fs");
var Fse = require("fs-extra");
var Path = require("path");
var nacl = require("tweetnacl");
var nThen = require("nthen");
@ -58,8 +59,8 @@ var write = function (env, task, cb) {
var dir = id.slice(0, 2);
var dirpath = Path.join(env.root, dir);
Fs.mkdir(dirpath, 0x1ff, w(function (err) {
if (err && err.code !== 'EEXIST') {
Fse.mkdirp(dirpath, 0x1ff, w(function (err) {
if (err) {
return void cb(err);
}
}));
@ -72,13 +73,17 @@ var write = function (env, task, cb) {
});
};
// TODO implement a standard API for removing tasks
// currently they are deleted manually in 'expire-channels.js'
// var remove = function (env, id, cb) { };
Tasks.create = function (config, cb) {
var env = {
root: config.taskPath || './tasks',
};
// make sure the path exists...
Fs.mkdir(env.root, 0x1ff, function (err) {
Fse.mkdirp(env.root, 0x1ff, function (err) {
if (err && err.code !== 'EEXIST') {
throw err;
}
@ -91,4 +96,3 @@ Tasks.create = function (config, cb) {
});
};