From 9e5779ae3d1a8af84063d36dc70b18b0eb0f9ff6 Mon Sep 17 00:00:00 2001
From: Sebastian Hildebrandt <hildebrandt@plus-innovations.com>
Date: Mon, 25 Aug 2025 18:15:34 +0200
Subject: [PATCH] disklayout() fix catch error macOS

---
 CHANGELOG.md      |  1 +
 docs/history.html |  5 +++++
 docs/index.html   |  2 +-
 lib/cpu.js        |  3 +++
 lib/filesystem.js | 18 ++++--------------
 5 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 108879f..6434010 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -90,6 +90,7 @@ For major (breaking) changes - **version 4, 3 and 2** - see end of page.
 
 | Version | Date       | Comment                                                                                             |
 | ------- | ---------- | --------------------------------------------------------------------------------------------------- |
+| 5.27.8  | 2025-08-25 | `disklayout()` fixed catch error (macOS)                                                            |
 | 5.27.7  | 2025-06-28 | `time()` fixed Intl issue                                                                           |
 | 5.27.6  | 2025-06-20 | `system()` added model (freebsd)                                                                    |
 | 5.27.5  | 2025-06-19 | `system()` added serial, uuid, virtual (freebsd)                                                    |
diff --git a/docs/history.html b/docs/history.html
index 9d60c7c..01a2422 100644
--- a/docs/history.html
+++ b/docs/history.html
@@ -57,6 +57,11 @@
                     </tr>
                   </thead>
                   <tbody>
+                    <tr>
+                      <th scope="row">5.27.8</th>
+                      <td>2025-08-25</td>
+                      <td><span class="code">disklayout()</span> fixed catch error (macOS)</td>
+                    </tr>
                     <tr>
                       <th scope="row">5.27.7</th>
                       <td>2025-06-28</td>
diff --git a/docs/index.html b/docs/index.html
index 46e79d2..a2f9599 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -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>
-      3<div class="version">New Version: <span id="version">5.27.7</span></div>
+      3<div class="version">New Version: <span id="version">5.27.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>
     </div>
     <div class="down">
diff --git a/lib/cpu.js b/lib/cpu.js
index dfd6e50..ef8d7b7 100644
--- a/lib/cpu.js
+++ b/lib/cpu.js
@@ -755,6 +755,9 @@ function getCpu() {
             modelline = util.cleanString(modelline);
             const modellineParts = modelline.split('@');
             result.brand = modellineParts[0].trim();
+            if (result.brand.indexOf('Unknown') >= 0) {
+              result.brand = result.brand.split('Unknown')[0].trim();
+            }
             result.speed = modellineParts[1] ? parseFloat(modellineParts[1].trim()) : 0;
             if (result.speed === 0 && (result.brand.indexOf('AMD') > -1 || result.brand.toLowerCase().indexOf('ryzen') > -1)) {
               result.speed = getAMDSpeed(result.brand);
diff --git a/lib/filesystem.js b/lib/filesystem.js
index 54c2a8b..cbc90c9 100644
--- a/lib/filesystem.js
+++ b/lib/filesystem.js
@@ -1416,23 +1416,13 @@ function diskLayout(callback) {
                     }
                   }
                 });
-                for (let i = 0; i < result.length; i++) {
-                  delete result[i].BSDName;
-                }
-                if (callback) {
-                  callback(result);
-                }
-                resolve(result);
+                commitResult(result);
               });
             } else {
-              for (let i = 0; i < result.length; i++) {
-                delete result[i].BSDName;
-              }
-              if (callback) {
-                callback(result);
-              }
-              resolve(result);
+              commitResult(result);
             }
+          } else {
+            commitResult(result);
           }
         });
       }