Merge pull request #2448 from CvH/9.0-tvh-scan-tables

Tvh update and scan-tables

packages/addons/addon-depends/tvh-dtv-scan-tables/package.mk

@@ -0,0 +1,29 @@
+################################################################################
+#      This file is part of LibreELEC - https://libreelec.tv
+#      Copyright (C) 2018-present Team LibreELEC
+#
+#  LibreELEC is free software: you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation, either version 2 of the License, or
+#  (at your option) any later version.
+#
+#  LibreELEC is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with LibreELEC.  If not, see <http://www.gnu.org/licenses/>.
+################################################################################
+
+PKG_NAME="tvh-dtv-scan-tables"
+PKG_VERSION="a3ebfcd"
+PKG_SHA256="0cfb977f9346b3a19f8494816379214a9e197301254f6fd46d9072f3895f5f68"
+PKG_ARCH="any"
+PKG_LICENSE="GPL"
+PKG_SITE="https://github.com/tvheadend"
+PKG_URL="https://github.com/tvheadend/dtv-scan-tables/archive/$PKG_VERSION.tar.gz"
+PKG_SOURCE_DIR="dtv-scan-tables-${PKG_VERSION}*"
+PKG_DEPENDS_TARGET="toolchain"
+PKG_LONGDESC="Digital TV scan tables, a fork from Tvh to support more recent tables"
+PKG_TOOLCHAIN="manual"

packages/addons/service/tvheadend42/addon.xml

@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<addon id="@PKG_ADDON_ID@"
+       name="@ADDON_NAME@"
+       version="@ADDON_VERSION@"
+       provider-name="@PROVIDER_NAME@">
+  <requires>
+    <import addon="os.libreelec.tv" version="@OS_VERSION@"/>
+    <import addon="xbmc.python" version="2.1.0"/>
+@REQUIRES@
+  </requires>
+  <extension point="xbmc.service" library="default.py">
+    <provides>@PKG_ADDON_PROVIDES@</provides>
+  </extension>
+  <extension point="xbmc.python.script" library="download.py">
+    <provides>@PKG_ADDON_PROVIDES@</provides>
+  </extension>
+  <extension point="xbmc.addon.metadata">
+    <summary>@PKG_SHORTDESC@</summary>
+    <description>
+@PKG_LONGDESC@
+    </description>
+    <disclaimer>
+@PKG_DISCLAIMER@
+    </disclaimer>
+    <platform>all</platform>
+    <news>
+@PKG_ADDON_NEWS@
+    </news>
+    <assets>
+      <icon>resources/icon.png</icon>
+      <fanart>resources/fanart.png</fanart>
+@PKG_ADDON_SCREENSHOT@
+    </assets>
+  </extension>
+</addon>

packages/addons/service/tvheadend42/changelog.txt

@@ -1,3 +1,7 @@
+114
+- update to 4.2.5-27
+- addded manual Scan-Table update
+
 113
 - update to 4.2.4-23
 - full transcoding support

packages/addons/service/tvheadend42/package.mk

@@ -17,16 +17,16 @@
 ################################################################################
 
 PKG_NAME="tvheadend42"
-PKG_VERSION="ceaf330"
+PKG_VERSION="7a8fa15"
-PKG_SHA256="c6b3b366136d9e86630cb2ebd2cab823448d0eeb02ef15e72bc0accd8dc9d923"
+PKG_SHA256="317fbd5ac0167cb64021bcfbe1f31deb4edbafaf63e6ffc385c94662706e20a1"
-PKG_VERSION_NUMBER="4.2.4-23"
+PKG_VERSION_NUMBER="4.2.5-27"
-PKG_REV="113"
+PKG_REV="114"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.tvheadend.org"
 PKG_URL="https://github.com/tvheadend/tvheadend/archive/$PKG_VERSION.tar.gz"
 PKG_SOURCE_DIR="tvheadend-${PKG_VERSION}*"
-PKG_DEPENDS_TARGET="toolchain avahi curl dvb-apps ffmpegx libdvbcsa libiconv openssl pngquant:host Python2:host"
+PKG_DEPENDS_TARGET="toolchain avahi curl dvb-apps ffmpegx libdvbcsa libiconv openssl pngquant:host Python2:host tvh-dtv-scan-tables"
 PKG_SECTION="service"
 PKG_SHORTDESC="Tvheadend: a TV streaming server for Linux"
 PKG_LONGDESC="Tvheadend ($PKG_VERSION_NUMBER): is a TV streaming server for Linux supporting DVB-S/S2, DVB-C, DVB-T/T2, IPTV, SAT>IP, ATSC and ISDB-T"
@@ -71,8 +71,9 @@ PKG_CONFIGURE_OPTS_TARGET="--prefix=/usr \
                            --disable-dbus_1 \
                            --enable-dvbcsa \
                            --enable-dvben50221 \
-                           --enable-hdhomerun_client \
+                           --disable-dvbscan \
-                           --enable-hdhomerun_static \
+                           --disable-hdhomerun_client \
+                           --disable-hdhomerun_static \
                            --enable-epoll \
                            --enable-inotify \
                            --enable-pngquant \
@@ -114,6 +115,20 @@ makeinstall_target() {
 
 addon() {
   mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/bin
+
+  cp $PKG_DIR/addon.xml $ADDON_BUILD/$PKG_ADDON_ID
+
+  # set only version (revision will be added by buildsystem)
+  $SED -e "s|@ADDON_VERSION@|$ADDON_VERSION|g" \
+       -i $ADDON_BUILD/$PKG_ADDON_ID/addon.xml
+
   cp -P $PKG_BUILD/build.linux/tvheadend $ADDON_BUILD/$PKG_ADDON_ID/bin
   cp -P $PKG_BUILD/capmt_ca.so $ADDON_BUILD/$PKG_ADDON_ID/bin
+
+  #dvb-scan files
+  mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/dvb-scan
+  cp -r $(get_build_dir tvh-dtv-scan-tables)/atsc \
+        $(get_build_dir tvh-dtv-scan-tables)/dvb-* \
+        $(get_build_dir tvh-dtv-scan-tables)/isdb-t \
+        $ADDON_BUILD/$PKG_ADDON_ID/dvb-scan
 }

packages/addons/service/tvheadend42/patches/tvheadend42-01-dvb-scan-path.patch

@@ -0,0 +1,11 @@
+--- a/src/input/mpegts/scanfile.c
++++ b/src/input/mpegts/scanfile.c
+@@ -903,7 +903,7 @@ scanfile_init ( const char *muxconf_path, int lock )
+ #elif defined(PLATFORM_FREEBSD)
+     path = "/usr/local/share/dtv-scan-tables";
+ #else
+-    path = "/usr/share/dvb";
++    path = "/storage/.kodi/addons/service.tvheadend42/dvb-scan";
+ #endif
+ 
+   if (!initialized) {

packages/addons/service/tvheadend42/source/default.py

@@ -1,6 +1,6 @@
 ################################################################################
 #      This file is part of LibreELEC - https://libreelec.tv
-#      Copyright (C) 2016 Team LibreELEC
+#      Copyright (C) 2016-present Team LibreELEC
 #
 #  LibreELEC is free software: you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by

packages/addons/service/tvheadend42/source/download.py

@@ -0,0 +1,82 @@
+################################################################################
+#      This file is part of LibreELEC - https://libreelec.tv
+#      Copyright (C) 2018-present Team LibreELEC
+#
+#  LibreELEC is free software: you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation, either version 2 of the License, or
+#  (at your option) any later version.
+#
+#  LibreELEC is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with LibreELEC.  If not, see <http://www.gnu.org/licenses/>.
+################################################################################
+
+import urllib, os, zipfile
+from urllib2 import URLError
+import xbmc, xbmcgui, xbmcaddon
+import shutil
+import sys
+
+url = 'https://github.com/tvheadend/dtv-scan-tables/archive/tvheadend.zip'
+temp = xbmc.translatePath('special://temp')
+temp_folder = os.path.join(temp, 'dtv-scan-tables-tvheadend')
+dest_folder = os.path.join(xbmc.translatePath(xbmcaddon.Addon().getAddonInfo('path')), 'dvb-scan')
+archive = os.path.join(temp, 'dtv_scantables.zip')
+
+ADDON_NAME = xbmcaddon.Addon().getAddonInfo('name')
+LS = xbmcaddon.Addon().getLocalizedString
+SCANTABLES = ['atsc', 'channels-conf', 'dvb-c', 'dvb-s', 'dvb-t', 'isdb-t']
+
+class DownLoader():
+
+    def __init__(self):
+        self.dp = xbmcgui.DialogProgressBG()
+
+    def download(self, url, dest):
+        try:
+            self.dp.create(ADDON_NAME, LS(30042))
+            urllib.urlretrieve(url, dest, reporthook=self._pbhook)
+            self.dp.close()
+            zip = zipfile.ZipFile(archive)
+            if zip.testzip() is not None: raise zipfile.BadZipfile
+
+            if os.path.exists(temp_folder): shutil.rmtree(temp_folder)
+            if os.path.exists(dest_folder): shutil.rmtree(dest_folder)
+
+            self.dp.create(ADDON_NAME, LS(30043))
+            for idx, folder in enumerate(SCANTABLES):
+                self._pbhook(idx, 1, len(SCANTABLES) - 1)
+                for z in zip.filelist:
+                    if folder in z.filename: zip.extract(z.filename, temp)
+
+            self.dp.close()
+            for folder in SCANTABLES:
+                shutil.copytree(os.path.join(temp_folder, folder), os.path.join(dest_folder, folder))
+
+            xbmcgui.Dialog().notification(ADDON_NAME, LS(30039), xbmcgui.NOTIFICATION_INFO)
+        except URLError, e:
+            xbmc.log('Could not download file: %s' % e.reason, xbmc.LOGERROR)
+            self.dp.close()
+            xbmcgui.Dialog().notification(ADDON_NAME, LS(30040), xbmcgui.NOTIFICATION_ERROR)
+        except zipfile.BadZipfile:
+            xbmc.log('Could not extract files from zip, bad zipfile', xbmc.LOGERROR)
+            xbmcgui.Dialog().notification(ADDON_NAME, LS(30041), xbmcgui.NOTIFICATION_ERROR)
+
+    def _pbhook(self, numblocks, blocksize, filesize):
+            percent = int((numblocks * blocksize * 100) / filesize)
+            self.dp.update(percent)
+
+
+if __name__ == '__main__':
+    try:
+        if sys.argv[1] == 'getscantables':
+            dl = DownLoader()
+            dl.download(url, archive)
+    except IndexError:
+        pass
+

packages/addons/service/tvheadend42/source/resources/language/English/strings.po

@@ -0,0 +1,182 @@
+# Kodi Media Center language file
+# Addon Name: tvheadend42
+# Addon id: service.tvheadend42
+# Addon Provider: Team LibreELEC
+msgid ""
+msgstr ""
+
+msgctxt "#30000"
+msgid "XMLTV"
+msgstr ""
+
+msgctxt "#30001"
+msgid "DVB"
+msgstr ""
+
+msgctxt "#30002"
+msgid "DEBUG"
+msgstr ""
+
+msgctxt "#30003"
+msgid "FRITZ!Box Sat>IP"
+msgstr ""
+
+msgctxt "#30004"
+msgid "XMLTV Configuration"
+msgstr ""
+
+msgctxt "#30005"
+msgid "XMLTV source type"
+msgstr ""
+
+msgctxt "#30006"
+msgid "XMLTV File location"
+msgstr ""
+
+msgctxt "#30007"
+msgid "XMLTV Web location"
+msgstr ""
+
+msgctxt "#30008"
+msgid "XMLTV Script location"
+msgstr ""
+
+msgctxt "#30009"
+msgid "DVB Configuration"
+msgstr ""
+
+msgctxt "#30010"
+msgid "Unload DVB modules before suspend"
+msgstr ""
+
+msgctxt "#30011"
+msgid "Wait for frontend initialization"
+msgstr ""
+
+msgctxt "#30012"
+msgid "Number of adapters to wait for"
+msgstr ""
+
+msgctxt "#30013"
+msgid "Preload capmt_ca.so library"
+msgstr ""
+
+msgctxt "#30014"
+msgid "Delay the start of Tvheadend"
+msgstr ""
+
+msgctxt "#30015"
+msgid "Seconds delay"
+msgstr ""
+
+msgctxt "#30016"
+msgid "Custom start parameter"
+msgstr ""
+
+msgctxt "#30017"
+msgid "Parameter"
+msgstr ""
+
+msgctxt "#30018"
+msgid "FRITZ!Box Sat>IP server"
+msgstr ""
+
+msgctxt "#30019"
+msgid "AVM device"
+msgstr ""
+
+msgctxt "#30020"
+msgid "IP of the AVM Repeater"
+msgstr ""
+
+msgctxt "#30021"
+msgid "Router IP range (last digits are always .254)"
+msgstr ""
+
+msgctxt "#30022"
+msgid "Used network"
+msgstr ""
+
+msgctxt "#30023"
+msgid "Virtual IP #1"
+msgstr ""
+
+msgctxt "#30024"
+msgid "Virtual IP #2"
+msgstr ""
+
+msgctxt "#30025"
+msgid "Virtual IP #3"
+msgstr ""
+
+msgctxt "#30026"
+msgid "Virtual IP #4"
+msgstr ""
+
+msgctxt "#30027"
+msgid "TRACE Configuration"
+msgstr ""
+
+msgctxt "#30028"
+msgid "Path"
+msgstr ""
+
+msgctxt "#30029"
+msgid "Activate TRACE Debug"
+msgstr ""
+
+msgctxt "#30030"
+msgid "Debug Value #1"
+msgstr ""
+
+msgctxt "#30031"
+msgid "Debug Value #2"
+msgstr ""
+
+msgctxt "#30032"
+msgid "Debug Value #3"
+msgstr ""
+
+msgctxt "#30033"
+msgid "Debug Value #4"
+msgstr ""
+
+msgctxt "#30034"
+msgid "Debug Value #5"
+msgstr ""
+
+msgctxt "#30035"
+msgid "FRITZ!Box Configuration"
+msgstr ""
+
+msgctxt "#30036"
+msgid "Scan Tables"
+msgstr ""
+
+msgctxt "#30037"
+msgid "Manage Scan-Tables"
+msgstr ""
+
+msgctxt "#30038"
+msgid "Download and install Scan-Tables"
+msgstr ""
+
+msgctxt "#30039"
+msgid "Download completed, tables installed"
+msgstr ""
+
+msgctxt "#30040"
+msgid "Could not download Scan-Tables"
+msgstr ""
+
+msgctxt "#30041"
+msgid "Could not extract zip files"
+msgstr ""
+
+msgctxt "#30042"
+msgid "Download Scan-Tables"
+msgstr ""
+
+msgctxt "#30043"
+msgid "Extract Scan-Tables"
+msgstr ""

packages/addons/service/tvheadend42/source/resources/language/English/strings.xml

@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<strings>
-  <!-- HTS TVHEADEND -->
-  <string id="1000">XMLTV</string>
-  <string id="1001">DVB</string>
-  <string id="1002">DEBUG</string>
-  <string id="1003">FRITZ!Box Sat>IP</string>
-  <string id="1010">XMLTV Configuration</string>
-  <string id="1011">XMLTV source type</string>
-  <string id="1012">XMLTV File location</string>
-  <string id="1013">XMLTV Web location</string>
-  <string id="1014">XMLTV Script location</string>
-  <string id="1020">DVB Configuration</string>
-  <string id="1021">Unload DVB mudules before suspend</string>
-  <string id="1022">Wait for frontend initialization</string>
-  <string id="1023">Number of adapters to wait for</string>
-  <string id="1024">Preload capmt_ca.so library</string>
-  <string id="1025">Delay the start of Tvheadend</string>
-  <string id="1026">Seconds delay</string>
-  <string id="1028">Custom start parameter</string>
-  <string id="1029">Parameter</string>
-  <string id="1110">FRITZ!Box Sat>IP server</string>
-  <string id="1111">AVM device</string>
-  <string id="1112">IP of the AVM Repeater</string>
-  <string id="1113">Router IP range (last digits are always .254)</string>
-  <string id="1114">Used network</string>
-  <string id="1115">Virtual IP #1</string>
-  <string id="1116">Virtual IP #2</string>
-  <string id="1117">Virtual IP #3</string>
-  <string id="1118">Virtual IP #4</string>
-  <string id="1030">TRACE Configuration</string>
-  <string id="1031">Path</string>
-  <string id="1032">Activate TRACE Debug</string>
-  <string id="31032">Debug Value #1</string>
-  <string id="31033">Debug Value #2</string>
-  <string id="31034">Debug Value #3</string>
-  <string id="31035">Debug Value #4</string>
-  <string id="31036">Debug Value #5</string>
-</strings>

packages/addons/service/tvheadend42/source/resources/settings.xml

@@ -1,51 +1,55 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <settings>
   <!-- HTS TVHEADEND -->
-  <category label="1000">
+  <category label="30000">
-    <setting label="1010" type="lsep"/>
+    <setting label="30004" type="lsep"/>
     <setting type="sep" />
-    <setting id="XMLTV_TYPE" type="labelenum" label="1011" values="NONE|FILE|SCRIPT|WEB" sort="yes" default="NONE"/>
+    <setting id="XMLTV_TYPE" type="labelenum" label="30005" values="NONE|FILE|SCRIPT|WEB" sort="yes" default="NONE"/>
-    <setting id="XMLTV_LOCATION_FILE" type="file" label="1012" default="" enable="eq(-1,0)"/>
+    <setting id="XMLTV_LOCATION_FILE" type="file" label="30006" default="" enable="eq(-1,0)"/>
-    <setting id="XMLTV_LOCATION_WEB" type="text" label="1013" default="http://" enable="eq(-2,3)"/>
+    <setting id="XMLTV_LOCATION_WEB" type="text" label="30007" default="http://" enable="eq(-2,3)"/>
-    <setting id="XMLTV_LOCATION_SCRIPT" type="file" label="1014" default="" enable="eq(-3,2)"/>
+    <setting id="XMLTV_LOCATION_SCRIPT" type="file" label="30008" default="" enable="eq(-3,2)"/>
   </category>
-  <category label="1001">
+  <category label="30001">
-    <setting label="1020" type="lsep"/>
+    <setting label="30009" type="lsep"/>
     <setting type="sep" />
-    <setting id="WAIT_FOR_FEINIT" type="bool" label="1022" default="false" />
+    <setting id="WAIT_FOR_FEINIT" type="bool" label="30011" default="false" />
-    <setting id="NUM_ADAPTERS" type="slider" range="1,16" option="int" label="1023" default="1" enable="eq(-1,true)" />
+    <setting id="NUM_ADAPTERS" type="slider" range="1,16" option="int" label="30012" default="1" enable="eq(-1,true)" />
-    <setting id="REMOVE_MODULES" type="text" label="1021" values="" default=""/>
+    <setting id="REMOVE_MODULES" type="text" label="30010" values="" default=""/>
-    <setting id="PRELOAD_CAPMT_CA" type="bool" label="1024" default="false" />
+    <setting id="PRELOAD_CAPMT_CA" type="bool" label="30013" default="false" />
-    <setting id="WORKAROUND_SLEEP" type="bool" label="1025" default="false" />
+    <setting id="WORKAROUND_SLEEP" type="bool" label="30014" default="false" />
-    <setting id="WORKAROUND_SLEEP_TIME" type="slider" range="1,30" option="int" label="1026" default="1" enable="eq(-1,true)" />
+    <setting id="WORKAROUND_SLEEP_TIME" type="slider" range="1,30" option="int" label="30015" default="1" enable="eq(-1,true)" />
   </category>
-  <category label="1002">
+  <category label="30002">
-    <setting label="1030" type="lsep"/>
+    <setting label="30027" type="lsep"/>
     <setting type="sep" />
-    <setting id="DEBUG_LOG" type="bool" label="1032" default="false" />
+    <setting id="DEBUG_LOG" type="bool" label="30029" default="false" />
     <setting type="sep" />
-    <setting id="DEBUG_LOG_PATH" type="text" label="1031" default="/storage/.kodi/userdata/addon_data/service.tvheadend42/debug.txt" enable="eq(-2,true)"/>
+    <setting id="DEBUG_LOG_PATH" type="text" label="30028" default="/storage/.kodi/userdata/addon_data/service.tvheadend42/debug.txt" enable="eq(-2,true)"/>
-    <setting id="DEBUG_LOG_TRACE_1" type="select" default="NONE" visible="eq(-3,true)" enable="eq(-3,true)" label="31032" values="NONE|all|access|api|avahi|bat|bonjour|bouquet|caclient|capmt|channel|charset|config|CPU|cron|csa|cwc|dbus|descrambler|diseqc|dvb|dvbcam|dvr|epg|epgdb|epggrab|esfilter|fastscan|fsmonitor|globalheaders|gtimer|hevc|htsp|htsp-ans|htsp-req|htsp-sub|http|httpc|idnode|imagecache|iptv|iptv-pcr|libav|linuxdvb|lock|main|mkv|mpegts|mtimer|muxer|muxsched|opentv|parser|pass|pat|pmt|profile|psip|pyepg|rtsp|satip|satips|scanfile|service|service-mapper|settings|spawn|subscription|tbl|tbl-atsc|tbl-base|tbl-csa|tbl-eit|tbl-pass|tbl-satip|tbl-time|tcp|thread|time|timeshift|transcode|TS|tsfile|tsfix|tvhdhomerun|tvhpoll|upnp|url|uuid|webui|xmltv" />
+    <setting id="DEBUG_LOG_TRACE_1" type="select" default="NONE" visible="eq(-3,true)" enable="eq(-3,true)" label="30030" values="NONE|all|access|api|avahi|bat|bonjour|bouquet|caclient|capmt|channel|charset|config|CPU|cron|csa|cwc|dbus|descrambler|diseqc|dvb|dvbcam|dvr|epg|epgdb|epggrab|esfilter|fastscan|fsmonitor|globalheaders|gtimer|hevc|htsp|htsp-ans|htsp-req|htsp-sub|http|httpc|idnode|imagecache|iptv|iptv-pcr|libav|linuxdvb|lock|main|mkv|mpegts|mtimer|muxer|muxsched|opentv|parser|pass|pat|pmt|profile|psip|pyepg|rtsp|satip|satips|scanfile|service|service-mapper|settings|spawn|subscription|tbl|tbl-atsc|tbl-base|tbl-csa|tbl-eit|tbl-pass|tbl-satip|tbl-time|tcp|thread|time|timeshift|transcode|TS|tsfile|tsfix|tvhdhomerun|tvhpoll|upnp|url|uuid|webui|xmltv" />
-    <setting id="DEBUG_LOG_TRACE_2" type="select" default="NONE" visible="eq(-4,true)" enable="!eq(-1,NONE)+eq(-4,true)" label="31033" values="NONE|access|api|avahi|bat|bonjour|bouquet|caclient|capmt|channel|charset|config|CPU|cron|csa|cwc|dbus|descrambler|diseqc|dvb|dvbcam|dvr|epg|epgdb|epggrab|esfilter|fastscan|fsmonitor|globalheaders|gtimer|hevc|htsp|htsp-ans|htsp-req|htsp-sub|http|httpc|idnode|imagecache|iptv|iptv-pcr|libav|linuxdvb|lock|main|mkv|mpegts|mtimer|muxer|muxsched|opentv|parser|pass|pat|pmt|profile|psip|pyepg|rtsp|satip|satips|scanfile|service|service-mapper|settings|spawn|subscription|tbl|tbl-atsc|tbl-base|tbl-csa|tbl-eit|tbl-pass|tbl-satip|tbl-time|tcp|thread|time|timeshift|transcode|TS|tsfile|tsfix|tvhdhomerun|tvhpoll|upnp|url|uuid|webui|xmltv" />
+    <setting id="DEBUG_LOG_TRACE_2" type="select" default="NONE" visible="eq(-4,true)" enable="!eq(-1,NONE)+eq(-4,true)" label="30031" values="NONE|access|api|avahi|bat|bonjour|bouquet|caclient|capmt|channel|charset|config|CPU|cron|csa|cwc|dbus|descrambler|diseqc|dvb|dvbcam|dvr|epg|epgdb|epggrab|esfilter|fastscan|fsmonitor|globalheaders|gtimer|hevc|htsp|htsp-ans|htsp-req|htsp-sub|http|httpc|idnode|imagecache|iptv|iptv-pcr|libav|linuxdvb|lock|main|mkv|mpegts|mtimer|muxer|muxsched|opentv|parser|pass|pat|pmt|profile|psip|pyepg|rtsp|satip|satips|scanfile|service|service-mapper|settings|spawn|subscription|tbl|tbl-atsc|tbl-base|tbl-csa|tbl-eit|tbl-pass|tbl-satip|tbl-time|tcp|thread|time|timeshift|transcode|TS|tsfile|tsfix|tvhdhomerun|tvhpoll|upnp|url|uuid|webui|xmltv" />
-    <setting id="DEBUG_LOG_TRACE_3" type="select" default="NONE" visible="eq(-5,true)" enable="!eq(-1,NONE)+!eq(-2,NONE)+eq(-5,true)" label="31034" values="NONE|access|api|avahi|bat|bonjour|bouquet|caclient|capmt|channel|charset|config|CPU|cron|csa|cwc|dbus|descrambler|diseqc|dvb|dvbcam|dvr|epg|epgdb|epggrab|esfilter|fastscan|fsmonitor|globalheaders|gtimer|hevc|htsp|htsp-ans|htsp-req|htsp-sub|http|httpc|idnode|imagecache|iptv|iptv-pcr|libav|linuxdvb|lock|main|mkv|mpegts|mtimer|muxer|muxsched|opentv|parser|pass|pat|pmt|profile|psip|pyepg|rtsp|satip|satips|scanfile|service|service-mapper|settings|spawn|subscription|tbl|tbl-atsc|tbl-base|tbl-csa|tbl-eit|tbl-pass|tbl-satip|tbl-time|tcp|thread|time|timeshift|transcode|TS|tsfile|tsfix|tvhdhomerun|tvhpoll|upnp|url|uuid|webui|xmltv" />
+    <setting id="DEBUG_LOG_TRACE_3" type="select" default="NONE" visible="eq(-5,true)" enable="!eq(-1,NONE)+!eq(-2,NONE)+eq(-5,true)" label="30032" values="NONE|access|api|avahi|bat|bonjour|bouquet|caclient|capmt|channel|charset|config|CPU|cron|csa|cwc|dbus|descrambler|diseqc|dvb|dvbcam|dvr|epg|epgdb|epggrab|esfilter|fastscan|fsmonitor|globalheaders|gtimer|hevc|htsp|htsp-ans|htsp-req|htsp-sub|http|httpc|idnode|imagecache|iptv|iptv-pcr|libav|linuxdvb|lock|main|mkv|mpegts|mtimer|muxer|muxsched|opentv|parser|pass|pat|pmt|profile|psip|pyepg|rtsp|satip|satips|scanfile|service|service-mapper|settings|spawn|subscription|tbl|tbl-atsc|tbl-base|tbl-csa|tbl-eit|tbl-pass|tbl-satip|tbl-time|tcp|thread|time|timeshift|transcode|TS|tsfile|tsfix|tvhdhomerun|tvhpoll|upnp|url|uuid|webui|xmltv" />
-    <setting id="DEBUG_LOG_TRACE_4" type="select" default="NONE" visible="eq(-6,true)" enable="!eq(-1,NONE)+!eq(-2,NONE)+!eq(-3,NONE)+eq(-6,true)" label="31035" values="NONE|access|api|avahi|bat|bonjour|bouquet|caclient|capmt|channel|charset|config|CPU|cron|csa|cwc|dbus|descrambler|diseqc|dvb|dvbcam|dvr|epg|epgdb|epggrab|esfilter|fastscan|fsmonitor|globalheaders|gtimer|hevc|htsp|htsp-ans|htsp-req|htsp-sub|http|httpc|idnode|imagecache|iptv|iptv-pcr|libav|linuxdvb|lock|main|mkv|mpegts|mtimer|muxer|muxsched|opentv|parser|pass|pat|pmt|profile|psip|pyepg|rtsp|satip|satips|scanfile|service|service-mapper|settings|spawn|subscription|tbl|tbl-atsc|tbl-base|tbl-csa|tbl-eit|tbl-pass|tbl-satip|tbl-time|tcp|thread|time|timeshift|transcode|TS|tsfile|tsfix|tvhdhomerun|tvhpoll|upnp|url|uuid|webui|xmltv" />
+    <setting id="DEBUG_LOG_TRACE_4" type="select" default="NONE" visible="eq(-6,true)" enable="!eq(-1,NONE)+!eq(-2,NONE)+!eq(-3,NONE)+eq(-6,true)" label="30033" values="NONE|access|api|avahi|bat|bonjour|bouquet|caclient|capmt|channel|charset|config|CPU|cron|csa|cwc|dbus|descrambler|diseqc|dvb|dvbcam|dvr|epg|epgdb|epggrab|esfilter|fastscan|fsmonitor|globalheaders|gtimer|hevc|htsp|htsp-ans|htsp-req|htsp-sub|http|httpc|idnode|imagecache|iptv|iptv-pcr|libav|linuxdvb|lock|main|mkv|mpegts|mtimer|muxer|muxsched|opentv|parser|pass|pat|pmt|profile|psip|pyepg|rtsp|satip|satips|scanfile|service|service-mapper|settings|spawn|subscription|tbl|tbl-atsc|tbl-base|tbl-csa|tbl-eit|tbl-pass|tbl-satip|tbl-time|tcp|thread|time|timeshift|transcode|TS|tsfile|tsfix|tvhdhomerun|tvhpoll|upnp|url|uuid|webui|xmltv" />
-    <setting id="DEBUG_LOG_TRACE_5" type="select" default="NONE" visible="eq(-7,true)" enable="!eq(-1,NONE)+!eq(-2,NONE)+!eq(-3,NONE)+!eq(-4,NONE)+eq(-7,true)" label="31036" values="NONE|access|api|avahi|bat|bonjour|bouquet|caclient|capmt|channel|charset|config|CPU|cron|csa|cwc|dbus|descrambler|diseqc|dvb|dvbcam|dvr|epg|epgdb|epggrab|esfilter|fastscan|fsmonitor|globalheaders|gtimer|hevc|htsp|htsp-ans|htsp-req|htsp-sub|http|httpc|idnode|imagecache|iptv|iptv-pcr|libav|linuxdvb|lock|main|mkv|mpegts|mtimer|muxer|muxsched|opentv|parser|pass|pat|pmt|profile|psip|pyepg|rtsp|satip|satips|scanfile|service|service-mapper|settings|spawn|subscription|tbl|tbl-atsc|tbl-base|tbl-csa|tbl-eit|tbl-pass|tbl-satip|tbl-time|tcp|thread|time|timeshift|transcode|TS|tsfile|tsfix|tvhdhomerun|tvhpoll|upnp|url|uuid|webui|xmltv" />
+    <setting id="DEBUG_LOG_TRACE_5" type="select" default="NONE" visible="eq(-7,true)" enable="!eq(-1,NONE)+!eq(-2,NONE)+!eq(-3,NONE)+!eq(-4,NONE)+eq(-7,true)" label="30034" values="NONE|access|api|avahi|bat|bonjour|bouquet|caclient|capmt|channel|charset|config|CPU|cron|csa|cwc|dbus|descrambler|diseqc|dvb|dvbcam|dvr|epg|epgdb|epggrab|esfilter|fastscan|fsmonitor|globalheaders|gtimer|hevc|htsp|htsp-ans|htsp-req|htsp-sub|http|httpc|idnode|imagecache|iptv|iptv-pcr|libav|linuxdvb|lock|main|mkv|mpegts|mtimer|muxer|muxsched|opentv|parser|pass|pat|pmt|profile|psip|pyepg|rtsp|satip|satips|scanfile|service|service-mapper|settings|spawn|subscription|tbl|tbl-atsc|tbl-base|tbl-csa|tbl-eit|tbl-pass|tbl-satip|tbl-time|tcp|thread|time|timeshift|transcode|TS|tsfile|tsfix|tvhdhomerun|tvhpoll|upnp|url|uuid|webui|xmltv" />
     <setting type="sep" />
-    <setting id="CUSTOM_START" type="bool" label="1028" default="false" />
+    <setting id="CUSTOM_START" type="bool" label="30016" default="false" />
-    <setting id="CUSTOM_ARGS" type="text" label="1029" default="" enable="eq(-1,true)" />
+    <setting id="CUSTOM_ARGS" type="text" label="30017" default="" enable="eq(-1,true)" />
   </category>
-  <category label="1003">
+  <category label="30003">
-    <setting label="1121" type="lsep"/>
+    <setting label="30035" type="lsep"/>
     <setting type="sep" />
-    <setting id="AVM_SATIP_SERVER" type="bool" label="1110" default="false"/>
+    <setting id="AVM_SATIP_SERVER" type="bool" label="30018" default="false"/>
-    <setting id="AVM_DEVICE" type="labelenum" label="1111" values="AVM_Repeater|AVM_6490" visible="eq(-1,true)"/>
+    <setting id="AVM_DEVICE" type="labelenum" label="30019" values="AVM_Repeater|AVM_6490" visible="eq(-1,true)"/>
-    <setting id="AVM_ROUTER_IP" type="ipaddress" label="1112" default="192.168.178.2" visible="eq(-2,true)+eq(-1,0)"/>
+    <setting id="AVM_ROUTER_IP" type="ipaddress" label="30020" default="192.168.178.2" visible="eq(-2,true)+eq(-1,0)"/>
-    <setting id="AVM_ROUTER_FAKE_IP" type="ipaddress" label="1113" default="192.168.178.254" visible="eq(-3,true)+eq(-2,1)"/>
+    <setting id="AVM_ROUTER_FAKE_IP" type="ipaddress" label="30021" default="192.168.178.254" visible="eq(-3,true)+eq(-2,1)"/>
-    <setting id="AVM_ETH" type="labelenum" label="1114" visible="eq(-4,true)" values="eth0|wlan0|eth1|wlan1" />
+    <setting id="AVM_ETH" type="labelenum" label="30022" visible="eq(-4,true)" values="eth0|wlan0|eth1|wlan1" />
     <setting type="sep" visible="eq(-5,true)"/>
-    <setting id="AVM_IP1" type="ipaddress" label="1115" default="192.168.178.201" visible="eq(-6,true)"/>
+    <setting id="AVM_IP1" type="ipaddress" label="30023" default="192.168.178.201" visible="eq(-6,true)"/>
-    <setting id="AVM_IP2" type="ipaddress" label="1116" default="192.168.178.202" visible="eq(-7,true)"/>
+    <setting id="AVM_IP2" type="ipaddress" label="30024" default="192.168.178.202" visible="eq(-7,true)"/>
-    <setting id="AVM_IP3" type="ipaddress" label="1117" default="192.168.178.203" visible="eq(-8,true)+eq(-7,1)"/>
+    <setting id="AVM_IP3" type="ipaddress" label="30025" default="192.168.178.203" visible="eq(-8,true)+eq(-7,1)"/>
-    <setting id="AVM_IP4" type="ipaddress" label="1118" default="192.168.178.204" visible="eq(-9,true)+eq(-8,1)"/>
+    <setting id="AVM_IP4" type="ipaddress" label="30026" default="192.168.178.204" visible="eq(-9,true)+eq(-8,1)"/>
+  </category>
+  <category label="30036">
+    <setting label="30037" type="lsep"/>
+    <setting id="DOWNLOAD_SCAN_TABLES" type="action" label="30038" option="close" action="RunScript(service.tvheadend42,getscantables)"/>
   </category>
 </settings>

packages/addons/service/tvheadend42/source/settings-default.xml

@@ -1,10 +1,31 @@
-<settings>
+<settings version="2">
-    <setting id="WAIT_FOR_FEINIT" value="false" />
+    <setting id="AVM_DEVICE" default="true"></setting>
-    <setting id="NUM_ADAPTERS" value="1" />
+    <setting id="AVM_ETH" default="true"></setting>
-    <setting id="XMLTV_LOCATION_FILE" value="" />
+    <setting id="AVM_IP1" default="true">192.168.178.201</setting>
-    <setting id="XMLTV_LOCATION_WEB" value="http://" />
+    <setting id="AVM_IP2" default="true">192.168.178.202</setting>
-    <setting id="XMLTV_TYPE" value="NONE" />
+    <setting id="AVM_IP3" default="true">192.168.178.203</setting>
-    <setting id="PRELOAD_CAPMT_CA" value="false" />
+    <setting id="AVM_IP4" default="true">192.168.178.204</setting>
-    <setting id="WORKAROUND_SLEEP" value="false" />
+    <setting id="AVM_ROUTER_FAKE_IP" default="true">192.168.178.254</setting>
-    <setting id="WORKAROUND_SLEEP_TIME" value="1" />
+    <setting id="AVM_ROUTER_IP" default="true">192.168.178.2</setting>
+    <setting id="AVM_SATIP_SERVER" default="true">false</setting>
+    <setting id="CUSTOM_ARGS" default="true"></setting>
+    <setting id="CUSTOM_START" default="true">false</setting>
+    <setting id="DEBUG_LOG" default="true">false</setting>
+    <setting id="DEBUG_LOG_PATH" default="true">/storage/.kodi/userdata/addon_data/service.tvheadend42/debug.txt</setting>
+    <setting id="DEBUG_LOG_TRACE_1" default="true">NONE</setting>
+    <setting id="DEBUG_LOG_TRACE_2" default="true">NONE</setting>
+    <setting id="DEBUG_LOG_TRACE_3" default="true">NONE</setting>
+    <setting id="DEBUG_LOG_TRACE_4" default="true">NONE</setting>
+    <setting id="DEBUG_LOG_TRACE_5" default="true">NONE</setting>
+    <setting id="DOWNLOAD_SCAN_TABLES" default="true"></setting>
+    <setting id="NUM_ADAPTERS">1</setting>
+    <setting id="PRELOAD_CAPMT_CA" default="true">false</setting>
+    <setting id="REMOVE_MODULES" default="true"></setting>
+    <setting id="WAIT_FOR_FEINIT" default="true">false</setting>
+    <setting id="WORKAROUND_SLEEP" default="true">false</setting>
+    <setting id="WORKAROUND_SLEEP_TIME">1</setting>
+    <setting id="XMLTV_LOCATION_FILE" default="true"></setting>
+    <setting id="XMLTV_LOCATION_SCRIPT" default="true"></setting>
+    <setting id="XMLTV_LOCATION_WEB" default="true">http://</setting>
+    <setting id="XMLTV_TYPE" default="true">NONE</setting>
 </settings>

packages/addons/service/tvheadend42/source/sleep.d/tvheadend.power

@@ -1,8 +1,8 @@
 #!/bin/sh
 
 ################################################################################
-#      This file is part of LibreELEC - https://LibreELEC.tv
+#      This file is part of LibreELEC - https://libreelec.tv
-#      Copyright (C) 2016 Team LibreELEC
+#      Copyright (C) 2016-present Team LibreELEC
 #
 #  LibreELEC is free software: you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by