fix(useradmin): drive segment fixes
parent
742b7d1a3c
commit
9e72edef19
|
@ -1,11 +1,11 @@
|
||||||
/* eslint-disable */
|
/* eslint-disable */
|
||||||
// TODO: delete useradmin...
|
// TODO: delete useradmin...
|
||||||
import express from 'express';
|
|
||||||
import bodyParser from 'body-parser';
|
import bodyParser from 'body-parser';
|
||||||
import crypto from 'crypto';
|
|
||||||
import htmlspecialchars from 'htmlspecialchars';
|
|
||||||
import dirTree from 'directory-tree';
|
|
||||||
import cookieParser from 'cookie-parser';
|
import cookieParser from 'cookie-parser';
|
||||||
|
import crypto from 'crypto';
|
||||||
|
import dirTree from 'directory-tree';
|
||||||
|
import express from 'express';
|
||||||
|
import htmlspecialchars from 'htmlspecialchars';
|
||||||
import log4js from 'log4js';
|
import log4js from 'log4js';
|
||||||
|
|
||||||
import authenticationController from '../controllers/authentication';
|
import authenticationController from '../controllers/authentication';
|
||||||
|
@ -154,8 +154,8 @@ router.post('/register/token', bodyParser.urlencoded({ extended: true }), runAsy
|
||||||
logger.debug('created account:', result);
|
logger.debug('created account:', result);
|
||||||
|
|
||||||
if (result.dataValues) {
|
if (result.dataValues) {
|
||||||
const account = result.dataValues;
|
const newAccount = result.dataValues;
|
||||||
logger.info(`USERADMIN REGISTRATION - created new account #${account.id} with email ${email}`);
|
logger.info(`USERADMIN REGISTRATION - created new account #${newAccount.id} with email ${email}`);
|
||||||
return res.redirect(`/useradmin?status=${encodeURIComponent('Successfully registered')}`);
|
return res.redirect(`/useradmin?status=${encodeURIComponent('Successfully registered')}`);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -588,19 +588,13 @@ router.get('/drive/:dongleId/:driveIdentifier', requireAuthenticated, runAsyncWr
|
||||||
if (file.name === 'qcamera.ts') qcamera = `${driveUrl}${segment}<a target="_blank" href="/">${file.name}</a>`;
|
if (file.name === 'qcamera.ts') qcamera = `${driveUrl}${segment}<a target="_blank" href="/">${file.name}</a>`;
|
||||||
if (file.name === 'qlog.bz2') qlog = `${driveUrl}${segment}<a target="_blank" href="/">${file.name}</a>`;
|
if (file.name === 'qlog.bz2') qlog = `${driveUrl}${segment}<a target="_blank" href="/">${file.name}</a>`;
|
||||||
if (file.name === 'rlog.bz2') rlog = `${driveUrl}${segment}<a target="_blank" href="/">${file.name}</a>`;
|
if (file.name === 'rlog.bz2') rlog = `${driveUrl}${segment}<a target="_blank" href="/">${file.name}</a>`;
|
||||||
})
|
});
|
||||||
|
|
||||||
let isProcessed = '?';
|
let isProcessed = '?';
|
||||||
let isStalled = '?';
|
let isStalled = '?';
|
||||||
|
|
||||||
const driveSegment = await DriveSegments.findOne({
|
const segmentId = parseInt(segment, 10);
|
||||||
where: {
|
const driveSegment = await deviceController.getDriveSegment(driveIdentifier, segmentId);
|
||||||
segment_id: parseInt(segment, 10),
|
|
||||||
drive_identifier: drive.identifier,
|
|
||||||
dongle_id: device.dongle_id
|
|
||||||
},
|
|
||||||
});
|
|
||||||
|
|
||||||
if (driveSegment) {
|
if (driveSegment) {
|
||||||
isProcessed = driveSegment.is_processed;
|
isProcessed = driveSegment.is_processed;
|
||||||
isStalled = driveSegment.is_stalled;
|
isStalled = driveSegment.is_stalled;
|
||||||
|
@ -609,20 +603,8 @@ router.get('/drive/:dongleId/:driveIdentifier', requireAuthenticated, runAsyncWr
|
||||||
directorySegments[`seg-${segment}`] = `<tr><td>${segment}</td><td>${qcamera}</td><td>${qlog}</td><td>${fcamera}</td><td>${rlog}</td><td>${dcamera}</td><td>${isProcessed}</td><td>${isStalled}</td></tr>`;
|
directorySegments[`seg-${segment}`] = `<tr><td>${segment}</td><td>${qcamera}</td><td>${qlog}</td><td>${fcamera}</td><td>${rlog}</td><td>${dcamera}</td><td>${isProcessed}</td><td>${isStalled}</td></tr>`;
|
||||||
}));
|
}));
|
||||||
|
|
||||||
let qcamera = '--';
|
|
||||||
let fcamera = '--';
|
|
||||||
let dcamera = '--';
|
|
||||||
let qlog = '--';
|
|
||||||
let rlog = '--';
|
|
||||||
let isProcessed = '?';
|
|
||||||
let isStalled = '?';
|
|
||||||
|
|
||||||
for (let i = 0; i <= drive.max_segment; i++) {
|
for (let i = 0; i <= drive.max_segment; i++) {
|
||||||
if (!directorySegments[`seg-${i}`]) {
|
response += directorySegments[`seg-${i}`] || `<tr><td>${i}</td><td>--</td><td>--</td><td>--</td><td>--</td><td>--</td><td>?</td><td>?</td></tr>`;
|
||||||
response += `<tr><td>${i}</td><td>${qcamera}</td><td>${qlog}</td><td>${fcamera}</td><td>${rlog}</td><td>${dcamera}</td><td>${isProcessed}</td><td>${isStalled}</td></tr>`;
|
|
||||||
} else {
|
|
||||||
response += directorySegments[`seg-${i}`];
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
response += `</table>
|
response += `</table>
|
||||||
|
@ -631,7 +613,7 @@ router.get('/drive/:dongleId/:driveIdentifier', requireAuthenticated, runAsyncWr
|
||||||
<a href="/useradmin/signout">Sign Out</a></body></html>`;
|
<a href="/useradmin/signout">Sign Out</a></body></html>`;
|
||||||
|
|
||||||
return res.status(200).send(response);
|
return res.status(200).send(response);
|
||||||
}))
|
}));
|
||||||
|
|
||||||
// TODO: move to user admin api?
|
// TODO: move to user admin api?
|
||||||
router.get('/drive/:dongleId/:driveIdentifier/:action', requireAuthenticated, runAsyncWrapper(async (req, res) => {
|
router.get('/drive/:dongleId/:driveIdentifier/:action', requireAuthenticated, runAsyncWrapper(async (req, res) => {
|
||||||
|
|
Loading…
Reference in New Issue