settings: Add setting for the first channel number used

Make the first channel number used to populate the channel list configurable as the default of 1 very likely conflicts with other PVR backend channel list when multiple backends are activated. While at it, optimize the loop logic a bit to not logically work with a zero-based start number. Signed-off-by: Daniel Scheller <[email protected]>
kodi-pvr · Mar 24, 2024 · 143970c · 143970c
1 parent 888d89c
commit 143970c
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 3 deletions.
diff --git a/pvr.plutotv/resources/language/resource.language.en_gb/strings.po b/pvr.plutotv/resources/language/resource.language.en_gb/strings.po
@@ -30,6 +30,10 @@ msgctxt "#30007"
 msgid "(Re)install Widevine CDM library"
 msgstr ""
 
+msgctxt "#30008"
+msgid "First channel number"
+msgstr ""
+
 msgctxt "#30040"
 msgid "Debug"
 msgstr ""

diff --git a/pvr.plutotv/resources/settings.xml b/pvr.plutotv/resources/settings.xml
@@ -3,6 +3,14 @@
 	<section id="pvr.plutotv">
 		<category id="credentials" label="30001" help="">
 			<group id="1" label="">
+				<setting id="start_channelnum" type="integer" label="30008" help="">
+					<level>0</level>
+					<default>1</default>
+					<constraints>
+						<allowempty>false</allowempty>
+					</constraints>
+					<control type="edit" format="integer" />
+				</setting>
 				<setting id="install_widevine" type="string" label="30007"
 					help="">
 					<level>0</level>

diff --git a/src/PlutotvData.cpp b/src/PlutotvData.cpp
@@ -113,7 +113,8 @@ bool PlutotvData::LoadChannelsData()
   kodi::Log(ADDON_LOG_DEBUG, "[channels] iterate channels");
   kodi::Log(ADDON_LOG_DEBUG, "[channels] size: %i;", channelsDoc["result"].Size());
 
-  int i = 0;
+  // Use configured start channel number to populate the channel list
+  int i = GetSettingsStartChannel();
   for (const auto& channel : channelsDoc["result"].GetArray())
   {
     /**
@@ -153,9 +154,9 @@ bool PlutotvData::LoadChannelsData()
       }}, */
 
     const std::string plutotvid = channel["_id"].GetString();
-    ++i;
+
     PlutotvChannel plutotv_channel;
-    plutotv_channel.iChannelNumber = i; // position
+    plutotv_channel.iChannelNumber = i++; // position
     kodi::Log(ADDON_LOG_DEBUG, "[channel] channelnr(pos): %i;", plutotv_channel.iChannelNumber);
 
     plutotv_channel.plutotvID = plutotvid;
@@ -262,6 +263,11 @@ std::string PlutotvData::GetSettingsUUID(const std::string& setting)
   return uuid;
 }
 
+int PlutotvData::GetSettingsStartChannel() const
+{
+  return kodi::addon::GetSettingInt("start_channelnum", 1);
+}
+
 std::string PlutotvData::GetChannelStreamURL(int uniqueId)
 {
   LoadChannelsData();

diff --git a/src/PlutotvData.h b/src/PlutotvData.h
@@ -74,6 +74,7 @@ class ATTR_DLL_LOCAL PlutotvData : public kodi::addon::CAddonBase,
 
   std::string GetChannelStreamURL(int uniqueId);
   std::string GetSettingsUUID(const std::string& setting);
+  int GetSettingsStartChannel() const;
   void SetStreamProperties(std::vector<kodi::addon::PVRStreamProperty>& properties,
                            const std::string& url,
                            bool realtime);