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

graphics() controller subid fix (win)

Browse Source
This commit is contained in:
Sebastian Hildebrandt 2021-01-25 08:21:20 +01:00
parent 19dc7a5292
commit 98f491a7c7
4 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -30,6 +30,7 @@ For major (breaking) changes - version 3 and 2 see end of page.
| Version | Date | Comment | | Version | Date | Comment |
| -------------- | -------------- | -------- | | -------------- | -------------- | -------- |
| 4.34.8 | 2020-01-25 | `graphics()` controller subid fix (win) |
| 4.34.7 | 2020-01-13 | `services()` improved service discovery (linux) | | 4.34.7 | 2020-01-13 | `services()` improved service discovery (linux) |
| 4.34.6 | 2020-01-12 | `networkInterfaces()` catch errors | | 4.34.6 | 2020-01-12 | `networkInterfaces()` catch errors |
| 4.34.5 | 2020-01-07 | `networkInterfaceDefault()` fixed CMD popup (windows) | | 4.34.5 | 2020-01-07 | `networkInterfaceDefault()` fixed CMD popup (windows) |

5
docs/history.html
View File

@ -83,6 +83,11 @@
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
<tr>
<th scope="row">4.34.8</th>
<td>2020-01-25</td>
<td><span class="code">graphics()</span> controller subid fix (win)</td>
</tr>
<tr> <tr>
<th scope="row">4.34.7</th> <th scope="row">4.34.7</th>
<td>2020-01-13</td> <td>2020-01-13</td>

4
docs/index.html
View File

@ -169,7 +169,7 @@
<img class="logo" src="assets/logo.png"> <img class="logo" src="assets/logo.png">
<div class="title">systeminformation</div> <div class="title">systeminformation</div>
<div class="subtitle"><span id="typed"></span></div> <div class="subtitle"><span id="typed"></span></div>
<div class="version">Current Version: <span id="version">4.34.7</span></div> <div class="version">Current Version: <span id="version">4.34.8</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> <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>
<div class="down"> <div class="down">
@ -208,7 +208,7 @@
<div class="title">Downloads last month</div> <div class="title">Downloads last month</div>
</div> </div>
<div class="col-xl-4 col-lg-4 col-md-4 col-12"> <div class="col-xl-4 col-lg-4 col-md-4 col-12">
<div class="numbers">367</div> <div class="numbers">375</div>
<div class="title">Dependents</div> <div class="title">Dependents</div>
</div> </div>
</div> </div>

14
lib/graphics.js
View File

@ -720,8 +720,8 @@ function graphics(callback) {
result.controllers = parseLinesLinuxControllers(lines); result.controllers = parseLinesLinuxControllers(lines);
const nvidiaData = nvidiaDevices(); const nvidiaData = nvidiaDevices();
// needs to be rewritten ... using no spread operators // needs to be rewritten ... using no spread operators
result.controllers = result.controllers.map(( controller ) => { // match by busAddress result.controllers = result.controllers.map((controller) => { // match by busAddress
return mergeControllerNvidia(controller, nvidiaData.find(({ pciBus }) => pciBus.endsWith(controller.busAddress)) || {} ); return mergeControllerNvidia(controller, nvidiaData.find(({ pciBus }) => pciBus.endsWith(controller.busAddress)) || {});
}) })
} }
let cmd = "clinfo --raw"; let cmd = "clinfo --raw";
@ -887,9 +887,13 @@ function graphics(callback) {
if (sections[i].trim() !== '') { if (sections[i].trim() !== '') {
let lines = sections[i].trim().split('\r\n'); let lines = sections[i].trim().split('\r\n');
let subDeviceId = util.getValue(lines, 'PNPDeviceID', '=').match(/SUBSYS_[a-fA-F\d]{8}/)[0]; let pnpDeviceId = util.getValue(lines, 'PNPDeviceID', '=').match(/SUBSYS_[a-fA-F\d]{8}/);
if (subDeviceId) { let subDeviceId = null;
subDeviceId = subDeviceId.split('_')[1]; if (pnpDeviceId) {
subDeviceId = pnpDeviceId[0];
if (subDeviceId) {
subDeviceId = subDeviceId.split('_')[1];
}
} }
controllers.push({ controllers.push({
vendor: util.getValue(lines, 'AdapterCompatibility', '='), vendor: util.getValue(lines, 'AdapterCompatibility', '='),