Merge pull request #630 from phunkyfish/icon-encoding-url-arguments

Support url arguments when encoding file portion of icon URL

Author: phunkyfish

pvr.iptvsimple/addon.xml.in

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <addon
   id="pvr.iptvsimple"
-  version="20.5.0"
+  version="20.5.1"
   name="IPTV Simple Client"
   provider-name="nightik and Ross Nicholson">
   <requires>@ADDON_DEPENDS@

pvr.iptvsimple/changelog.txt

@@ -1,3 +1,6 @@
+v20.5.1
+- Support url arguments when encoding file portion of icon URL
+
 v20.5.0
 - URL encode last part of tvg logo URL as they can be based on channel names and they can contain spaces and non standard characters not allowed in paths
 

src/iptvsimple/data/Channel.cpp

@@ -144,11 +144,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;
       }
     }
   }