rainbownapkin/fore.st
1
0
Fork 0
Code Issues 13 Pull requests Projects Releases Packages Wiki Activity Actions

Fix migrator (#831)

Browse source
This commit is contained in:
Calvin Montgomery 2019-10-27 13:09:22 -07:00
parent 06b3916a6c
commit b0b22a7579
2 changed files with 9 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/channel-storage/migrator.js
View file

@ -6,6 +6,8 @@ import { DatabaseStore } from './dbstore';
import { sanitizeHTML } from '../xss';
import { ChannelNotFoundError } from '../errors';
const lookupAsync = Promise.promisify(require('../database/channels').lookup);
/* eslint no-console: off */
const EXPECTED_KEYS = [
@ -118,7 +120,11 @@ function migrate(src, dest, opts) {
}
}
return src.load(-1, name).then(data => {
let id;
return lookupAsync(name).then(chan => {
id = chan.id;
return src.load(id, name);
}).then(data => {
data = fixOldChandump(data);
Object.keys(data).forEach(key => {
if (opts.keyWhitelist.length > 0 &&
@ -129,7 +135,7 @@ function migrate(src, dest, opts) {
delete data[key];
}
});
return dest.save(name, data);
return dest.save(id, name, data);
}).then(() => {
console.log(`Migrated /${chanPath}/${name}`);
}).catch(ChannelNotFoundError, _err => {