dnrops
/
cryptpad
mirror of https://github.com/xwiki-labs/cryptpad
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

drop unnecessary code, restore instead of remove archived files in restoration script, change restore archived name

This commit is contained in:
ansuz 2019-06-13 12:03:46 +02:00
parent cb0c4ee944
commit 7e455e6fce
2 changed files with 3 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
scripts/restored-archived.js → scripts/restore-archived.js
View File

@ -1,28 +1,16 @@
var nThen = require("nthen"); var nThen = require("nthen");
var Store = require("../storage/file"); var Store = require("../storage/file");
var Pinned = require("./pinned");
var config = require("../lib/load-config"); var config = require("../lib/load-config");
var store; var store;
var pins;
var Log; var Log;
nThen(function (w) { nThen(function (w) {
// load the store which will be used for iterating over channels // load the store which will be used for iterating over channels
// and performing operations like archival and deletion // and performing operations like archival and deletion
Store.create(config, w(function (_) { Store.create(config, w(function (_) {
store = _; store = _;
})); // load the list of pinned files so you know which files }));
// should not be archived or deleted
Pinned.load(w(function (err, _) {
if (err) {
w.abort();
return void console.error(err);
}
pins = _;
}), {
pinPath: config.pinPath,
});
// load the logging module so that you have a record of which // load the logging module so that you have a record of which
// files were archived or deleted at what time // files were archived or deleted at what time
@ -42,7 +30,7 @@ nThen(function (w) {
// but if it's been stored for the configured time... // but if it's been stored for the configured time...
// expire it // expire it
store.removeArchivedChannel(item.channel, w(function (err) { store.restoreArchivedChannel(item.channel, w(function (err) {
if (err) { if (err) {
Log.error('RESTORE_ARCHIVED_CHANNEL_RESTORATION_ERROR', { Log.error('RESTORE_ARCHIVED_CHANNEL_RESTORATION_ERROR', {
error: err, error: err,

2
storage/file.js
View File

@ -603,7 +603,7 @@ module.exports.create = function (
if (!isValidChannelId(channelName)) { return void cb(new Error('EINVAL')); } if (!isValidChannelId(channelName)) { return void cb(new Error('EINVAL')); }
archiveChannel(env, channelName, cb); archiveChannel(env, channelName, cb);
}, },
unarchiveChannel: function (channelName, cb) { restoreArchivedChannel: function (channelName, cb) {
if (!isValidChannelId(channelName)) { return void cb(new Error('EINVAL')); } if (!isValidChannelId(channelName)) { return void cb(new Error('EINVAL')); }
unarchiveChannel(env, channelName, cb); unarchiveChannel(env, channelName, cb);
}, },