Merge pull request #631 from phunkyfish/icon-encoding-url-arguments-m…

…atrix Support url arguments when encoding file portion of icon URL - Matrix
kodi-pvr · Aug 10, 2022 · 83727fb · 83727fb
2 parents 6447c58 + 644bcec
commit 83727fb
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 2 deletions.
diff --git a/pvr.iptvsimple/addon.xml.in b/pvr.iptvsimple/addon.xml.in
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <addon
   id="pvr.iptvsimple"
-  version="19.2.0"
+  version="19.2.1"
   name="PVR IPTV Simple Client"
   provider-name="nightik and Ross Nicholson">
   <requires>@ADDON_DEPENDS@
@@ -21,6 +21,9 @@
       <icon>icon.png</icon>
     </assets>
     <news>
+v19.2.1
+- Support url arguments when encoding file portion of icon URL
+
 v19.2.0
 - URL encode last part of tvg logo URL as they can be based on channel names
 

diff --git a/pvr.iptvsimple/changelog.txt b/pvr.iptvsimple/changelog.txt
@@ -1,3 +1,6 @@
+v19.2.1
+- Support url arguments when encoding file portion of icon URL
+
 v19.2.0
 - URL encode last part of tvg logo URL as they can be based on channel names
 

diff --git a/src/iptvsimple/data/Channel.cpp b/src/iptvsimple/data/Channel.cpp
@@ -141,11 +141,20 @@ void Channel::SetIconPathFromTvgLogo(const std::string& tvgLogo, std::string& ch
     {
       const std::string urlPath = m_iconPath.substr(0, pos + 1);
       std::string urlFile = m_iconPath.substr(pos + 1);
+
+      std::string urlArguments;
+      size_t argumentsPos = urlFile.find("?");
+      if (argumentsPos != std::string::npos && argumentsPos > 0)
+      {
+        urlArguments = urlFile.substr(argumentsPos);
+        urlFile = urlFile.substr(0, argumentsPos - 1);
+      }
+
       if (!utilities::WebUtils::IsEncoded(urlFile))
       {
         urlFile = utilities::WebUtils::UrlEncode(urlFile);
 
-        m_iconPath = urlPath + urlFile;
+        m_iconPath = urlPath + urlFile + urlArguments;
       }
     }
   }