Profile toml multiple line desc

Author: bdbai

ytflow-app-util/include/ytflow_core.h

@@ -86,6 +86,10 @@ struct ytflow_result ytflow_profile_update(uint32_t profile_id,
 
 struct ytflow_result ytflow_profile_delete(uint32_t profile_id, const ytflow_connection *conn);
 
+struct ytflow_result ytflow_profile_export_toml(uint32_t profile_id, const ytflow_connection *conn);
+
+struct ytflow_result ytflow_profile_parse_toml(const uint8_t *toml, uintptr_t toml_len);
+
 struct ytflow_result ytflow_plugin_create(uint32_t profile_id,
                                           const char *name,
                                           const char *desc,

ytflow-app-util/src/profile/export.rs

@@ -133,7 +133,13 @@ pub fn export_profile_toml(
             .desc
             .trim()
             .lines()
-            .map(|l| format!("\n# {}", l.trim()))
+            .map(|l| {
+                if l.is_empty() {
+                    "\n#".into()
+                } else {
+                    format!("\n# {}", l.trim())
+                }
+            })
             .collect::<Vec<_>>()
             .join("");
         decor.push_str("\n");
@@ -217,7 +223,7 @@ mod tests {
         Plugin::create(
             profile_id,
             "custom-rule-dispatcher".into(),
-            "Dispatch connections \n based on custom rules".into(),
+            "Dispatch connections \n\n based on custom rules".into(),
             "rule-dispatcher".into(),
             0,
             to_cbor(cbor!({
@@ -312,6 +318,7 @@ param.rules = [{ is_udp = true, src = { ip_ranges = ["0.0.0.0/0"], port_ranges =
 updated_at = 2024-04-27T09:43:17.191
 
 # Dispatch connections
+#
 # based on custom rules
 [plugins.custom-rule-dispatcher]
 plugin = "rule-dispatcher"

ytflow-app-util/src/profile/import.rs

@@ -167,14 +167,11 @@ pub fn parse_profile_toml(toml: &[u8]) -> ParseTomlProfileResult<ParsedTomlProfi
                 .prefix()
                 .and_then(|p| Some(unsafe { toml.get_unchecked(p.span()?) }))
                 .unwrap_or_default()
-                .trim()
                 .lines()
-                .map(|l| {
-                    l.trim_start_matches(|c: char| c.is_whitespace() || c == '#')
-                        .trim_end()
-                })
+                .filter_map(|l| l.trim_start().strip_prefix('#'))
+                .map(|l| l.trim())
                 .collect::<Vec<_>>()
-                .join(" ");
+                .join("\n");
             let plugin = plugin_table
                 .get("plugin")
                 .ok_or_else(|| {
@@ -271,6 +268,8 @@ param.rules = [{ is_udp = true, src = { ip_ranges = ["0.0.0.0/0"], port_ranges =
 updated_at = 2024-04-27T09:43:17.191
 
 # Dispatch connections
+#
+
 # based on custom rules
 [plugins.custom-rule-dispatcher]
 plugin = "rule-dispatcher"
@@ -412,6 +411,10 @@ updated_at = 2024-04-27T09:43:17.191
             .iter()
             .find(|p| p.plugin.name == "custom-rule-dispatcher")
             .unwrap();
+        assert_eq!(
+            custom_rule_dispatcher.plugin.desc,
+            "Dispatch connections\n\nbased on custom rules"
+        );
         assert_eq!(custom_rule_dispatcher.plugin.plugin, "rule-dispatcher");
         assert_eq!(custom_rule_dispatcher.plugin.plugin_version, 0);
         assert_eq!(