From: E.Smith <31170571+azlm8t@users.noreply.github.com>
Date: Wed, 15 Nov 2017 22:07:09 +0000 (+0000)
Subject: Strip trailing UHD when making fuzzy match name (#4709)
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=17343a17b8f5f765f5c4cc3f05e451d4e53dc382;p=thirdparty%2Ftvheadend.git

Strip trailing UHD when making fuzzy match name (#4709)

Issue: #4709.
---

diff --git a/src/channels.c b/src/channels.c
index 5195246fd..f998a20d1 100644
--- a/src/channels.c
+++ b/src/channels.c
@@ -585,7 +585,7 @@ channel_find_by_name(const char *name)
   return channel_find_by_name_and_bouquet(name, NULL);
 }
 
-/// Copy name without space and HD suffix, lowercase in to a new
+/// Copy name without space and (U)HD suffix, lowercase in to a new
 /// buffer
 static char *
 channel_make_fuzzy_name(const char *name)
@@ -600,6 +600,9 @@ channel_make_fuzzy_name(const char *name)
     /* Strip trailing 'HD'. */
     if (*ch == 'H' && *(ch+1) == 'D' && *(ch+2) == 0)
       break;
+    /* Strip trailing 'UHD'. */
+    if (*ch == 'U' && *(ch+1) == 'H' && *(ch+2) == 'D' && *(ch+3) == 0)
+      break;
 
     if (!isspace(*ch)) {
       *ch_fuzzy++ = tolower(*ch);