mike/systeminformation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

system() adapted model and version (macOS)

Browse Source
This commit is contained in:
Sebastian Hildebrandt 2024-12-30 14:51:00 +01:00
parent 5b17d8416c
commit 9a95fd00c8
4 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -90,6 +90,7 @@ For major (breaking) changes - **version 4, 3 and 2** - see end of page.
| Version | Date | Comment |
| ------- | ---------- | --------------------------------------------------------------------------------------------------- |
| 5.23.25 | 2024-12-30 | `system()` adapted model and version (macOS) |
| 5.23.24 | 2024-12-29 | `osInfo()` improved logofile detection |
| 5.23.23 | 2024-12-25 | `bluetoothDevices()` added parsing vendor ID (macOS) |
| 5.23.22 | 2024-12-25 | `osInfo()` fix manufacturer Apple Silicon (macOS) |

5
docs/history.html
View File

@ -57,6 +57,11 @@
</tr>
</thead>
<tbody>
<tr>
<th scope="row">5.23.25</th>
<td>2024-12-30</td>
<td><span class="code">system()</span> adapted model and version (macOS)</td>
</tr>
<tr>
<th scope="row">5.23.24</th>
<td>2024-12-29</td>

2
docs/index.html
View File

@ -170,7 +170,7 @@
<img class="logo" src="assets/logo.png" alt="logo">
<div class="title">systeminformation</div>
<div class="subtitle"><span id="typed"></span>&nbsp;</div>
<div class="version">New Version: <span id="version">5.23.24</span></div>
<div class="version">New Version: <span id="version">5.23.25</span></div>
<button class="btn btn-light" onclick="location.href='https://github.com/sebhildebrandt/systeminformation'">View on Github <i class=" fab fa-github"></i></button>
</div>
<div class="down">

11
lib/system.js
View File

@ -215,11 +215,14 @@ function system(callback) {
exec('ioreg -c IOPlatformExpertDevice -d 2', function (error, stdout) {
if (!error) {
let lines = stdout.toString().replace(/[<>"]/g, '').split('\n');
const model = util.splitByNumber(util.getValue(lines, 'model', '=', true));
const version = util.getValue(lines, 'version', '=', true);
const model = util.getAppleModel(util.getValue(lines, 'model', '=', true));
// const modelParts = util.splitByNumber(model);
// const version = util.getValue(lines, 'version', '=', true);
result.manufacturer = util.getValue(lines, 'manufacturer', '=', true);
result.model = version ? util.getValue(lines, 'model', '=', true) : model[0];
result.version = version || model[1];
result.model = model.key;
result.type = macOsChassisType(model.model);
result.version = model.version;
result.serial = util.getValue(lines, 'ioplatformserialnumber', '=', true);
result.uuid = util.getValue(lines, 'ioplatformuuid', '=', true).toLowerCase();
result.sku = util.getValue(lines, 'board-id', '=', true) || util.getValue(lines, 'target-sub-type', '=', true);