From 4179f8b7f9f50df8d6b1bc714b69b4a283ee70c3 Mon Sep 17 00:00:00 2001
From: NBonaparte <98007b33@opayq.com>
Date: Sun, 20 Nov 2016 14:09:08 -0800
Subject: [PATCH 1/3] feat: added max and min values to tokens

---
 include/drawtypes/label.hpp | 15 +++++++++++++--
 include/utils/string.hpp    |  2 ++
 src/drawtypes/label.cpp     | 38 ++++++++++++++++++++++++++++++++++---
 src/utils/string.cpp        | 14 ++++++++++++++
 4 files changed, 64 insertions(+), 5 deletions(-)

diff --git a/include/drawtypes/label.hpp b/include/drawtypes/label.hpp
index bf9a9049..c941b647 100644
--- a/include/drawtypes/label.hpp
+++ b/include/drawtypes/label.hpp
@@ -11,6 +11,12 @@ POLYBAR_NS
  */
 
 namespace drawtypes {
+
+  struct bounds {
+    size_t min;
+    size_t max;
+  };
+
   class label;
   using label_t = shared_ptr<label>;
 
@@ -35,7 +41,8 @@ namespace drawtypes {
     explicit label(string text, int font) : m_font(font), m_text(text), m_tokenized(m_text) {}
     explicit label(string text, string foreground = "", string background = "",
         string underline = "", string overline = "", int font = 0, int padding = 0, int margin = 0,
-        size_t maxlen = 0, bool ellipsis = true)
+        size_t maxlen = 0, bool ellipsis = true,
+        const vector<struct bounds>& bound = vector<struct bounds>())
         : m_foreground(foreground)
         , m_background(background)
         , m_underline(underline)
@@ -46,7 +53,8 @@ namespace drawtypes {
         , m_maxlen(maxlen)
         , m_ellipsis(ellipsis)
         , m_text(text)
-        , m_tokenized(m_text) {}
+        , m_tokenized(m_text)
+        , m_token_bounds(bound) {}
 
     string get() const;
     operator bool();
@@ -59,6 +67,9 @@ namespace drawtypes {
 
    private:
     string m_text, m_tokenized;
+    const vector<struct bounds> m_token_bounds;
+    vector<struct bounds>::const_iterator m_token_iterator;
+
   };
 
   label_t load_label(
diff --git a/include/utils/string.hpp b/include/utils/string.hpp
index ba2b737f..39954a5c 100644
--- a/include/utils/string.hpp
+++ b/include/utils/string.hpp
@@ -18,6 +18,8 @@ namespace string_util {
   bool compare(const string& s1, const string& s2);
   string replace(const string& haystack, string needle, string repl, size_t start = 0, size_t end = string::npos);
   string replace_all(const string& haystack, string needle, string repl, size_t start = 0, size_t end = string::npos);
+  string replace_all_bounded(const string& haystack, string needle, string replacement,
+    size_t min, size_t max, size_t start = 0, size_t end = string::npos);
   string squeeze(const string& haystack, char needle);
   string strip(const string& haystack, char needle);
   string strip_trailing_newline(const string& haystack);
diff --git a/src/drawtypes/label.cpp b/src/drawtypes/label.cpp
index 880c2098..2cd30b1c 100644
--- a/src/drawtypes/label.cpp
+++ b/src/drawtypes/label.cpp
@@ -13,11 +13,12 @@ namespace drawtypes {
 
   label_t label::clone() {
     return label_t{new label(m_text, m_foreground, m_background, m_underline, m_overline, m_font,
-        m_padding, m_margin, m_maxlen, m_ellipsis)};
+        m_padding, m_margin, m_maxlen, m_ellipsis, m_token_bounds)};
   }
 
   void label::reset_tokens() {
     m_tokenized = m_text;
+    m_token_iterator = m_token_bounds.begin();
   }
 
   bool label::has_token(string token) {
@@ -25,7 +26,13 @@ namespace drawtypes {
   }
 
   void label::replace_token(string token, string replacement) {
-    m_tokenized = string_util::replace_all(m_tokenized, token, replacement);
+    if (m_text.find(token) == string::npos)
+      return;
+
+    m_tokenized = string_util::replace_all_bounded(m_tokenized, token, replacement,
+      m_token_iterator->min, m_token_iterator->max);
+
+    m_token_iterator++;
   }
 
   void label::replace_defined_values(const label_t& label) {
@@ -64,6 +71,8 @@ namespace drawtypes {
    * Create a label by loading values from the configuration
    */
   label_t load_label(const config& conf, string section, string name, bool required, string def) {
+    vector<struct bounds> bound;
+
     name = string_util::ltrim(string_util::rtrim(name, '>'), '<');
 
     string text;
@@ -73,6 +82,28 @@ namespace drawtypes {
     else
       text = conf.get<string>(section, name, def);
 
+    vector<string> text_split = string_util::split(text, '%');
+
+    // get rid of false positives (lemonbar-style declarations)
+    for (size_t i = 0; i < text_split.size(); i++) {
+      if (!text_split[i].empty() && text_split[i].at(0) == '{')
+        text_split.erase(text_split.begin() + i--);
+    }
+
+    for (size_t i = 1; i < text_split.size(); i += 2) {
+      struct bounds bound_vals = {0, 0};
+      size_t delim_min = text_split[i].find(':'), delim_max = text_split[i].find(':', delim_min + 1);
+      if (delim_min != string::npos) {
+        if (delim_max != string::npos) {
+          bound_vals.min = stoul(text_split[i].substr(delim_min + 1, delim_max - delim_min - 1));
+          bound_vals.max = stoul(text_split[i].substr(delim_max + 1));
+        }
+        else
+          bound_vals.min = stoul(text_split[i].substr(delim_min + 1));
+      }
+      bound.push_back(bound_vals);
+      text = string_util::replace_all(text, text_split[i], text_split[i].substr(0, delim_min));
+    }
     // clang-format off
     return label_t{new label_t::element_type(text,
         conf.get<string>(section, name + "-foreground", ""),
@@ -83,7 +114,8 @@ namespace drawtypes {
         conf.get<int>(section, name + "-padding", 0),
         conf.get<int>(section, name + "-margin", 0),
         conf.get<size_t>(section, name + "-maxlen", 0),
-        conf.get<bool>(section, name + "-ellipsis", true))};
+        conf.get<bool>(section, name + "-ellipsis", true),
+        bound)};
     // clang-format on
   }
 
diff --git a/src/utils/string.cpp b/src/utils/string.cpp
index dbf949cc..46a98153 100644
--- a/src/utils/string.cpp
+++ b/src/utils/string.cpp
@@ -78,6 +78,20 @@ namespace string_util {
     return replaced;
   }
 
+  /**
+   * Replace all occurrences with bounded replacement
+   */
+  string replace_all_bounded(const string& haystack, string needle, string replacement,
+    size_t min, size_t max, size_t start, size_t end) {
+    if (max != 0 && replacement.length() > max) {
+      replacement = replacement.erase(max);
+    }
+    else if (min != 0 && replacement.length() < min) {
+      replacement.insert(0, min - replacement.length(), ' ');
+    }
+    return replace_all(haystack, needle, replacement, start, end);
+  }
+
   /**
    * Replace all consecutive occurrences of needle in haystack
    */

From d66c16674c8366210f2d4c377d0fd5fc4ae73e1b Mon Sep 17 00:00:00 2001
From: NBonaparte <98007b33@opayq.com>
Date: Sun, 20 Nov 2016 21:33:50 -0800
Subject: [PATCH 2/3] feat(tokens): added patch by @jaagr

---
 src/drawtypes/label.cpp | 54 +++++++++++++++++++++++++++--------------
 1 file changed, 36 insertions(+), 18 deletions(-)

diff --git a/src/drawtypes/label.cpp b/src/drawtypes/label.cpp
index 2cd30b1c..28799113 100644
--- a/src/drawtypes/label.cpp
+++ b/src/drawtypes/label.cpp
@@ -72,37 +72,55 @@ namespace drawtypes {
    */
   label_t load_label(const config& conf, string section, string name, bool required, string def) {
     vector<struct bounds> bound;
+    size_t start, end, pos;
 
     name = string_util::ltrim(string_util::rtrim(name, '>'), '<');
 
     string text;
+    string line{text};
 
     if (required)
       text = conf.get<string>(section, name);
     else
       text = conf.get<string>(section, name, def);
 
-    vector<string> text_split = string_util::split(text, '%');
+    while ((start = line.find('%')) != string::npos && (end = line.find('%', start + 1)) != string::npos) {
+      auto token = line.substr(start, end);
 
-    // get rid of false positives (lemonbar-style declarations)
-    for (size_t i = 0; i < text_split.size(); i++) {
-      if (!text_split[i].empty() && text_split[i].at(0) == '{')
-        text_split.erase(text_split.begin() + i--);
-    }
+      line.erase(0, end);
 
-    for (size_t i = 1; i < text_split.size(); i += 2) {
-      struct bounds bound_vals = {0, 0};
-      size_t delim_min = text_split[i].find(':'), delim_max = text_split[i].find(':', delim_min + 1);
-      if (delim_min != string::npos) {
-        if (delim_max != string::npos) {
-          bound_vals.min = stoul(text_split[i].substr(delim_min + 1, delim_max - delim_min - 1));
-          bound_vals.max = stoul(text_split[i].substr(delim_max + 1));
-        }
-        else
-          bound_vals.min = stoul(text_split[i].substr(delim_min + 1));
+      // ignore false positives (lemonbar-style declarations)
+      if (token[1] == '{')
+        continue;
+
+      bound.emplace_back(bounds{0, 0});
+
+      // find min delimiter
+      if ((pos = token.find(':')) == string::npos)
+        continue;
+
+      // strip min/max specifiers from the label string token
+      text = string_util::replace(text, token, token.substr(0, pos));
+
+      try {
+        bound.back().min = std::stoul(&token[pos + 1], nullptr, 10);
+      } catch (const std::invalid_argument& err) {
+        continue;
       }
-      bound.push_back(bound_vals);
-      text = string_util::replace_all(text, text_split[i], text_split[i].substr(0, delim_min));
+
+      // find max delimiter
+      if ((pos = token.find(':', pos + 1)) == string::npos)
+        continue;
+
+      try {
+        bound.back().max = std::stoul(&token[pos + 1], nullptr, 10);
+      } catch (const std::invalid_argument& err) {
+        continue;
+      }
+
+      // ignore max lengths less than min
+      if (bound.back().max < bound.back().min)
+        bound.back().max = 0;
     }
     // clang-format off
     return label_t{new label_t::element_type(text,

From c658d229256f8e9d2da7b4b241bee4c9cd6b3914 Mon Sep 17 00:00:00 2001
From: NBonaparte <98007b33@opayq.com>
Date: Sun, 20 Nov 2016 22:44:35 -0800
Subject: [PATCH 3/3] fix(token): more patches

---
 src/drawtypes/label.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/drawtypes/label.cpp b/src/drawtypes/label.cpp
index 28799113..14722951 100644
--- a/src/drawtypes/label.cpp
+++ b/src/drawtypes/label.cpp
@@ -26,7 +26,7 @@ namespace drawtypes {
   }
 
   void label::replace_token(string token, string replacement) {
-    if (m_text.find(token) == string::npos)
+    if (m_text.find(token) == string::npos || m_token_iterator == m_token_bounds.end())
       return;
 
     m_tokenized = string_util::replace_all_bounded(m_tokenized, token, replacement,
@@ -77,13 +77,14 @@ namespace drawtypes {
     name = string_util::ltrim(string_util::rtrim(name, '>'), '<');
 
     string text;
-    string line{text};
 
     if (required)
       text = conf.get<string>(section, name);
     else
       text = conf.get<string>(section, name, def);
 
+    string line{text};
+
     while ((start = line.find('%')) != string::npos && (end = line.find('%', start + 1)) != string::npos) {
       auto token = line.substr(start, end);