From: E.Smith <31170571+azlm8t@users.noreply.github.com>
Date: Fri, 10 Nov 2017 21:30:20 +0000 (+0000)
Subject: channel: Allow fuzzy name matching for bouquets. (#4714).
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e953ea740516a43a09d2b21874f7e82a6a5d74fd;p=thirdparty%2Ftvheadend.git

channel: Allow fuzzy name matching for bouquets. (#4714).

Issue: #4714.
---

diff --git a/src/bouquet.c b/src/bouquet.c
index e45dc7b6e..b4ed69e6b 100644
--- a/src/bouquet.c
+++ b/src/bouquet.c
@@ -291,6 +291,7 @@ bouquet_map_channel(bouquet_t *bq, service_t *t)
     .check_availability = 0,
     .encrypted          = 1,
     .merge_same_name    = 0,
+    .merge_same_name_fuzzy = 0,
     .type_tags          = 0,
     .provider_tags      = 0,
     .network_tags       = 0
@@ -313,6 +314,7 @@ bouquet_map_channel(bouquet_t *bq, service_t *t)
   if (!ilm) {
     sm_conf.encrypted = bq->bq_mapencrypted;
     sm_conf.merge_same_name = bq->bq_mapmergename;
+    sm_conf.merge_same_name_fuzzy = bq->bq_mapmergefuzzy;
     sm_conf.type_tags = bq->bq_chtag_type_tags;
     sm_conf.provider_tags = bq->bq_chtag_provider_tags;
     sm_conf.network_tags = bq->bq_chtag_network_tags;
@@ -748,6 +750,11 @@ static idnode_slist_t bouquest_class_mapopt_slist[] = {
     .name = N_("Merge same name"),
     .off  = offsetof(bouquet_t, bq_mapmergename),
   },
+  {
+    .id   = "merge_same_name_fuzzy",
+    .name = N_("Use fuzzy mapping if merging same name"),
+    .off  = offsetof(bouquet_t, bq_mapmergefuzzy),
+  },
   {}
 };
 
diff --git a/src/bouquet.h b/src/bouquet.h
index 1fcd1fa60..d8c0e517a 100644
--- a/src/bouquet.h
+++ b/src/bouquet.h
@@ -40,6 +40,7 @@ typedef struct bouquet {
   int           bq_mapradio;
   int           bq_mapencrypted;
   int           bq_mapmergename;
+  int           bq_mapmergefuzzy;
   int           bq_chtag;
   int           bq_chtag_type_tags;
   int           bq_chtag_provider_tags;