Merge 488926b172 into ac62ba9de1

man/btop.1

@@ -0,0 +1,59 @@
+.TH BTOP 1 "December 2021" "1.1.3"
+.SH NAME
+BTOP \- Resource monitor that shows usage and stats for processor, memory, disks, network and processes.
+.SH SYNOPSIS
+.B btop [-h] [-v] [-/+t] [-p <id>] [--utf-force] [--debug]
+
+.SH DESCRIPTION
+btop is a modern and colorful command line resource monitor that shows usage and stats for processor,
+memory, disks, network and processes.
+
+btop beatures:
+ - Easy to use, with a game inspired menu system.
+ - Full mouse support, all buttons with a highlighted key is clickable and mouse scroll works in process list and menu boxes.
+ - Fast and responsive UI with UP, DOWN keys process selection.
+ - Function for showing detailed stats for selected process.
+ - Ability to filter processes.
+ - Easy switching between sorting options.
+ - Tree view of processes.
+ - Send any signal to selected process.
+ - UI menu for changing all config file options.
+ - Auto scaling graph for network usage.
+ - Shows IO activity and speeds for disks
+ - Battery meter
+ - Selectable symbols for the graphs
+ - Custom presets
+ - And more...
+.SH "COMMAND-LINE OPTIONS"
+
+optional arguments:
+.TP
+\fB\-h, \-\-help
+show this help message and exit
+.TP
+\fB\-v, \-\-version
+show version info and exit
+.TP
+\fB\-lc, \-\-low-color
+disable truecolor, converts 24-bit colors to 256-color
+.TP
+\fB\-t, \-\-tty_on
+force (ON) tty mode, max 16 colors and tty friendly graph symbols
+.TP
+  +t, \-\-tty_off
+force (OFF) tty mode
+.TP
+\fB\-p, \-\-preset <id>
+start with preset, integer value between 0-9
+.TP
+\fB\-\-utf-force
+force start even if no UTF-8 locale was detected
+.TP
+\fB\-\-debug
+start in DEBUG mode: shows microsecond timer for information collect
+and screen draw functions and sets loglevel to DEBUG
+
+.SH SEE ALSO
+.BR https://github.com/aristocratos/btop
+.SH AUTHOR
+btop was written by Aristocratos.

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;
 						}