fix admintools rollback

This commit is contained in:
HF 2021-06-03 16:16:12 +02:00
parent 241ed14117
commit 22e6bf3139
3 changed files with 4 additions and 2 deletions

1
.gitignore vendored
View File

@ -28,6 +28,7 @@ pids
*.pid *.pid
*.seed *.seed
*.pid.lock *.pid.lock
*.kate-swp
# Directory for instrumented libs generated by jscoverage/JSCover # Directory for instrumented libs generated by jscoverage/JSCover
lib-cov lib-cov

View File

@ -299,7 +299,7 @@ export async function executeRollback(
error = 'Corner coordinates are alligned wrong'; error = 'Corner coordinates are alligned wrong';
} else if (!date) { } else if (!date) {
error = 'No date given'; error = 'No date given';
} else if (Number.isNaN(Number(date))) { } else if (Number.isNaN(Number(date)) || date.length !== 8) {
error = 'Invalid date'; error = 'Invalid date';
} else if (!canvas) { } else if (!canvas) {
error = 'Invalid canvas selected'; error = 'Invalid canvas selected';

View File

@ -32,7 +32,8 @@ export default async function rollbackToDate(
return 0; return 0;
} }
const dir = path.resolve(__dirname, BACKUP_DIR); const dir = path.resolve(__dirname, BACKUP_DIR);
const backupDir = `${dir}/${date}/${canvasId}/tiles`; // eslint-disable-next-line max-len
const backupDir = `${dir}/${date.slice(0, 4)}/${date.slice(4, 6)}/${date.slice(6)}/${canvasId}/tiles`;
if (!fs.existsSync(backupDir)) { if (!fs.existsSync(backupDir)) {
return 0; return 0;
} }