Merge pull request #545 from phunkyfish/fix-episode-num

Fix episode num

Author: phunkyfish

pvr.iptvsimple/addon.xml.in

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <addon
   id="pvr.iptvsimple"
-  version="7.6.9"
+  version="7.6.10"
   name="PVR IPTV Simple Client"
   provider-name="nightik and Ross Nicholson">
   <requires>@ADDON_DEPENDS@
@@ -21,6 +21,12 @@
       <icon>icon.png</icon>
     </assets>
     <news>
+v7.6.10
+- Fixed: Fix episode number when there is no season
+- Fixed: Return server error if channels or groups could not be loaded due to missing file so they are not cleared in Kodi
+- Translations updates from Weblate
+	- id_id, ko_kr, pl_pl
+
 v7.6.9
 - Translations updates from Weblate
 	- pl_pl
@@ -30,7 +36,7 @@ v7.6.8
 	- zh_cn
 
 v7.6.7
-Translations updates from Weblate
+- Translations updates from Weblate
 	- id_id, lt_lt
 
 v7.6.6

pvr.iptvsimple/changelog.txt

@@ -1,3 +1,9 @@
+v7.6.10
+- Fixed: Fix episode number when there is no season
+- Fixed: Return server error if channels or groups could not be loaded due to missing file so they are not cleared in Kodi
+- Translations updates from Weblate
+	- id_id, ko_kr, pl_pl
+
 v7.6.9
 - Translations updates from Weblate
 	- pl_pl

src/PVRIptvData.cpp

@@ -65,8 +65,13 @@ ADDON_STATUS PVRIptvData::Create()
   Settings::GetInstance().ReadFromAddon(kodi::GetBaseUserPath(), kodi::GetAddonPath());
 
   m_channels.Init();
+  m_channelGroups.Init();
   m_playlistLoader.Init();
-  m_playlistLoader.LoadPlayList();
+  if (!m_playlistLoader.LoadPlayList())
+  {
+    m_channels.ChannelsLoadFailed();
+    m_channelGroups.ChannelGroupsLoadFailed();
+  }
   m_epg.Init(EpgMaxPastDays(), EpgMaxFutureDays());
 
   kodi::Log(ADDON_LOG_INFO, "%s Starting separate client update thread...", __FUNCTION__);

src/iptvsimple/ChannelGroups.cpp

@@ -19,9 +19,16 @@ using namespace iptvsimple::utilities;
 
 ChannelGroups::ChannelGroups(const Channels& channels) : m_channels(channels) {}
 
+bool ChannelGroups::Init()
+{
+  Clear();
+  return true;
+}
+
 void ChannelGroups::Clear()
 {
   m_channelGroups.clear();
+  m_channelGroupsLoadFailed = false;
 }
 
 int ChannelGroups::GetChannelGroupsAmount() const
@@ -31,6 +38,9 @@ int ChannelGroups::GetChannelGroupsAmount() const
 
 PVR_ERROR ChannelGroups::GetChannelGroups(kodi::addon::PVRChannelGroupsResultSet& results, bool radio) const
 {
+  if (m_channelGroupsLoadFailed)
+    return PVR_ERROR_SERVER_ERROR;
+
   Logger::Log(LEVEL_DEBUG, "%s - Starting to get ChannelGroups for PVR", __FUNCTION__);
 
   for (const auto& channelGroup : m_channelGroups)

src/iptvsimple/ChannelGroups.h

@@ -31,11 +31,15 @@ namespace iptvsimple
     iptvsimple::data::ChannelGroup* GetChannelGroup(int uniqueId);
     iptvsimple::data::ChannelGroup* FindChannelGroup(const std::string& name);
     const std::vector<data::ChannelGroup>& GetChannelGroupsList() const { return m_channelGroups; }
+    bool Init();
     void Clear();
     bool CheckChannelGroupAllowed(iptvsimple::data::ChannelGroup& newChannelGroup);
+    void ChannelGroupsLoadFailed() { m_channelGroupsLoadFailed = true; };
 
   private:
     const iptvsimple::Channels& m_channels;
     std::vector<iptvsimple::data::ChannelGroup> m_channelGroups;
+
+    bool m_channelGroupsLoadFailed = false;
   };
 } //namespace iptvsimple

src/iptvsimple/Channels.cpp

@@ -31,6 +31,7 @@ bool Channels::Init()
 void Channels::Clear()
 {
   m_channels.clear();
+  m_channelsLoadFailed = false;
   m_currentChannelNumber = Settings::GetInstance().GetStartChannelNumber();
 }
 
@@ -41,6 +42,9 @@ int Channels::GetChannelsAmount() const
 
 PVR_ERROR Channels::GetChannels(kodi::addon::PVRChannelsResultSet& results, bool radio) const
 {
+  if (m_channelsLoadFailed)
+    return PVR_ERROR_SERVER_ERROR;
+
   // We set a channel order here that applies to the 'Any channels' group in kodi-pvr
   // This allows the users to use the 'Backend Order' sort option in the left to
   // have the same order as the backend (regardles of the channel numbering used)

src/iptvsimple/Channels.h

@@ -43,11 +43,13 @@ namespace iptvsimple
     void Clear();
 
     int GetCurrentChannelNumber() const { return m_currentChannelNumber; }
+    void ChannelsLoadFailed() { m_channelsLoadFailed = true; };
 
   private:
     int GenerateChannelId(const char* channelName, const char* streamUrl);
 
     int m_currentChannelNumber;
+    bool m_channelsLoadFailed = false;
 
     std::vector<iptvsimple::data::Channel> m_channels;
   };

src/iptvsimple/PlaylistLoader.cpp

@@ -189,7 +189,8 @@ bool PlaylistLoader::LoadPlayList()
   if (m_channels.GetChannelsAmount() == 0)
   {
     Logger::Log(LEVEL_ERROR, "%s - Unable to load channels from file '%s'", __FUNCTION__, m_m3uLocation.c_str());
-    return false;
+    // We no longer return false as this is just an empty M3U and a missing file error.
+    //return false;
   }
 
   Logger::Log(LEVEL_INFO, "%s - Loaded %d channels.", __FUNCTION__, m_channels.GetChannelsAmount());
@@ -414,6 +415,11 @@ void PlaylistLoader::ReloadPlayList()
     m_client->TriggerChannelUpdate();
     m_client->TriggerChannelGroupsUpdate();
   }
+  else
+  {
+    m_channels.ChannelsLoadFailed();
+    m_channelGroups.ChannelGroupsLoadFailed();
+  }
 }
 
 std::string PlaylistLoader::ReadMarkerValue(const std::string& line, const std::string& markerName)

src/iptvsimple/data/EpgEntry.cpp

@@ -157,7 +157,7 @@ std::string ParseAsW3CDateString(const std::string& strDate)
 
 std::string ParseAsW3CDateString(time_t time)
 {
-  std::tm tm = SafeLocaltime(time); 
+  std::tm tm = SafeLocaltime(time);
   char buffer[16];
   std::strftime(buffer, 16, "%Y-%m-%d", &tm);
 
@@ -336,16 +336,33 @@ bool EpgEntry::ParseOnScreenEpisodeNumberInfo(const std::string& episodeNumberSt
   static const std::regex unwantedCharsRegex("[ \\txX_\\.]");
   const std::string text = std::regex_replace(episodeNumberString, unwantedCharsRegex, "");
 
-  std::smatch match;
-  static const std::regex seasonEpisodeRegex("^[sS]([0-9][0-9]*)[eE][pP]?([0-9][0-9]*)$");
-  if (std::regex_match(text, match, seasonEpisodeRegex))
+  if (StringUtils::StartsWithNoCase(text, "S"))
   {
-    if (match.size() == 3)
+    std::smatch match;
+    static const std::regex seasonEpisodeRegex("^[sS]([0-9][0-9]*)[eE][pP]?([0-9][0-9]*)$");
+    if (std::regex_match(text, match, seasonEpisodeRegex))
     {
-      m_seasonNumber = std::atoi(match[1].str().c_str());
-      m_episodeNumber = std::atoi(match[2].str().c_str());
+      if (match.size() == 3)
+      {
+        m_seasonNumber = std::atoi(match[1].str().c_str());
+        m_episodeNumber = std::atoi(match[2].str().c_str());
 
-      return true;
+        return true;
+      }
+    }
+  }
+  else if (StringUtils::StartsWithNoCase(text, "E"))
+  {
+    static const std::regex episodeOnlyRegex("^[eE][pP]?([0-9][0-9]*)$");
+    std::smatch matchEpOnly;
+    if (std::regex_match(text, matchEpOnly, episodeOnlyRegex))
+    {
+      if (matchEpOnly.size() == 2)
+      {
+        m_episodeNumber = std::atoi(matchEpOnly[1].str().c_str());
+
+        return true;
+      }
     }
   }