diskLayout() added USB drives (mac OS)

CHANGELOG.md

@@ -72,6 +72,7 @@ For major (breaking) changes - **version 4, 3 and 2** - see end of page.
 
 | Version        | Date           | Comment  |
 | -------------- | -------------- | -------- |
+| 5.2.3          | 2020-02-11     | `diskLayout()` added USB drives (mac OS) |
 | 5.2.2          | 2020-02-11     | code cleanup, updated docs |
 | 5.2.1          | 2020-02-10     | `system()` fixed issue virtual detect (linux) |
 | 5.2.0          | 2020-02-10     | `wifiInterfces()` and `wifiConnections()` added |

docs/history.html

@@ -56,6 +56,11 @@
                   </tr>
                 </thead>
                 <tbody>
+                  <tr>
+                    <th scope="row">5.2.3</th>
+                    <td>2020-02-11</td>
+                    <td><span class="code">diskLayout()</span> added USB drives (mac OS)</td>
+                  </tr>
                   <tr>
                     <th scope="row">5.2.2</th>
                     <td>2020-02-11</td>

docs/index.html

@@ -170,7 +170,7 @@
       <img class="logo" src="assets/logo.png">
       <div class="title">systeminformation</div>
       <div class="subtitle"><span id="typed"></span>&nbsp;</div>
-      <div class="version">New Version: <span id="version">5.2.2</span></div>
+      <div class="version">New Version: <span id="version">5.2.3</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">
@@ -201,7 +201,7 @@
     </div>
     <div class="row number-section">
       <div class="col-xl-4 col-lg-4 col-md-4 col-12">
-        <div class="numbers">13,682</div>
+        <div class="numbers">13,752</div>
         <div class="title">Lines of code</div>
       </div>
       <div class="col-xl-4 col-lg-4 col-md-4 col-12">

lib/filesystem.js

@@ -929,6 +929,7 @@ function diskLayout(callback) {
               else if (dataType === 'NVMe') { linesNVMe.push(line); }
               else if (dataType === 'USB') { linesUSB.push(line); }
             });
+            try {
               // Serial ATA Drives
               let devices = linesSATA.join('\n').split(' Physical Interconnect: ');
               devices.shift();
@@ -972,8 +973,13 @@ function diskLayout(callback) {
                   }
                 }
               });
+            } catch (e) {
+              util.noop();
+            }
+
             // NVME Drives
-            devices = linesNVMe.join('\n').split('\n\n          Capacity:');
+            try {
+              let devices = linesNVMe.join('\n').split('\n\n          Capacity:');
               devices.shift();
               devices.forEach(function (device) {
                 device = '!Capacity: ' + device;
@@ -1015,8 +1021,12 @@ function diskLayout(callback) {
                   }
                 }
               });
+            } catch (e) {
+              util.noop();
+            }
             // USB Drives
-            devices = linesUSB.join('\n').replaceAll('Media:\n ', 'Model:').split('\n\n          Product ID:');
+            try {
+              let devices = linesUSB.join('\n').replaceAll('Media:\n ', 'Model:').split('\n\n          Product ID:');
               devices.shift();
               devices.forEach(function (device) {
                 let lines = device.split('\n');
@@ -1056,6 +1066,8 @@ function diskLayout(callback) {
                   }
                 }
               });
+            } catch (e) {
+              util.noop();
             }
             if (cmd) {
               cmd = cmd + 'printf "\n"';
@@ -1097,6 +1109,7 @@ function diskLayout(callback) {
               }
               resolve(result);
             }
+          }
         });
       }
       if (_windows) {