show cd-rom as volume

Signed-off-by: si458 <simonsmith5521@gmail.com>
This commit is contained in:
Simon Smith 2024-02-22 17:55:48 +00:00 committed by GitHub
parent 0b2368df9d
commit 82c70659b8
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 1804 additions and 1789 deletions

View File

@ -5727,6 +5727,7 @@ function cleanGetBitLockerVolumeInfo(volumes) {
if (v.identifier == '') { delete v.identifier; } if (v.identifier == '') { delete v.identifier; }
if (v.name == '') { delete v.name; } if (v.name == '') { delete v.name; }
if (v.removable != true) { delete v.removable; } if (v.removable != true) { delete v.removable; }
if (v.cdrom != true) { delete v.cdrom; }
if (v.protectionStatus == 'On') { v.protectionStatus = true; } else { delete v.protectionStatus; } if (v.protectionStatus == 'On') { v.protectionStatus = true; } else { delete v.protectionStatus; }
if (v.volumeStatus == 'FullyDecrypted') { delete v.volumeStatus; } if (v.volumeStatus == 'FullyDecrypted') { delete v.volumeStatus; }
if (v.recoveryPassword == '') { delete v.recoveryPassword; } if (v.recoveryPassword == '') { delete v.recoveryPassword; }

View File

@ -408,7 +408,8 @@ function windows_volumes()
type: tokens[2].split('"')[1], type: tokens[2].split('"')[1],
size: tokens[3].split('"')[1], size: tokens[3].split('"')[1],
sizeremaining: tokens[4].split('"')[1], sizeremaining: tokens[4].split('"')[1],
removable: tokens[5].split('"')[1] == 'Removable' removable: tokens[5].split('"')[1] == 'Removable',
cdrom: tokens[5].split('"')[1] == 'CD-ROM'
}; };
} }
} }

File diff suppressed because it is too large Load Diff

View File

@ -6158,7 +6158,10 @@
var fsize = (j === 0 ? `${m.sizeremaining} ${sizes[j]}` : `${(m.sizeremaining / (1024 ** j)).toFixed(2)} ${sizes[j]}`); var fsize = (j === 0 ? `${m.sizeremaining} ${sizes[j]}` : `${(m.sizeremaining / (1024 ** j)).toFixed(2)} ${sizes[j]}`);
x += addDetailItem("Capacity Remaining", EscapeHtml(fsize), s); x += addDetailItem("Capacity Remaining", EscapeHtml(fsize), s);
} }
if (m.type) { x += addDetailItem("File System", (m.removable == true ? ("Removable" + ' / ') : '') + (m.type == 'Unknown' ? "Unknown" : EscapeHtml(m.type)), s); } if (m.type) {
var type = (m.removable == true ? "Removable" : (m.cdrom == true ? "CD-ROM" : ''));
x += addDetailItem("File System", (type != '' ? (type + ' / ') : '') + (m.type == 'Unknown' ? "Unknown" : EscapeHtml(m.type)), s);
}
if (m.protectionStatus || m.volumeStatus) { if (m.protectionStatus || m.volumeStatus) {
var bitlockerState = []; var bitlockerState = [];

View File

@ -12140,7 +12140,10 @@
var fsize = (j === 0 ? `${m.sizeremaining} ${sizes[j]}` : `${(m.sizeremaining / (1024 ** j)).toFixed(2)} ${sizes[j]}`); var fsize = (j === 0 ? `${m.sizeremaining} ${sizes[j]}` : `${(m.sizeremaining / (1024 ** j)).toFixed(2)} ${sizes[j]}`);
x += addDetailItem("Capacity Remaining", EscapeHtml(fsize), s); x += addDetailItem("Capacity Remaining", EscapeHtml(fsize), s);
} }
if (m.type) { x += addDetailItem("File System", (m.removable == true ? ("Removable" + ' / ') : '') + (m.type == 'Unknown' ? "Unknown" : EscapeHtml(m.type)), s); } if (m.type) {
var type = (m.removable == true ? "Removable" : (m.cdrom == true ? "CD-ROM" : ''));
x += addDetailItem("File System", (type != '' ? (type + ' / ') : '') + (m.type == 'Unknown' ? "Unknown" : EscapeHtml(m.type)), s);
}
if (m.protectionStatus || m.volumeStatus) { if (m.protectionStatus || m.volumeStatus) {
var bitlockerState = []; var bitlockerState = [];