Merge 578acff2c9 into ac62ba9de1

Signed-off-by: Airren <qiang.ren@intel.com>

README.md

@@ -324,25 +324,39 @@ If you have an AMD GPU `rocm_smi_lib` is required, which may or may not be packa
 
 **Binary release (from native os repo)**
 
-* **openSUSE**
+<details><summary>openSUSE</summary><p>
+
   * **Tumbleweed:**
     ```bash
     sudo zypper in btop
     ```
   * For all other versions, see [openSUSE Software: btop](https://software.opensuse.org/package/btop)
-* **Fedora**
+</p></details>
+<details><summary>Fedora</summary><p>
+
     ```bash
     sudo dnf install btop
 	```
-* **RHEL/AlmaLinux 8+**
+</p></details>
+<details><summary>RHEL/AlmaLinux 8+</summary><p>
+
     ```bash
     sudo dnf install epel-release
 	sudo dnf install btop
 	```
-* **FreeBSD**
+</p></details>
+<details><summary>FreeBSD</summary><p>
+
 	```sh
 	pkg install btop
 	```
+</p></details>
+<details><summary>Ubuntu</summary><p>
+
+   ```sh
+     sudo apt install btop
+   ```
+</p></details>
 
 
 **Binary release on Homebrew (macOS (x86_64 & ARM64) / Linux (x86_64))**

src/btop_theme.cpp

@@ -381,11 +381,16 @@ namespace Theme {
 			if (themefile.good()) {
 				Logger::debug("Loading theme file: " + filename);
 				while (not themefile.bad()) {
+					if (themefile.peek() == '#') {
+						themefile.ignore(SSmax, '\n');
+						continue;
+					}
 					themefile.ignore(SSmax, '[');
 					if (themefile.eof()) break;
 					string name, value;
 					getline(themefile, name, ']');
 					if (not Default_theme.contains(name)) {
+						themefile.ignore(SSmax, '\n');
 						continue;
 					}
 					themefile.ignore(SSmax, '=');
@@ -394,6 +399,7 @@ namespace Theme {
 					if (themefile.peek() == '"') {
 						themefile.ignore(1);
 						getline(themefile, value, '"');
+						themefile.ignore(SSmax, '\n');
 					}
 					else getline(themefile, value, '\n');
 

src/linux/btop_collect.cpp

@@ -448,7 +448,7 @@ namespace Cpu {
 						const int file_id = atoi(file.path().filename().c_str() + 4); // skip "temp" prefix
 						string file_path = file.path();
 
-						if (!s_contains(file_path, file_suffix)) {
+						if (!s_contains(file_path, file_suffix) or s_contains(file_path, "nvme")) {
 							continue;
 						}