From 2f61b26f475ea725073f886651765cbcac2a6f1c Mon Sep 17 00:00:00 2001
From: Sebastian Hildebrandt <hildebrandt@plus-innovations.com>
Date: Mon, 3 Jun 2019 21:52:09 +0200
Subject: [PATCH] graphics() added vendor, refresh rate, current resolution

---
 CHANGELOG.md           |  3 ++-
 README.md              |  1 +
 docs/contributors.html |  1 +
 docs/history.html      |  7 ++++++-
 docs/index.html        |  6 ++----
 lib/docker.js          |  6 ------
 lib/graphics.js        | 18 +++++++++++++-----
 7 files changed, 25 insertions(+), 17 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c67e364..35dac55 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -30,7 +30,8 @@ For major (breaking) changes - version 3 and 2 see end of page.
 
 | Version        | Date           | Comment  |
 | -------------- | -------------- | -------- |
-| 4.8.4          | 2019-06-03     | `vboxInfo()` afixed call parameters |
+| 4.9.0          | 2019-06-03     | `graphics()` added vendor, refresh rate, current res |
+| 4.8.4          | 2019-06-03     | `vboxInfo()` fixed call parameters |
 | 4.8.3          | 2019-06-01     | `vboxInfo()` added stoppedSince, started, stopped |
 | 4.8.2          | 2019-05-31     | `dockerInfo()` changed property naming style |
 | 4.8.1          | 2019-05-31     | updated docs |
diff --git a/README.md b/README.md
index 22956b1..19869b7 100644
--- a/README.md
+++ b/README.md
@@ -758,6 +758,7 @@ Written by Sebastian Hildebrandt [sebhildebrandt](https://github.com/sebhildebra
 - weiyin [weiyin](https://github.com/weiyin)
 - Jorai Rijsdijk [Erackron](https://github.com/Erackron)
 - Rasmus Porsager [porsager](https://github.com/porsager)
+- Nathan Patten [nrpatten](https://github.com/nrpatten)
 
 OSX Temperature: credits here are going to:
 
diff --git a/docs/contributors.html b/docs/contributors.html
index b2f717e..797edd0 100644
--- a/docs/contributors.html
+++ b/docs/contributors.html
@@ -57,6 +57,7 @@
                 <li>weiyin <a href="https://github.com/weiyin" rel="nofollow">weiyin</a></li>
                 <li>Jorai Rijsdijk <a href="https://github.com/Erackron" rel="nofollow">Erackron</a></li>
                 <li>Rasmus Porsager <a href="https://github.com/porsager" rel="nofollow">porsager</a></li>
+                <li>Nathan Patten <a href="https://github.com/nrpatten" rel="nofollow">nrpatten</a></li>
               </ul>
               <p>OSX Temperature: credits here are going to:</p>
               <ul>
diff --git a/docs/history.html b/docs/history.html
index cea7c79..76e9119 100644
--- a/docs/history.html
+++ b/docs/history.html
@@ -81,7 +81,12 @@
                 </thead>
                 <tbody>
                   <tr>
-                    <th scope="row">4.8.3</th>
+                    <th scope="row">4.9.0</th>
+                    <td>2019-06-03</td>
+                    <td><span class="code">graphics()</span> added vendor, refresh rate, current resolution</td>
+                  </tr>
+                  <tr>
+                    <th scope="row">4.8.4</th>
                     <td>2019-06-03</td>
                     <td><span class="code">vboxInfo()</span> fixed call parameters</td>
                   </tr>
diff --git a/docs/index.html b/docs/index.html
index 9c279c0..71976d9 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -34,7 +34,6 @@
     function init() {
       typed();
       document.querySelector('.down').addEventListener('click', function () {
-        console.log('CLICKED')
         scrollIt(
           document.querySelector('.quickstart'),
           600,
@@ -79,7 +78,6 @@
         backDelay: 1200,
 
       }
-      console.log('asd')
       var typed = new Typed('#typed', options);
     }
     function scrollIt(destination, duration = 200, easing = 'linear', callback) {
@@ -170,7 +168,7 @@
       <img class="logo" src="assets/logo.png">
       <div class="title">systeminformation</div>
       <div class="subtitle"><span id="typed"></span></div>
-      <div class="version">Current Version: <span id="version">4.8.4</span></div>
+      <div class="version">Current Version: <span id="version">4.9.0</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">
@@ -193,7 +191,7 @@
     </div>
     <div class="row number-section">
       <div class="col-xl-4 col-lg-4 col-md-4 col-12">
-        <div class="numbers">8,665</div>
+        <div class="numbers">8,733</div>
         <div class="title">Lines of code</div>
       </div>
       <div class="col-xl-4 col-lg-4 col-md-4 col-12">
diff --git a/lib/docker.js b/lib/docker.js
index 9073e33..676fe7c 100644
--- a/lib/docker.js
+++ b/lib/docker.js
@@ -193,12 +193,6 @@ function dockerContainerInspect(containerID, payload) {
 
         _docker_socket.getInspect(containerID.trim(), data => {
           try {
-            // console.log('========================================================')
-            // console.log(payload)
-            // console.log('---------------------------------------------')
-            // console.log(data)
-            // console.log('========================================================')
-
             resolve({
               id: payload.Id,
               name: payload.Name,
diff --git a/lib/graphics.js b/lib/graphics.js
index bb00f27..13bbc64 100644
--- a/lib/graphics.js
+++ b/lib/graphics.js
@@ -308,9 +308,11 @@ function graphics(callback) {
         model_raw = model_raw.substr(0, model_raw.indexOf('0a'));
       }
       try {
-        result.model = model_raw.match(/.{1,2}/g).map(function (v) {
-          return String.fromCharCode(parseInt(v, 16));
-        }).join('');
+        if (model_raw.length > 2) {
+          result.model = model_raw.match(/.{1,2}/g).map(function (v) {
+            return String.fromCharCode(parseInt(v, 16));
+          }).join('');
+        }
       } catch (e) {
         util.noop();
       }
@@ -393,8 +395,8 @@ function graphics(callback) {
           const parts1 = lines[i].split('(');
           if (parts1 && parts1.length > 1 && parts1[0].indexOf('x') >= 0) {
             const resParts = parts1[0].trim().split('x');
-            currentDisplay.currentResolutionx = util.toInt(resParts[0]);
-            currentDisplay.currentResolutiony = util.toInt(resParts[1]);
+            currentDisplay.currentResX = util.toInt(resParts[0]);
+            currentDisplay.currentResY = util.toInt(resParts[1]);
           }
           is_current = true;
         }
@@ -526,9 +528,15 @@ function graphics(callback) {
                   if (result.controllers.length === 1 && result.displays.length === 1) {
                     if (_resolutionx) {
                       result.displays[0].currentResX = _resolutionx;
+                      if (!result.displays[0].resolutionx) {
+                        result.displays[0].resolutionx = _resolutionx;
+                      }
                     }
                     if (_resolutiony) {
                       result.displays[0].currentResY = _resolutiony;
+                      if (result.displays[0].resolutiony === 0) {
+                        result.displays[0].resolutiony = _resolutiony;
+                      }
                     }
                     if (_pixeldepth) {
                       result.displays[0].pixeldepth = _pixeldepth;