Merge pull request #263 from 2small/Matrix

Add support for sub-title/actor/director/writer
kodi-pvr · Aug 15, 2019 · 53d179c · 53d179c
2 parents 67f0c0d + 565e59b
commit 53d179c
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 5 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="4.1.0"
+  version="4.2.0"
   name="PVR IPTV Simple Client"
   provider-name="nightik">
   <requires>@ADDON_DEPENDS@</requires>

diff --git a/pvr.iptvsimple/changelog.txt b/pvr.iptvsimple/changelog.txt
@@ -1,3 +1,6 @@
+v4.2.0
+- Add support for sub-title/actor/director/writer in XML
+
 v4.1.0
 - Support EXTVCOPT in m3u8
 - Build helper script for OSX

diff --git a/src/PVRIptvData.cpp b/src/PVRIptvData.cpp
@@ -333,6 +333,14 @@ bool PVRIptvData::LoadEPG(time_t iStart, time_t iEnd)
     GetNodeValue(pChannelNode, "title", entry.strTitle);
     GetNodeValue(pChannelNode, "desc", entry.strPlot);
     GetNodeValue(pChannelNode, "category", entry.strGenreString);
+    GetNodeValue(pChannelNode, "sub-title", entry.strEpisodeName);
+
+    xml_node<> *pCreditsNode = pChannelNode->first_node("credits");
+    if (pCreditsNode != NULL) {
+        GetNodeValue(pCreditsNode, "actor", entry.strCast);
+	GetNodeValue(pCreditsNode, "director", entry.strDirector);
+	GetNodeValue(pCreditsNode, "writer", entry.strWriter);
+    }
 
     xml_node<>* pIconNode = pChannelNode->first_node("icon");
     if (!pIconNode || !GetAttributeValue(pIconNode, "src", entry.strIconPath))
@@ -810,9 +818,9 @@ PVR_ERROR PVRIptvData::GetEPGForChannel(ADDON_HANDLE handle, int iChannelUid, ti
       tag.strPlotOutline      = myTag.strPlotOutline.c_str();
       tag.strPlot             = myTag.strPlot.c_str();
       tag.strOriginalTitle    = nullptr;  /* not supported */
-      tag.strCast             = nullptr;  /* not supported */
-      tag.strDirector         = nullptr;  /* not supported */
-      tag.strWriter           = nullptr;  /* not supported */
+      tag.strCast             = myTag.strCast.c_str();
+      tag.strDirector         = myTag.strDirector.c_str();
+      tag.strWriter           = myTag.strWriter.c_str();
       tag.iYear               = 0;     /* not supported */
       tag.strIMDBNumber       = nullptr;  /* not supported */
       tag.strIconPath         = myTag.strIconPath.c_str();
@@ -833,7 +841,7 @@ PVR_ERROR PVRIptvData::GetEPGForChannel(ADDON_HANDLE handle, int iChannelUid, ti
       tag.iSeriesNumber       = 0;     /* not supported */
       tag.iEpisodeNumber      = 0;     /* not supported */
       tag.iEpisodePartNumber  = 0;     /* not supported */
-      tag.strEpisodeName      = nullptr;  /* not supported */
+      tag.strEpisodeName      = myTag.strEpisodeName.c_str();
       tag.iFlags              = EPG_TAG_FLAG_UNDEFINED;
 
       PVR->TransferEpgEntry(handle, &tag);

diff --git a/src/PVRIptvData.h b/src/PVRIptvData.h
@@ -39,10 +39,14 @@ struct PVRIptvEpgEntry
   time_t startTime;
   time_t endTime;
   std::string strTitle;
+  std::string strEpisodeName;
   std::string strPlotOutline;
   std::string strPlot;
   std::string strIconPath;
   std::string strGenreString;
+  std::string strCast;
+  std::string strDirector;
+  std::string strWriter;
 };
 
 struct PVRIptvEpgChannel