diff --git a/controllers/devices.js b/controllers/devices.js
index bd59cfd..8e5c931 100644
--- a/controllers/devices.js
+++ b/controllers/devices.js
@@ -193,7 +193,8 @@ async function getDrives(dongleId, includeDeleted, includeMeta) {
}
async function getDrive(dongleId, identifier) {
- const drive = orm.models.drives.findOne({ where: { identifier, dongle_id: dongleId } });
+ const drive = await orm.models.drives.findOne({ where: { identifier, dongle_id: dongleId } });
+ console.log(drive);
if (drive.dataValues) return drive.dataValues;
return null;
diff --git a/routes/useradmin.js b/routes/useradmin.js
index d085593..24ffb85 100644
--- a/routes/useradmin.js
+++ b/routes/useradmin.js
@@ -573,65 +573,64 @@ router.get('/useradmin/drive/:dongleId/:driveIdentifier', runAsyncWrapper(async
segment | qcamera | qlog | fcamera | rlog | dcamera | processed | stalled |
`;
- const directoryTree = dirTree(`${config.storagePath + device.dongle_id}/${dongleIdHash}/${driveIdentifierHash}/${drive.identifier}`);
-
+ const directoryTree = dirTree(config.storagePath + device.dongle_id + "/" + dongleIdHash + "/" + driveIdentifierHash + "/" + drive.identifier);
const directorySegments = {};
- await Promise.all(directoryTree.children
+ for (var i in directoryTree.children) {
// skip any non-directory entries (for example m3u8 file in the drive directory)
- .filter((file) => file.type === 'directory')
- .map(async (directory) => {
- const segment = directory.name;
+ if (directoryTree.children[i].type != 'directory') continue;
- // generate file links
- const files = {
- qcamera: '--',
- fcamera: '--',
- dcamera: '--',
- qlog: '--',
- rlog: '--',
- };
- directory.children
- .filter((file) => file.name in files)
- .forEach((file) => {
- files[file.name] = `${file.name}`;
- });
+ var segment = directoryTree.children[i].name;
- // get processed/stalled status
- let isProcessed = '?';
- let isStalled = '?';
- const driveSegment = await deviceController.getDriveSegment(device.dongle_id, drive.identifier, parseInt(segment, 10));
- if (driveSegment) {
- isProcessed = driveSegment.is_processed;
- isStalled = driveSegment.is_stalled;
- }
-
- directorySegments[`seg-${segment}`] = `
- ${segment} |
- ${files.qcamera} |
- ${files.qlog} |
- ${files.fcamera} |
- ${files.rlog} |
- ${files.dcamera} |
- ${isProcessed} |
- ${isStalled} |
-
`;
- }));
-
- for (let i = 0; i <= drive.max_segment; i++) {
- if (directorySegments[`seg-${i}`]) {
- response += directorySegments[`seg-${i}`];
- } else {
- response += `${i} | -- | -- | -- | -- | -- | ? | ? |
`;
+ var qcamera = '--';
+ var fcamera = '--';
+ var dcamera = '--';
+ var qlog = '--';
+ var rlog = '--';
+ for (var c in directoryTree.children[i].children) {
+ if (directoryTree.children[i].children[c].name == 'fcamera.hevc') fcamera = '' + directoryTree.children[i].children[c].name + '';
+ if (directoryTree.children[i].children[c].name == 'dcamera.hevc') fcamera = '' + directoryTree.children[i].children[c].name + '';
+ if (directoryTree.children[i].children[c].name == 'qcamera.ts') qcamera = '' + directoryTree.children[i].children[c].name + '';
+ if (directoryTree.children[i].children[c].name == 'qlog.bz2') qlog = '' + directoryTree.children[i].children[c].name + '';
+ if (directoryTree.children[i].children[c].name == 'rlog.bz2') rlog = '' + directoryTree.children[i].children[c].name + '';
}
- }
- response += `
-
-
- Sign Out