web/cryptpad
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source
This commit is contained in:
yflory 2019-03-29 17:03:59 +01:00
commit acf831e200
3 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
expire-channels.js
View File

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

9
storage/file.js
View File

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

12
storage/tasks.js
View File

@ -1,4 +1,5 @@
var Fs = require("fs"); var Fs = require("fs");
var Fse = require("fs-extra");
var Path = require("path"); var Path = require("path");
var nacl = require("tweetnacl"); var nacl = require("tweetnacl");
var nThen = require("nthen"); var nThen = require("nthen");
@ -58,8 +59,8 @@ var write = function (env, task, cb) {
var dir = id.slice(0, 2); var dir = id.slice(0, 2);
var dirpath = Path.join(env.root, dir); var dirpath = Path.join(env.root, dir);
Fs.mkdir(dirpath, 0x1ff, w(function (err) { Fse.mkdirp(dirpath, 0x1ff, w(function (err) {
if (err && err.code !== 'EEXIST') { if (err) {
return void cb(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) { Tasks.create = function (config, cb) {
var env = { var env = {
root: config.taskPath || './tasks', root: config.taskPath || './tasks',
}; };
// make sure the path exists... // make sure the path exists...
Fs.mkdir(env.root, 0x1ff, function (err) { Fse.mkdirp(env.root, 0x1ff, function (err) {
if (err && err.code !== 'EEXIST') { if (err && err.code !== 'EEXIST') {
throw err; throw err;
} }
@ -91,4 +96,3 @@ Tasks.create = function (config, cb) {
}); });
}; };