Add Tvh username-password ability

Author: edit4ever

addon.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <addon id="script.module.tvh2kodi"
        name="Tvheadend Setup for Kodi"
-       version="1.6"
+       version="1.7"
        provider-name="edit4ever">
   <requires>
     <import addon="xbmc.python" version="2.6.0"/>
@@ -17,6 +17,8 @@
     <description>Tvh2Kodi gives access to the basic Tvheadend settings directly from the Kodi interface. This can be used in place of the Tvheadend web interface to get your Tvheadend backend server configured and running.  It is also provides an easy way to scan for new services and channels and to configure your channel EPG sources.
 
 * minimum version of Tvheadend is 4.2
+v1.7
+- add support for Tvh username-password
 v1.6
 - add backup and import of tvh userdata
 - add channel icon reset option

default.py

@@ -13,6 +13,8 @@
 import ast
 import zipfile
 import datetime
+#from requests.exceptions import HTTPError
+#from requests.exceptions import ConnectionError
 
 plugin = Plugin()
 dialog = xbmcgui.Dialog()
@@ -37,8 +39,24 @@
 except:
     pass
 
-tvh_url = xbmcaddon.Addon().getSetting('tvhurl')
 tvh_port = xbmcaddon.Addon().getSetting('tvhport')
+tvh_usern = xbmcaddon.Addon().getSetting('usern')
+tvh_passw = xbmcaddon.Addon().getSetting('passw')
+if tvh_usern != "" and tvh_passw != "":
+    tvh_url = tvh_usern + ":" + tvh_passw + "@" + xbmcaddon.Addon().getSetting('tvhurl')
+else:
+    tvh_url = xbmcaddon.Addon().getSetting('tvhurl')
+
+try:
+    check_url = 'http://' + tvh_url + ':' + tvh_port + '/api/status/connections'
+    check_load = requests.get(check_url)
+    check_status = check_load.raise_for_status()
+except requests.exceptions.HTTPError as err:
+        dialog.ok("Tvheadend Access Error!", str(err), "", "Please check your username/password in settings.")
+except requests.exceptions.RequestException as e:
+    dialog.ok("Tvheadend Access Error!", "Could not connect to Tvheadend server.", "Please check your Tvheadend server is running or check the IP and port configuration in the settings.")
+
+
 truefalse = ['true', 'false']
 enabledisable = ['Enabled', 'Disabled']
 

resources/settings.xml

@@ -3,6 +3,9 @@
   <category label="32000">
     <setting label="32010"  type="ipaddress"  id="tvhurl"  default="127.0.0.1"/>
     <setting label="32020"  type="number"  id="tvhport"  default="9981"/>
+    <setting label="32022"  type="text" id="usern" default=""/>
+    <setting label="32023"  type="text" id="passw"  default=""/>
+    <setting label="" type="lsep" />
     <setting label="32030"  type="folder"  id="dvrstorage"  default="" option="writeable"/>
   </category>
 </settings>