Merge remote-tracking branch 'origin/Leia' into Matrix

Author: rbuehlma

pvr.teleboy/addon.xml.in

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <addon id="pvr.teleboy"
-       version="19.2.1"
+       version="19.2.2"
        name="Teleboy PVR Client"
        provider-name="rbuehlma">
   <requires>@ADDON_DEPENDS@</requires>

pvr.teleboy/changelog.txt

@@ -1,3 +1,5 @@
+v19.2.2
+ - Correctly load genres
 v19.2.1
  - Update cmake build system to Version 3.5
 v19.2.0
@@ -6,6 +8,8 @@ v19.1.0
  - Update to GUI addon API v5.14.0
 v19.0.0
  - Update to PVR addon API v6.0.0
+v18.0.25
+ - Correctly load genres
 v18.0.24
  - Fix loading more than 100 recordings
 v18.0.23

src/TeleBoy.cpp

@@ -217,6 +217,40 @@ void TeleBoy::GetAddonCapabilities(PVR_ADDON_CAPABILITIES* pCapabilities)
   pCapabilities->bSupportsTimers = true;
 }
 
+void TeleBoy::LoadGenres()
+{
+  Document json;
+  if (!ApiGet("/epg/genres", json))
+  {
+    XBMC->Log(LOG_ERROR, "Error loading genres.");
+    return;
+  }
+  Value& genres = json["data"]["items"];
+  for (Value::ConstValueIterator itr1 = genres.Begin();
+      itr1 != genres.End(); ++itr1)
+  {
+    const Value &genre = (*itr1);
+    TeleboyGenre teleboyGenre;
+    int id = genre["id"].GetInt();
+    teleboyGenre.name = GetStringOrEmpty(genre, "name");
+    genresById[id] = teleboyGenre;
+    
+    if (genre.HasMember("sub_genres")) {
+      const Value& subGenres = genre["sub_genres"];
+
+      for (Value::ConstValueIterator itr1 = subGenres.Begin();
+          itr1 != subGenres.End(); ++itr1)
+      {
+        const Value &subGenre = (*itr1);
+        TeleboyGenre teleboySubGenre;
+        int subId = subGenre["id"].GetInt();
+        teleboySubGenre.name = GetStringOrEmpty(subGenre, "name");
+        genresById[subId] = teleboySubGenre;
+      }
+    }
+  }
+}
+
 bool TeleBoy::LoadChannels()
 {
   Document json;
@@ -400,9 +434,11 @@ void TeleBoy::GetEPGForChannelAsync(int uniqueChannelId, time_t iStart,
           item.HasMember("serie_episode") ? item["serie_episode"].GetInt() : 0;
       tag.iEpisodePartNumber = 0; /* not supported */
       tag.strEpisodeName = strdup(GetStringOrEmpty(item, "subtitle").c_str());
-      ; /* not supported */
-      tag.iGenreType = EPG_GENRE_USE_STRING;
-      tag.strGenreDescription = strdup(GetStringOrEmpty(item, "type").c_str());
+      if (item.HasMember("genre_id")) {
+        tag.iGenreType = EPG_GENRE_USE_STRING;
+        int genreId = item["genre_id"].GetInt();
+        tag.strGenreDescription = genresById[genreId].name.c_str();
+      }
       tag.iFlags = EPG_TAG_FLAG_UNDEFINED;
 
       PVR->EpgEventStateChange(&tag, EPG_EVENT_CREATED);

src/TeleBoy.h

@@ -21,11 +21,9 @@ struct TeleBoyChannel
   std::string logoPath;
 };
 
-struct PVRIptvEpgGenre
+struct TeleboyGenre
 {
-  int iGenreType;
-  int iGenreSubType;
-  std::string strGenre;
+  std::string name;
 };
 
 class TeleBoy
@@ -34,6 +32,7 @@ class TeleBoy
   TeleBoy(bool favoritesOnly);
   virtual ~TeleBoy();
   virtual bool Login(string u, string p);
+  void LoadGenres();
   virtual bool LoadChannels();
   virtual void GetAddonCapabilities(PVR_ADDON_CAPABILITIES* pCapabilities);
   virtual int GetChannelsAmount(void);
@@ -59,6 +58,7 @@ class TeleBoy
   string userId;
   string apiKey;
   map<int, TeleBoyChannel> channelsById;
+  map<int, TeleboyGenre> genresById;
   vector<int> sortedChannels;
   int64_t maxRecallSeconds;
   vector<UpdateThread*> updateThreads;

src/client.cpp

@@ -101,6 +101,7 @@ ADDON_STATUS ADDON_Create(void *hdl, void *props)
       if (teleboy->Login(teleboyUsername, teleboyPassword)) {
         XBMC->Log(LOG_DEBUG, "Login done");
         teleboy->LoadChannels();
+        teleboy->LoadGenres();
         m_CurStatus = ADDON_STATUS_OK;
       } else {
         XBMC->Log(LOG_ERROR, "Login failed");