Fix issue in str_splits

frang75 · Apr 4, 2024 · 845c4c0 · 845c4c0
1 parent 579766a
commit 845c4c0
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 21 deletions.
diff --git a/Changelog.md b/Changelog.md
@@ -8,7 +8,9 @@
 
 ### Improved
 
-* `gui_text_t` properties in private API.
+* `gui_text_t` properties in private API. [Commit](https://github.com/frang75/nappgui_src/commit/579766ab451eb445ce5013a93892261997137706).
+
+* `str_splits()` adds a new `add_empty` parameters. [Issue](https://github.com/frang75/nappgui_src/issues/124). [Doc](https://nappgui.com/en/core/string.html#f52)
 
 ## v1.4.1 - Apr 3, 2024 (r4993)
 

diff --git a/prj/build.txt b/prj/build.txt
@@ -1 +1 @@
-5004
+5007
diff --git a/src/core/strings.c b/src/core/strings.c
@@ -967,7 +967,7 @@ bool_t str_split_trim(const char_t *str, const char_t *substr, String **left, St
 
 /*---------------------------------------------------------------------------*/
 
-ArrPt(String) *str_splits(const char_t *str, const char_t *substr, const bool_t trim)
+ArrPt(String) *str_splits(const char_t *str, const char_t *substr, const bool_t trim, const bool_t add_empty)
 {
     ArrPt(String) *strs = arrpt_create(String);
     cassert_no_null(str);
@@ -985,42 +985,43 @@ ArrPt(String) *str_splits(const char_t *str, const char_t *substr, const bool_t
             else
                 sstr = str_cn(str, n);
 
-            if (str_empty(sstr) == TRUE)
-                str_destroy(&sstr);
-            else
+            if (str_empty(sstr) == FALSE || add_empty == TRUE)
                 arrpt_append(strs, sstr, String);
+            else
+                str_destroy(&sstr);
 
             fstr += sn;
             str = fstr;
             fstr = blib_strstr(str, substr);
         }
 
         /* Compute the last string */
-        if (trim == TRUE)
         {
-            String *sstr = str_trim(str);
-            if (str_empty(sstr) == TRUE)
-                str_destroy(&sstr);
+            String *sstr = NULL;
+            if (trim == TRUE)
+                sstr = str_trim(str);
             else
+                sstr = str_c(str);
+
+            if (str_empty(sstr) == FALSE || add_empty == TRUE)
                 arrpt_append(strs, sstr, String);
-        }
-        else
-        {
-            if (str_empty_c(str) == FALSE)
-            {
-                String *sstr = str_c(str);
-                arrpt_append(strs, sstr, String);
-            }
+            else
+                str_destroy(&sstr);
         }
     }
     else
     {
         String *sstr = NULL;
+
         if (trim == TRUE)
             sstr = str_trim(str);
         else
             sstr = str_c(str);
-        arrpt_append(strs, sstr, String);
+
+        if (str_empty(sstr) == FALSE || add_empty == TRUE)
+            arrpt_append(strs, sstr, String);
+        else
+            str_destroy(&sstr);
     }
 
     return strs;

diff --git a/src/core/strings.h b/src/core/strings.h
@@ -116,7 +116,7 @@ _core_api bool_t str_split(const char_t *str, const char_t *substr, String **lef
 
 _core_api bool_t str_split_trim(const char_t *str, const char_t *substr, String **left, String **right);
 
-_core_api ArrPt(String) *str_splits(const char_t *str, const char_t *substr, const bool_t trim);
+_core_api ArrPt(String) *str_splits(const char_t *str, const char_t *substr, const bool_t trim, const bool_t add_empty);
 
 _core_api void str_split_pathname(const char_t *pathname, String **path, String **file);
 

diff --git a/src/gui/tableview.c b/src/gui/tableview.c
@@ -1774,7 +1774,7 @@ void tableview_header_title(TableView *view, const uint32_t column_id, const cha
     column = arrst_get(data->columns, column_id, Column);
     ltext = _gui_respack_text(text, &column->head_textid);
     arrpt_destroy(&column->head_text, str_destroy, String);
-    column->head_text = str_splits(ltext, "\n", TRUE);
+    column->head_text = str_splits(ltext, "\n", TRUE, FALSE);
     i_head_height(data);
     view_update((View *)view);
 }