Merge pull request #185 from kodi-pvr/user_setip_omega

[Omega] Allow user to set specific IP of hdhomerun unit

Author: garbear

pvr.hdhomerun/addon.xml.in

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <addon
   id="pvr.hdhomerun"
-  version="21.0.3"
+  version="21.0.4"
   name="HDHomeRun Client"
   provider-name="Zoltan Csizmadia ([email protected])">
   <requires>@ADDON_DEPENDS@</requires>

pvr.hdhomerun/changelog.txt

@@ -1,3 +1,7 @@
+v21.0.4
+- Add some help labels to some settings and group discovery related settings
+- Allow a user to specifically set IP address of HDHomerun device to search for if other discovery methods dont work.
+
 v21.0.3
 - Fixed API URL (thanks mooninite!)
 

pvr.hdhomerun/resources/language/resource.language.en_gb/strings.po

@@ -24,6 +24,7 @@ msgctxt "Addon Description"
 msgid "HDHomeRun PVR Client"
 msgstr ""
 
+#. label-category: general
 msgctxt "#32001"
 msgid "General"
 msgstr ""
@@ -44,6 +45,35 @@ msgctxt "#32005"
 msgid "Mark new show"
 msgstr ""
 
+#. label: Device Discovery - http_discovery
 msgctxt "#32006"
 msgid "Use HTTP discovery"
 msgstr ""
+
+#. label: Device Discovery - force_ip
+msgctxt "#32007"
+msgid "Set IP of device to use"
+msgstr ""
+
+#. label-group: General - Device Discovery
+msgctxt "#32008"
+msgid "Device Discovery"
+msgstr ""
+
+#empty strings from id 32009 to 320099
+
+#. ############
+#. help info #
+#. ############
+
+#. help info - General
+
+#. help: Device Discovery - http_discovery
+msgctxt "#32100"
+msgid "This uses Silicondust web API to return HDHomeRun devices connected with the same internet IP address"
+msgstr ""
+
+#. help: Device Discovery - force_ip
+msgctxt "#32101"
+msgid "When other discovery methods do not work, enter an [B]IPv4[/B] address of a HDHomeRun device to explicitly search only that IP. This works when Broadcast and HTTP discovery do not find devices due to LAN/WAN differences in Client/Tuner. Restart Addon by Disabling and Enabling when changed."
+msgstr ""

pvr.hdhomerun/resources/settings.xml

@@ -23,11 +23,21 @@
           <default>true</default>
           <control type="toggle"/>
         </setting>
-        <setting id="http_discovery" type="boolean" label="32006">
+      </group>
+      <group id="2" label="32008">
+        <setting id="http_discovery" type="boolean" label="32006" help="32100">
           <level>0</level>
           <default>false</default>
           <control type="toggle"/>
         </setting>
+        <setting id="force_ip" type="string" label="32007" help="32101">
+          <level>0</level>
+          <default></default>
+          <constraints>
+            <allowempty>true</allowempty>
+          </constraints>
+          <control type="edit" format="string" />
+        </setting>
       </group>
     </category>
   </section>

src/HDHomeRunTuners.cpp

@@ -180,6 +180,28 @@ bool HDHomeRunTuners::Update(int nMode)
     nTunerCount = hdhomerun_discover_find_devices_custom_v2(
         0, HDHOMERUN_DEVICE_TYPE_TUNER, HDHOMERUN_DEVICE_ID_WILDCARD, foundDevices, 16);
 
+  // If neither HTTPDiscovery or normal broadcast discovery do not find a device, if a
+  // user has entered an IP address in settings for a forced IP, do a search based on that
+  // specific IP. We only accomodate IPv4 addresses currently.
+  if (nTunerCount <= 0)
+  {
+    std::string strUserForcedIP = SettingsType::Get().GetForcedIP();
+    if (!strUserForcedIP.empty())
+    {
+      unsigned char addressbuf[sizeof(struct in6_addr)];
+
+      int s = inet_pton(AF_INET, strUserForcedIP.c_str(), addressbuf);
+      if (s > 0)
+      {
+        uint32_t ipaddress =  (addressbuf[0] << 24) + (addressbuf[1] << 16) + (addressbuf[2] << 8) +  addressbuf[3];
+        nTunerCount = hdhomerun_discover_find_devices_custom_v2(
+            ipaddress, HDHOMERUN_DEVICE_TYPE_TUNER, HDHOMERUN_DEVICE_ID_WILDCARD, foundDevices, 16);
+
+        KODI_LOG(ADDON_LOG_DEBUG, "Found %d HDHomeRun tuners on IP %s", nTunerCount, strUserForcedIP.c_str());
+      }
+    }
+  }
+
   if (nTunerCount <= 0)
     return false;
 

src/Settings.cpp

@@ -22,6 +22,7 @@ bool SettingsType::ReadSettings()
   bMarkNew = kodi::addon::GetSettingBoolean("mark_new", true);
   bDebug = kodi::addon::GetSettingBoolean("debug", false);
   bHttpDiscovery = kodi::addon::GetSettingBoolean("http_discovery", false);
+  strForcedIP = kodi::addon::GetSettingString("force_ip", "");
 
   return true;
 }
@@ -48,6 +49,11 @@ ADDON_STATUS SettingsType::SetSetting(const std::string& settingName,
     bHttpDiscovery = settingValue.GetBoolean();
     return ADDON_STATUS_NEED_RESTART;
   }
+  else if (settingName == "force_ip")
+  {
+    strForcedIP = settingValue.GetString();
+    return ADDON_STATUS_NEED_RESTART;
+  }
 
   return ADDON_STATUS_OK;
 }

src/Settings.h

@@ -9,6 +9,8 @@
 
 #pragma once
 
+#include <string>
+
 #include <kodi/AddonBase.h>
 
 class ATTR_DLL_LOCAL SettingsType
@@ -24,6 +26,7 @@ class ATTR_DLL_LOCAL SettingsType
   bool GetDebug() const { return bDebug; }
   bool GetMarkNew() const { return bMarkNew; }
   bool GetHttpDiscovery() const { return bHttpDiscovery; }
+  std::string GetForcedIP() const { return strForcedIP; }
 
 private:
   SettingsType() = default;
@@ -33,4 +36,5 @@ class ATTR_DLL_LOCAL SettingsType
   bool bDebug = false;
   bool bMarkNew = false;
   bool bHttpDiscovery = false;
+  std::string strForcedIP;
 };