Merge pull request #991 from phunkyfish/fix-episode-part

Fix episode part parsing

Author: phunkyfish

pvr.iptvsimple/addon.xml.in

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

pvr.iptvsimple/changelog.txt

@@ -1,3 +1,6 @@
+v22.6.1
+- Fix episode part parsing
+
 v22.5.1
 - Add support to inputstream.adaptive.common_headers to set headers
 - Fix an issue that was replacing user headers set with inputstream.adaptive.common_headers

src/iptvsimple/data/EpgEntry.cpp

@@ -338,6 +338,9 @@ bool EpgEntry::ParseEpisodeNumberInfo(std::vector<std::pair<std::string, std::st
 
 bool EpgEntry::ParseXmltvNsEpisodeNumberInfo(const std::string& episodeNumberString)
 {
+  // All season and episode numbers start from zero so will need to be incremented.
+  // Apart from the totalNumberOfParts which does not.
+
   size_t found = episodeNumberString.find(".");
   if (found != std::string::npos)
   {
@@ -360,19 +363,11 @@ bool EpgEntry::ParseXmltvNsEpisodeNumberInfo(const std::string& episodeNumberStr
 
     if (!episodePartString.empty())
     {
-      int numElementsParsed = std::sscanf(episodePartString.c_str(), "%d/%d", &m_episodeNumber, &m_episodePartNumber);
+      int totalNumberOfParts = 1;
+      int numElementsParsed = std::sscanf(episodePartString.c_str(), "%d/%d", &m_episodePartNumber, &totalNumberOfParts);
 
-      if (numElementsParsed == 2)
-      {
-        m_episodeNumber++;
-        m_episodePartNumber++;
-      }
-      else if (numElementsParsed == 1)
-      {
-        if (m_episodeNumber == EPG_TAG_INVALID_SERIES_EPISODE)
-          m_episodeNumber++;
-        m_episodePartNumber = EPG_TAG_INVALID_SERIES_EPISODE;
-      }
+      if ((numElementsParsed == 2 && totalNumberOfParts != 1) || numElementsParsed == 1)
+          m_episodePartNumber++;
     }
   }