Support custom groups for Media

src/iptvsimple/Media.cpp

@@ -66,16 +66,35 @@ int GenerateMediaEntryId(const char* providerName, const char* streamUrl)
 
 } // unamed namespace
 
-bool Media::AddMediaEntry(MediaEntry& mediaEntry)
+bool Media::AddMediaEntry(MediaEntry& mediaEntry, std::vector<int>& groupIdList, ChannelGroups& channelGroups, bool channelHadGroups)
 {
+  // If we have no groups set for this media check it that's ok before adding it.
+  // Note that TV is a proxy for Media. There is no concept of radio for media
+  if (m_settings->AllowTVChannelGroupsOnly() && groupIdList.empty())
+    return false;
+
   std::string mediaEntryId = std::to_string(GenerateMediaEntryId(mediaEntry.GetProviderName().c_str(),
                                                                  mediaEntry.GetStreamURL().c_str()));
   mediaEntryId.append("-" + mediaEntry.GetDirectory() + mediaEntry.GetTitle());
   mediaEntry.SetMediaEntryId(mediaEntryId);
 
+  // Media Ids must be unique
   if (m_mediaIdMap.find(mediaEntryId) != m_mediaIdMap.end())
     return false;
 
+  bool belongsToGroup = false;
+  for (int myGroupId : groupIdList)
+  {
+    if (channelGroups.GetChannelGroup(myGroupId) != nullptr)
+      belongsToGroup = true;
+  }
+
+
+  // We only care if a media entry belongs to a group if it had groups to begin with
+  // Note that a channel can have had groups but no have no groups valid currently.
+  if (!belongsToGroup && channelHadGroups)
+    return false;
+
   m_media.emplace_back(mediaEntry);
   m_mediaIdMap.insert({mediaEntryId, mediaEntry});
 

src/iptvsimple/Media.h

@@ -8,6 +8,7 @@
 
 #pragma once
 
+#include "ChannelGroups.h"
 #include "data/MediaEntry.h"
 
 #include <string>
@@ -26,7 +27,7 @@ namespace iptvsimple
     const std::string GetMediaEntryURL(const kodi::addon::PVRRecording& mediaEntry);
     const iptvsimple::data::MediaEntry* FindMediaEntry(const std::string& id, const std::string& displayName) const;
 
-    bool AddMediaEntry(iptvsimple::data::MediaEntry& entry);
+    bool AddMediaEntry(iptvsimple::data::MediaEntry& entry, std::vector<int>& groupIdList, iptvsimple::ChannelGroups& channelGroups, bool channelHadGroups);
 
     std::vector<iptvsimple::data::MediaEntry>& GetMediaEntryList() { return m_media; }
 

src/iptvsimple/PlaylistLoader.cpp

@@ -204,7 +204,7 @@ bool PlaylistLoader::LoadPlayList()
         entry.UpdateFrom(tmpChannel);
         entry.SetStreamURL(line);
 
-        if (!m_media.AddMediaEntry(entry))
+        if (!m_media.AddMediaEntry(entry, currentChannelGroupIdList, m_channelGroups, channelHadGroups))
           Logger::Log(LEVEL_DEBUG, "%s - Counld not add media entry as an entry with the same gnenerated unique ID already exists", __func__);
 
       }