From 1a821ff021c4ba6f2b176dc1dc8c8c85246e4e7d Mon Sep 17 00:00:00 2001
From: euzu <euzu@github.com>
Date: Fri, 24 Feb 2023 20:38:21 +0100
Subject: [PATCH] ISSUE-13 added extra checks for tag building with empty
 content.

---
 src/mapping.rs | 19 ++++++++++++-------
 src/model.rs   |  2 +-
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/src/mapping.rs b/src/mapping.rs
index 381d434cc..cd8653314 100644
--- a/src/mapping.rs
+++ b/src/mapping.rs
@@ -2,7 +2,7 @@ use std::collections::HashMap;
 use regex::Regex;
 use crate::filter::{Filter, get_filter, PatternTemplate, prepare_templates, RegexWithCaptures, ValueProcessor};
 use crate::m3u::{FieldAccessor, PlaylistItem};
-use crate::model::{ItemField, MAPPER_ATTRIBUTE_FIELDS, MAPPER_PRE_SUFFIX_FIELDS};
+use crate::model::{ItemField, MAPPER_ATTRIBUTE_FIELDS, MAPPER_PREFIX_SUFFIX_FIELDS};
 
 fn default_as_false() -> bool { false }
 fn default_as_empty_str() -> String { String::from("") }
@@ -133,10 +133,15 @@ impl MappingValueProcessor<'_> {
                             }
                         }
                     }
-                    // Now we have all our captured values, lets create the tag
-                    new_value = new_value.replace(
-                        format!("<tag:{}>",mapping_tag.name).as_str(),
-                        format!("{}{}{}", &mapping_tag.prefix, captured_tag_values.join(&mapping_tag.concat) , &mapping_tag.suffix).as_str());
+                    if captured_tag_values.len() > 0 {
+                        let captured_text = captured_tag_values.join(&mapping_tag.concat);
+                        if captured_text.trim().len() > 0 {
+                            // Now we have all our captured values, lets create the tag
+                            new_value = new_value.replace(
+                                format!("<tag:{}>", mapping_tag.name).as_str(),
+                                format!("{}{}{}", &mapping_tag.prefix, captured_text, &mapping_tag.suffix).as_str());
+                        }
+                    }
                 }
             }
         }
@@ -145,7 +150,7 @@ impl MappingValueProcessor<'_> {
 
     fn apply_suffix(&mut self, captures: &HashMap<&String, &str>, verbose: bool) {
         for (key, value) in &self.mapper.suffix {
-            if valid_property!(key.as_str(), MAPPER_PRE_SUFFIX_FIELDS) {
+            if valid_property!(key.as_str(), MAPPER_PREFIX_SUFFIX_FIELDS) {
                 match self.apply_tags(value, captures, verbose) {
                     Some(suffix) => {
                         match self.get_property(key) {
@@ -164,7 +169,7 @@ impl MappingValueProcessor<'_> {
 
     fn apply_prefix(&mut self, captures: &HashMap<&String, &str>, verbose: bool) {
         for (key, value) in &self.mapper.prefix {
-            if valid_property!(key.as_str(), MAPPER_PRE_SUFFIX_FIELDS) {
+            if valid_property!(key.as_str(), MAPPER_PREFIX_SUFFIX_FIELDS) {
                 match self.apply_tags(value, captures, verbose) {
                     Some(prefix) => {
                         match self.get_property(key) {
diff --git a/src/model.rs b/src/model.rs
index 1038cd4a7..ac117494d 100644
--- a/src/model.rs
+++ b/src/model.rs
@@ -1,7 +1,7 @@
 use enum_iterator::Sequence;
 
 pub const MAPPER_ATTRIBUTE_FIELDS: &[&str] = &["name", "title", "group", "id", "chno"];
-pub const MAPPER_PRE_SUFFIX_FIELDS: &[&str] = &["name", "title", "group"];
+pub const MAPPER_PREFIX_SUFFIX_FIELDS: &[&str] = &["name", "title", "group"];
 
 #[derive(Debug, Clone, serde::Serialize, serde::Deserialize, Sequence)]
 pub enum TargetType {