fixes #165 - improved config file parsing, trimming spaces

d99kris · Jul 13, 2024 · 3315333 · 3315333
1 parent f8e6a2b
commit 3315333
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 10 deletions.
diff --git a/README.md b/README.md
@@ -710,7 +710,7 @@ configure nmail.
 This configuration file controls the UI aspects of nmail. Default configuration
 file (platform-dependent defaults are left empty below):
 
-    attachment_indicator= 📎
+    attachment_indicator=📎
     bottom_reply=0
     cancel_without_confirm=0
     colors_enabled=1
@@ -816,8 +816,7 @@ file (platform-dependent defaults are left empty below):
 ### attachment_indicator
 
 Controls which character to indicate that an email has attachments
-(default: ` 📎`). For a more compact and plain layout one can use an ascii
-character and omit the leading space character, example: `+`.
+(default: `📎`). For a more plain layout one can use an ascii character: `+`.
 
 ### bottom_reply
 

diff --git a/src/config.cpp b/src/config.cpp
@@ -1,6 +1,6 @@
 // config.cpp
 //
-// Copyright (c) 2019-2021 Kristofer Berggren
+// Copyright (c) 2019-2024 Kristofer Berggren
 // All rights reserved.
 //
 // nmail is distributed under the MIT license, see LICENSE for details.
@@ -15,6 +15,7 @@
 #include <sys/stat.h>
 
 #include "loghelp.h"
+#include "util.h"
 
 Config::Config()
 {
@@ -57,7 +58,7 @@ void Config::Load(const std::string& p_Path)
     std::string value;
     std::getline(linestream, value);
 
-    m_Map[param] = value;
+    m_Map[Util::Trim(param)] = Util::Trim(value);
   }
 }
 

diff --git a/src/nmail.1 b/src/nmail.1
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man.
-.TH NMAIL "1" "July 2024" "nmail 5.1.4" "User Commands"
+.TH NMAIL "1" "July 2024" "nmail 5.1.5" "User Commands"
 .SH NAME
 nmail \- ncurses mail
 .SH SYNOPSIS

diff --git a/src/ui.cpp b/src/ui.cpp
@@ -144,7 +144,7 @@ void Ui::Init()
     { "key_search_show_folder", "\\" },
     { "key_spell", "KEY_CTRLS" },
     { "colors_enabled", "1" },
-    { "attachment_indicator", " \xF0\x9F\x93\x8E" },
+    { "attachment_indicator", "\xF0\x9F\x93\x8E" },
     { "bottom_reply", "0" },
     { "compose_backup_interval", "10" },
     { "persist_sortfilter", "1" },
@@ -1233,7 +1233,7 @@ void Ui::DrawMessageList()
 
       shortDate = Util::TrimPadString(shortDate, 10);
       shortFrom = Util::ToString(Util::TrimPadWString(Util::ToWString(shortFrom), 20));
-      std::string headerLeft = selectFlag + unreadFlag + attachFlag + "  " + shortDate + "  " + shortFrom + "  ";
+      std::string headerLeft = selectFlag + unreadFlag + " " + attachFlag + "  " + shortDate + "  " + shortFrom + "  ";
       int subjectWidth = m_ScreenWidth - Util::WStringWidth(Util::ToWString(headerLeft)) - 1;
       subject = Util::ToString(Util::TrimPadWString(Util::ToWString(subject), subjectWidth));
       std::string header = headerLeft + subject + " ";
@@ -1468,7 +1468,7 @@ void Ui::DrawMessageListSearch()
 
       shortDate = Util::TrimPadString(shortDate, 10);
       shortFrom = Util::ToString(Util::TrimPadWString(Util::ToWString(shortFrom), 20));
-      std::string headerLeft = selectFlag + unreadFlag + attachFlag + "  " + shortDate + "  " + shortFrom + "  ";
+      std::string headerLeft = selectFlag + unreadFlag + " " + attachFlag + "  " + shortDate + "  " + shortFrom + "  ";
 
       std::string folderTag = m_SearchShowFolder ? ("  [" + Util::BaseName(folder) + "]") : "";
       int subjectWidth = m_ScreenWidth - Util::WStringWidth(Util::ToWString(headerLeft + folderTag)) - 1;

diff --git a/src/version.cpp b/src/version.cpp
@@ -7,7 +7,7 @@
 
 #include "version.h"
 
-#define NMAIL_VERSION "5.1.4"
+#define NMAIL_VERSION "5.1.5"
 
 std::string Version::GetBuildOs()
 {