diff --git a/packages/addons/driver/sundtek-mediatv/changelog.txt b/packages/addons/driver/sundtek-mediatv/changelog.txt index 56402f5aee..55258a7c16 100755 --- a/packages/addons/driver/sundtek-mediatv/changelog.txt +++ b/packages/addons/driver/sundtek-mediatv/changelog.txt @@ -1,3 +1,6 @@ +8.0.106 +- updates for Python 3 + 8.0.105 - use new output from mediaclient use xmlstartlet to parse settings.xml file diff --git a/packages/addons/driver/sundtek-mediatv/package.mk b/packages/addons/driver/sundtek-mediatv/package.mk index cc628e50fd..285c68639e 100644 --- a/packages/addons/driver/sundtek-mediatv/package.mk +++ b/packages/addons/driver/sundtek-mediatv/package.mk @@ -4,7 +4,7 @@ PKG_NAME="sundtek-mediatv" PKG_VERSION="7.0" -PKG_REV="105" +PKG_REV="106" PKG_ARCH="any" PKG_LICENSE="nonfree" PKG_SITE="http://support.sundtek.com/" diff --git a/packages/addons/driver/sundtek-mediatv/source/bin/sundtek-update-driver.sh b/packages/addons/driver/sundtek-mediatv/source/bin/sundtek-update-driver.sh index 0893deb465..f4b392ada4 100644 --- a/packages/addons/driver/sundtek-mediatv/source/bin/sundtek-update-driver.sh +++ b/packages/addons/driver/sundtek-mediatv/source/bin/sundtek-update-driver.sh @@ -47,7 +47,7 @@ if [ $? -ne 0 ]; then exit 1 fi -ARCH=$(sed -n 's|.*\.\([^-]*\)-.*|\1|p' /etc/release | tr -d '\n') +ARCH=$(sed -n 's|[^.]*\.\([^-]*\)-.*|\1|p' /etc/release | tr -d '\n') if [ "$ARCH" = "x86_64" ]; then INSTALLER_URL="http://sundtek.de/media/netinst/64bit/installer.tar.gz" elif [ "$ARCH" = "arm" ]; then diff --git a/packages/addons/driver/sundtek-mediatv/source/resources/actions.py b/packages/addons/driver/sundtek-mediatv/source/resources/actions.py index 9a41427130..ce33db6ed4 100644 --- a/packages/addons/driver/sundtek-mediatv/source/resources/actions.py +++ b/packages/addons/driver/sundtek-mediatv/source/resources/actions.py @@ -19,14 +19,14 @@ __update_sh__ = xbmcvfs.translatePath(os.path.join(__cwd__, 'bin', 'sundtek- if len(sys.argv) == 2: if sys.argv[1] == 'refresh_tuners': - print "sundtek refresh tuners" + print('sundtek refresh tuners') sys.path.append(__resources_lib__) from functions import refresh_sundtek_tuners refresh_sundtek_tuners(__settings_xml__, __mediaclient_e__) __settings__.openSettings() elif sys.argv[1] == 'update_driver': - print "sundtek update driver" + print('sundtek update driver') proc = subprocess.Popen([__update_sh__], shell = True) return_code = proc.wait() - print "sundtek update driver return value " + str(return_code) + print('sundtek update driver return value', return_code) __settings__.openSettings() diff --git a/packages/addons/driver/sundtek-mediatv/source/resources/language/English/strings.xml b/packages/addons/driver/sundtek-mediatv/source/resources/language/English/strings.xml deleted file mode 100644 index 91a3520982..0000000000 --- a/packages/addons/driver/sundtek-mediatv/source/resources/language/English/strings.xml +++ /dev/null @@ -1,35 +0,0 @@ - - - General - Extra delay [sec] - Run user script - Enable hardware PID filter - Enable IR receiver - Lowest adapter number (/dev/dvb/adapterX/) - Enable suspend/resume the driver - - Networking - Share local tuner over network - Use network shared tuners - Server 1 IP address - # of tuners - Server 2 IP address - # of tuners - Server 3 IP address - # of tuners - Server 4 IP address - # of tuners - Server 5 IP address - # of tuners - - Tuner settings - Enable modifying settings - >> Refresh tuners <<< ]]> - IR protocol - keymap filename - - Driver - Driver version - Check for new driver version at boot - >> Update driver now <<< ]]> - diff --git a/packages/addons/driver/sundtek-mediatv/source/resources/language/German/strings.xml b/packages/addons/driver/sundtek-mediatv/source/resources/language/German/strings.xml deleted file mode 100644 index 8ff6337d81..0000000000 --- a/packages/addons/driver/sundtek-mediatv/source/resources/language/German/strings.xml +++ /dev/null @@ -1,35 +0,0 @@ - - - Allgemein - Verzögerung bevor Treiber gestartet wird [Sek.] - Skript welches vom Treiber-Stack gestartet werden soll - Hardware PID Filter einschalten - Fernbedienung unterstützen - Niedrigste Adapter Nummer (/dev/dvb/adapterX/) - Suspend / Resume des Treibers zulassen - - Netzwerksupport - Netzwerkserver aktivieren - Mit Netzwerk-Tunern verbinden - Server 1 IP Adresse - # Tuner ID - Server 2 IP Adresse - # Tuner ID - Server 3 IP Adresse - # Tuner ID - Server 4 IP Adresse - # Tuner ID - Server 5 IP Adresse - # Tuner ID - - Geräte Einstellungen - Geräte-Einstellung ändern - >> Tuner-Liste aktualisieren <<< ]]> - IR Protokoll - Keymap Datei - - Treiber - Treiber-Version - Bei Neustart auf neue Treiber-Version prüfen - >> Treiber jetzt aktualisieren <<< ]]> - diff --git a/packages/addons/driver/sundtek-mediatv/source/resources/language/resource.language.de_de/strings.po b/packages/addons/driver/sundtek-mediatv/source/resources/language/resource.language.de_de/strings.po new file mode 100644 index 0000000000..4b95561763 --- /dev/null +++ b/packages/addons/driver/sundtek-mediatv/source/resources/language/resource.language.de_de/strings.po @@ -0,0 +1,134 @@ +# Kodi Media Center language file +# Addon Name: Sundtek MediaTV +# Addon id: driver.dvb.sundtek-mediatv +# Addon Provider: Team LibreELEC +msgid "" +msgstr "" +"Project-Id-Version: Kodi Addons\n" +"Report-Msgid-Bugs-To: https://forum.libreelec.tv\n" +"POT-Creation-Date: 2021-09-02 20:00+CEST\n" +"PO-Revision-Date: 2021-09-02 20:00+CEST\n" +"Last-Translator: vpeter\n" +"Language-Team: Team LibreELEC\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: en_GB\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +msgctxt "#1000" +msgid "General" +msgstr "Allgemein" + +msgctxt "#1014" +msgid "Extra delay [sec]" +msgstr "Verzögerung bevor Treiber gestartet wird [Sek.]" + +msgctxt "#1015" +msgid "Run user script" +msgstr "Skript welches vom Treiber-Stack gestartet werden soll" + +msgctxt "#1030" +msgid "Enable hardware PID filter" +msgstr "Hardware PID Filter einschalten" + +msgctxt "#1035" +msgid "Enable IR receiver" +msgstr "Fernbedienung unterstützen" + +msgctxt "#1040" +msgid "Lowest adapter number (/dev/dvb/adapterX/)" +msgstr "Niedrigste Adapter Nummer (/dev/dvb/adapterX/)" + +msgctxt "#1050" +msgid "Enable suspend/resume the driver" +msgstr "Suspend / Resume des Treibers zulassen" + +msgctxt "#2000" +msgid "Networking" +msgstr "Netzwerksupport" + +msgctxt "#2005" +msgid "Share local tuner over network" +msgstr "Netzwerkserver aktivieren" + +msgctxt "#2010" +msgid "Use network shared tuners" +msgstr "Mit Netzwerk-Tunern verbinden" + +msgctxt "#2020" +msgid "Server 1 IP address" +msgstr "Server 1 IP Adresse" + +msgctxt "#2021" +msgid " # of tuners" +msgstr " # Tuner ID" + +msgctxt "#2030" +msgid "Server 2 IP address" +msgstr "Server 2 IP Adresse" + +msgctxt "#2031" +msgid " # of tuners" +msgstr " # Tuner ID" + +msgctxt "#2040" +msgid "Server 3 IP address" +msgstr "Server 3 IP Adresse" + +msgctxt "#2041" +msgid " # of tuners" +msgstr " # Tuner ID" + +msgctxt "#2050" +msgid "Server 4 IP address" +msgstr "Server 4 IP Adresse" + +msgctxt "#2051" +msgid " # of tuners" +msgstr " # Tuner ID" + +msgctxt "#2060" +msgid "Server 5 IP address" +msgstr "Server 5 IP Adresse" + +msgctxt "#2061" +msgid " # of tuners" +msgstr " # Tuner ID" + +msgctxt "#3000" +msgid "Driver" +msgstr "Treiber" + +msgctxt "#3005" +msgid "Driver version" +msgstr "Treiber-Version" + +msgctxt "#3010" +msgid " >>> Update driver now <<< " +msgstr " >>> Treiber jetzt aktualisieren <<< " + +msgctxt "#3020" +msgid "Check for new driver version at boot" +msgstr "Bei Neustart auf neue Treiber-Version prüfen" + +msgctxt "#9000" +msgid "Tuner settings" +msgstr "Geräte Einstellungen" + +msgctxt "#9005" +msgid "Enable modifying settings" +msgstr "Geräte-Einstellung ändern" + +msgctxt "#9010" +msgid " >>> Refresh tuners <<< " +msgstr " >>> Tuner-Liste aktualisieren <<<" + +msgctxt "#9020" +msgid " IR protocol" +msgstr " IR Protokoll" + +msgctxt "#9030" +msgid " Keymap filename" +msgstr " Keymap Date" + diff --git a/packages/addons/driver/sundtek-mediatv/source/resources/language/resource.language.en_gb/strings.po b/packages/addons/driver/sundtek-mediatv/source/resources/language/resource.language.en_gb/strings.po new file mode 100644 index 0000000000..9396b79a1a --- /dev/null +++ b/packages/addons/driver/sundtek-mediatv/source/resources/language/resource.language.en_gb/strings.po @@ -0,0 +1,134 @@ +# Kodi Media Center language file +# Addon Name: Sundtek MediaTV +# Addon id: driver.dvb.sundtek-mediatv +# Addon Provider: Team LibreELEC +msgid "" +msgstr "" +"Project-Id-Version: Kodi Addons\n" +"Report-Msgid-Bugs-To: https://forum.libreelec.tv\n" +"POT-Creation-Date: 2021-09-02 20:00+CEST\n" +"PO-Revision-Date: 2021-09-02 20:00+CEST\n" +"Last-Translator: vpeter\n" +"Language-Team: Team LibreELEC\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: en_GB\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +msgctxt "#1000" +msgid "General" +msgstr "" + +msgctxt "#1014" +msgid "Extra delay [sec]" +msgstr "" + +msgctxt "#1015" +msgid "Run user script" +msgstr "" + +msgctxt "#1030" +msgid "Enable hardware PID filter" +msgstr "" + +msgctxt "#1035" +msgid "Enable IR receiver" +msgstr "" + +msgctxt "#1040" +msgid "Lowest adapter number (/dev/dvb/adapterX/)" +msgstr "" + +msgctxt "#1050" +msgid "Enable suspend/resume the driver" +msgstr "" + +msgctxt "#2000" +msgid "Networking" +msgstr "" + +msgctxt "#2005" +msgid "Share local tuner over network" +msgstr "" + +msgctxt "#2010" +msgid "Use network shared tuners" +msgstr "" + +msgctxt "#2020" +msgid "Server 1 IP address" +msgstr "" + +msgctxt "#2021" +msgid " # of tuners" +msgstr "" + +msgctxt "#2030" +msgid "Server 2 IP address" +msgstr "" + +msgctxt "#2031" +msgid " # of tuners" +msgstr "" + +msgctxt "#2040" +msgid "Server 3 IP address" +msgstr "" + +msgctxt "#2041" +msgid " # of tuners" +msgstr "" + +msgctxt "#2050" +msgid "Server 4 IP address" +msgstr "" + +msgctxt "#2051" +msgid " # of tuners" +msgstr "" + +msgctxt "#2060" +msgid "Server 5 IP address" +msgstr "" + +msgctxt "#2061" +msgid " # of tuners" +msgstr "" + +msgctxt "#3000" +msgid "Driver" +msgstr "" + +msgctxt "#3005" +msgid "Driver version" +msgstr "" + +msgctxt "#3010" +msgid " >>> Update driver now <<< " +msgstr "" + +msgctxt "#3020" +msgid "Check for new driver version at boot" +msgstr "" + +msgctxt "#9000" +msgid "Tuner settings" +msgstr "" + +msgctxt "#9005" +msgid "Enable modifying settings" +msgstr "" + +msgctxt "#9010" +msgid " >>> Refresh tuners <<< " +msgstr "" + +msgctxt "#9020" +msgid " IR protocol" +msgstr "" + +msgctxt "#9030" +msgid " Keymap filename" +msgstr "" + diff --git a/packages/addons/driver/sundtek-mediatv/source/resources/lib/functions.py b/packages/addons/driver/sundtek-mediatv/source/resources/lib/functions.py index 5a1e871de5..2af49d7521 100644 --- a/packages/addons/driver/sundtek-mediatv/source/resources/lib/functions.py +++ b/packages/addons/driver/sundtek-mediatv/source/resources/lib/functions.py @@ -23,7 +23,7 @@ def settings_restore(settings_xml): try: shutil.copyfile(settings_xml + '_orig', settings_xml) except IOError as e: - print 'Error restoring file:', settings_xml + print('Error restoring file:', settings_xml) ###################################################################################################### # get hdhomerun supported devices on a system (only name like 101ADD2B-0) @@ -37,7 +37,7 @@ def get_devices_hdhomerun(hdhomerun_log): name = name[2].strip() tuners.append(name) except IOError: - print 'Error reading hdhomerun log file', hdhomerun_log + print('Error reading hdhomerun log file', hdhomerun_log) return tuners """ @@ -74,7 +74,7 @@ def get_devices_sundtek(mediaclient_e): if str.startswith('[DVB'): types_arr = tuners[len(tuners)-1][2] - str = str.translate(None, '[]:') + str = str.translate(dict.fromkeys(map(ord, '[]:'), None)) types = str.split(",") for i in range(len(types)): if types[i] == 'DVB-C': @@ -89,7 +89,7 @@ def get_devices_sundtek(mediaclient_e): tuners[len(tuners)-1][2] = types_arr except IOError: - print 'Error getting sundtek tuners info' + print('Error getting sundtek tuners info') return tuners """ @@ -144,7 +144,7 @@ def parse_settings(settings_xml): category = xmldoc.getElementsByTagName('category') return xmldoc except Exception as inst: - print 'Error parse settings file', settings_xml + print('Error parse settings file', settings_xml) return None ###################################################################################################### @@ -274,7 +274,7 @@ def save_settings(settings_xml, xmldoc): xmlpp.pprint(xmldoc.toxml(), output = outputfile, indent=2, width=500) outputfile.close() except IOError: - print 'Error saving file:', settings_xml + print('Error saving file:', settings_xml) settings_restore(settings_xml) ###################################################################################################### @@ -284,7 +284,7 @@ def refresh_hdhomerun_tuners(settings_xml, hdhomerun_log): tuners = get_devices_hdhomerun(hdhomerun_log) xmldoc = parse_settings(settings_xml) if xmldoc == None: - print 'No hdhomerun tuners found' + print('No hdhomerun tuners found') else: remove_old_tuners(xmldoc) add_new_tuners(xmldoc, tuners, 'hdhomerun') @@ -297,7 +297,7 @@ def refresh_sundtek_tuners(settings_xml, mediaclient_e): tuners = get_devices_sundtek(mediaclient_e) xmldoc = parse_settings(settings_xml) if xmldoc == None: - print 'No sundtek tuners found' + print('No sundtek tuners found') else: remove_old_tuners(xmldoc) add_new_tuners(xmldoc, tuners, 'sundtek')