fix username-password display

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.8"
+       version="1.8.1"
        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.8.1
+- fix username-password display
 v1.8
 - add support for IPTV Networks
 - fix error in muxes when 0 muxes available

default.py

@@ -42,10 +42,11 @@
 tvh_port = xbmcaddon.Addon().getSetting('tvhport')
 tvh_usern = xbmcaddon.Addon().getSetting('usern')
 tvh_passw = xbmcaddon.Addon().getSetting('passw')
+tvh_url_base = xbmcaddon.Addon().getSetting('tvhurl')
 if tvh_usern != "" and tvh_passw != "":
-    tvh_url = tvh_usern + ":" + tvh_passw + "@" + xbmcaddon.Addon().getSetting('tvhurl')
+    tvh_url = tvh_usern + ":" + tvh_passw + "@" + tvh_url_base
 else:
-    tvh_url = xbmcaddon.Addon().getSetting('tvhurl')
+    tvh_url = tvh_url_base
 
 try:
     check_url = 'http://' + tvh_url + ':' + tvh_port + '/api/status/connections'
@@ -2159,7 +2160,7 @@ def index():
     })
     items.append(
     {
-        'label': 'Tvheadend Backend: ' + tvh_url + ':' + tvh_port,
+        'label': 'Tvheadend Backend: ' + tvh_url_base + ':' + tvh_port,
         'path': plugin.url_for(u'tvhclient'),
         'thumbnail':get_icon_path('server'),
     })

resources/language/English/strings.xml

@@ -1,7 +1,11 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <strings>
+	<string id="32001">Tvheadend Configuration</string>
 	<string id="32000">Tvheadend Backend</string>
 	<string id="32010">IP address</string>
 	<string id="32020">Port</string>
+	<string id="32022">Tvheadend Username</string>
+	<string id="32023">Tvheadend Password</string>
+	<string id="32025">Tvheadend Paths</string>
 	<string id="32030">DVR Recording Path</string>
 </strings>

resources/settings.xml

@@ -1,11 +1,13 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <settings>
   <category label="32000">
+    <setting label="32001" type="lsep"/>
     <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="" type="lsep"/>
+    <setting label="32025" type="lsep"/>
     <setting label="32030"  type="folder"  id="dvrstorage"  default="" option="writeable"/>
   </category>
 </settings>