fixes, improved hungarian translation, dependencies, better inputstre…

…am.helper integration, bumped version
yuppity · Sep 12, 2019 · 49abdc1 · 49abdc1
1 parent e3fefcf
commit 49abdc1
Show file tree

Hide file tree

Showing 14 changed files with 81 additions and 31 deletions.
diff --git a/addon.xml b/addon.xml
@@ -1,10 +1,10 @@
-<addon id="plugin.video.hbogoeu" name="HBO GO EU" provider-name="arvvoid" version="2.0.12~beta28">
+<addon id="plugin.video.hbogoeu" name="HBO GO EU" provider-name="arvvoid" version="2.0.13~beta29">
   <requires>
     <import addon="xbmc.python" version="2.25.0" />
     <import addon="script.module.requests" version="2.12.4" />
     <import addon="script.module.pycryptodome" version="3.4.3"/>
-    <import addon="inputstream.adaptive" version="2.3.19" />
-    <import addon="script.module.inputstreamhelper" version="0.3.5" />
+    <import addon="inputstream.adaptive" version="2.3.22" />
+    <import addon="script.module.inputstreamhelper" version="0.4.2" />
   </requires>
   <extension library="main.py" point="xbmc.python.pluginsource">
     <provides>video</provides>
@@ -69,12 +69,18 @@ Minden HBO Go tartalom © 2019 Copyright © 2017 Home Box Office, Inc. Minden jo
     <source>https://github.com/arvvoid/plugin.video.hbogoeu</source>
     <website>https://arvvoid.github.io/plugin.video.hbogoeu</website>
     <news>
+v.2.0.13-beta29
+- updated dependencies
+- minor fixes
+- better integration with inputstream.helper
+- improvements to Hungarian translation (contribution mrthosi)
+
 v.2.0.12-beta28
 - updated dependencies
 - fix listing limit for Hbo Nordic/Spain
 
 v.2.0.11-beta27
-- ttml2srt: add support for timestamp format in seconds.
+- ttml2srt: add support for timestamp format in seconds (contribution of awdAvenger).
 
 v.2.0.10-beta26
 - Removed silent register api (removed on hbo go side)

diff --git a/changelog.md b/changelog.md
@@ -1,9 +1,15 @@
+v.2.0.13-beta29
+- updated dependencies
+- minor fixes
+- better integration with inputstream.helper
+- improvements to Hungarian translation (contribution mrthosi)
+
 v.2.0.12-beta28
 - updated dependencies
 - fix listing limit for Hbo Nordic/Spain
 
 v.2.0.11-beta27
-- ttml2srt: add support for timestamp format in seconds.
+- ttml2srt: add support for timestamp format in seconds (contribution of awdAvenger).
 
 v.2.0.10-beta26
 - Removed silent register api (removed on hbo go side)

diff --git a/hbogolib/base.py b/hbogolib/base.py
@@ -143,10 +143,12 @@ def router(self, arguments):
             self.handler.play(url, content_id)
 
         elif mode == 6: #logout, destry setup
-            from hbogolib.handler import HbogoHandler
-            handler = HbogoHandler(self.handle, self.base_url)
-            handler.del_setup()
-            xbmc.executebuiltin('Container.Refresh')
+            #ask confirm
+            if xbmcgui.Dialog().yesno(self.addon.getAddonInfo('name'), self.language(30692).encode('utf-8')):
+                from hbogolib.handler import HbogoHandler
+                handler = HbogoHandler(self.handle, self.base_url)
+                handler.del_setup()
+                xbmc.executebuiltin('Container.Refresh')
 
         elif mode == 7: #reset session
             from hbogolib.handler import HbogoHandler

diff --git a/hbogolib/handler.py b/hbogolib/handler.py
@@ -18,7 +18,6 @@
 import xbmcgui
 import xbmcplugin
 
-import random
 import uuid
 import base64
 import codecs
@@ -46,7 +45,7 @@ def __init__(self, handle, base_url):
         self.base_url = base_url
         self.handle = handle
         self.DEBUG_ID_STRING = "[" + str(self.addon_id) + "] "
-        self.SESSION_VALIDITY = int(self.addon.getSetting('sessionvalid'))  # stored session valid
+        self.SESSION_VALIDITY = 0.5  # stored session valid for half hour
 
         self.base_addon_cat=""
         self.cur_loc = ""

diff --git a/resources/language/resource.language.cz_cz/strings.po b/resources/language/resource.language.cz_cz/strings.po
@@ -74,8 +74,8 @@ msgid "Chose your operator"
 msgstr "Vyberte operátora"
 
 msgctxt "#30660"
-msgid "Input.Stream/CDM"
-msgstr "Input.Stream/CDM"
+msgid "DRM"
+msgstr "DRM"
 
 msgctxt "#30665"
 msgid "Inputstream Adaptive Settings (max bitrate,resolution,ecc..)"
@@ -272,3 +272,7 @@ msgstr "Ladit"
 msgctxt "#30691"
 msgid "Include sensitive login data in debug log [DON'T POST PUBLICLY]"
 msgstr "Zahrnout citlivá přihlašovací data v ladícím výpisu [NESDÍLEJTE VEŘEJNĚ]"
+
+msgctxt "#30692"
+msgid "Are you sure you want to completely reset your setup (device registration will be lost ) ?"
+msgstr "Are you sure you want to completely reset your setup (device registration will be lost ) ?"
diff --git a/resources/language/resource.language.en_gb/strings.po b/resources/language/resource.language.en_gb/strings.po
@@ -73,7 +73,7 @@ msgid "Chose your operator"
 msgstr ""
 
 msgctxt "#30660"
-msgid "Input.Stream/CDM"
+msgid "DRM"
 msgstr ""
 
 msgctxt "#30665"
@@ -272,4 +272,8 @@ msgstr ""
 
 msgctxt "#30691"
 msgid "Include sensitive login data in debug log [DON'T POST PUBLICLY]"
+msgstr ""
+
+msgctxt "#30692"
+msgid "Are you sure you want to completely reset your setup (device registration will be lost ) ?"
 msgstr ""
diff --git a/resources/language/resource.language.es_es/strings.po b/resources/language/resource.language.es_es/strings.po
@@ -73,8 +73,8 @@ msgid "Chose your operator"
 msgstr "Escoje tu operador"
 
 msgctxt "#30660"
-msgid "Input.Stream/CDM"
-msgstr "Input.Stream/CDM"
+msgid "DRM"
+msgstr "DRM"
 
 msgctxt "#30665"
 msgid "Inputstream Adaptive Settings (max bitrate,resolution,ecc..)"
@@ -267,4 +267,8 @@ msgstr "Depuración"
 
 msgctxt "#30691"
 msgid "Include sensitive login data in debug log [DON'T POST PUBLICLY]"
-msgstr "Incluir datos confidenciales de inicio de sesión en el registro de depuración [NO ENVIAR PÚBLICAMENTE]"
+msgstr "Incluir datos confidenciales de inicio de sesión en el registro de depuración [NO ENVIAR PÚBLICAMENTE]"
+
+msgctxt "#30692"
+msgid "Are you sure you want to completely reset your setup (device registration will be lost ) ?"
+msgstr "Are you sure you want to completely reset your setup (device registration will be lost ) ?"
diff --git a/resources/language/resource.language.fi_fi/strings.po b/resources/language/resource.language.fi_fi/strings.po
@@ -74,8 +74,8 @@ msgid "Chose your operator"
 msgstr "Valitse palveluntarjoaja"
 
 msgctxt "#30660"
-msgid "Input.Stream/CDM"
-msgstr "Input.Stream/CDM"
+msgid "DRM"
+msgstr "DRM"
 
 msgctxt "#30665"
 msgid "Inputstream Adaptive Settings (max bitrate,resolution,ecc..)"
@@ -268,3 +268,7 @@ msgstr "Debug"
 msgctxt "#30691"
 msgid "Include sensitive login data in debug log [DON'T POST PUBLICLY]"
 msgstr "Sisällytä henkilökohtaisia käyttäjätunnuksia debug-logiin [ÄLÄ JULKAISE LOGIA JULKISESTI]"
+
+msgctxt "#30692"
+msgid "Are you sure you want to completely reset your setup (device registration will be lost ) ?"
+msgstr "Are you sure you want to completely reset your setup (device registration will be lost ) ?"
diff --git a/resources/language/resource.language.hr_hr/strings.po b/resources/language/resource.language.hr_hr/strings.po
@@ -79,8 +79,8 @@ msgstr "Odaberite svog operatera"
 
 #: 
 msgctxt "#30660"
-msgid "Input.Stream/CDM"
-msgstr "Input.Stream/CDM"
+msgid "DRM"
+msgstr "DRM"
 
 #: 
 msgctxt "#30665"
@@ -314,3 +314,7 @@ msgstr "DJECA"
 msgctxt "#30730"
 msgid "Weekly Top"
 msgstr "Tjedni vrh"
+
+msgctxt "#30692"
+msgid "Are you sure you want to completely reset your setup (device registration will be lost ) ?"
+msgstr "Are you sure you want to completely reset your setup (device registration will be lost ) ?"
diff --git a/resources/language/resource.language.hu_hu/strings.po b/resources/language/resource.language.hu_hu/strings.po
@@ -79,8 +79,8 @@ msgstr "Válassza ki a szolgáltatót"
 
 #: 
 msgctxt "#30660"
-msgid "Input.Stream/CDM"
-msgstr "Input.Stream/CDM"
+msgid "DRM"
+msgstr "DRM"
 
 #: 
 msgctxt "#30665"
@@ -314,3 +314,7 @@ msgstr "GYEREKEK"
 msgctxt "#30730"
 msgid "Weekly Top"
 msgstr "Heti top"
+
+msgctxt "#30692"
+msgid "Are you sure you want to completely reset your setup (device registration will be lost ) ?"
+msgstr "Are you sure you want to completely reset your setup (device registration will be lost ) ?"
diff --git a/resources/language/resource.language.pl_pl/strings.po b/resources/language/resource.language.pl_pl/strings.po
@@ -91,8 +91,8 @@ msgid "Chose your operator"
 msgstr "Wybierz swojego operatora"
 
 msgctxt "#30660"
-msgid "Input.Stream/CDM"
-msgstr "Input.Stream/CDM"
+msgid "DRM"
+msgstr "DRM"
 
 msgctxt "#30665"
 msgid "Inputstream Adaptive Settings (max bitrate,resolution,ecc..)"
@@ -310,4 +310,8 @@ msgstr "DZIECI"
 
 msgctxt "#30730"
 msgid "Weekly Top"
-msgstr "Tygodniowy top"
+msgstr "Tygodniowy top"
+
+msgctxt "#30692"
+msgid "Are you sure you want to completely reset your setup (device registration will be lost ) ?"
+msgstr "Are you sure you want to completely reset your setup (device registration will be lost ) ?"
diff --git a/resources/language/resource.language.ro_ro/strings.po b/resources/language/resource.language.ro_ro/strings.po
@@ -75,8 +75,8 @@ msgid "Chose your operator"
 msgstr "Alegeți operatorul"
 
 msgctxt "#30660"
-msgid "Input.Stream/CDM"
-msgstr "Input.Stream/CDM"
+msgid "DRM"
+msgstr "DRM"
 
 msgctxt "#30665"
 msgid "Inputstream Adaptive Settings (max bitrate,resolution,ecc..)"
@@ -273,3 +273,7 @@ msgstr "Debug/depanare"
 msgctxt "#30691"
 msgid "Include sensitive login data in debug log [DON'T POST PUBLICLY]"
 msgstr "Include date private de login în logul de debug [NU POSTAȚI PUBLIC]"
+
+msgctxt "#30692"
+msgid "Are you sure you want to completely reset your setup (device registration will be lost ) ?"
+msgstr "Are you sure you want to completely reset your setup (device registration will be lost ) ?"
diff --git a/resources/language/resource.language.se_se/strings.po b/resources/language/resource.language.se_se/strings.po
@@ -74,8 +74,8 @@ msgid "Chose your operator"
 msgstr "Välj leverantör"
 
 msgctxt "#30660"
-msgid "Input.Stream/CDM"
-msgstr "Input.Stream/CDM"
+msgid "DRM"
+msgstr "DRM"
 
 msgctxt "#30665"
 msgid "Inputstream Adaptive Settings (max bitrate,resolution,ecc..)"
@@ -268,3 +268,7 @@ msgstr "Felsökning"
 msgctxt "#30691"
 msgid "Include sensitive login data in debug log [DON'T POST PUBLICLY]"
 msgstr "Inkludera känslig login-data i felsökningsloggen [POSTA INTE DETTA OFFENTLIGT]"
+
+msgctxt "#30692"
+msgid "Are you sure you want to completely reset your setup (device registration will be lost ) ?"
+msgstr "Are you sure you want to completely reset your setup (device registration will be lost ) ?"
diff --git a/resources/settings.xml b/resources/settings.xml
@@ -27,12 +27,13 @@
         <setting label="30666" type="action" id="ishelper_info" action="RunScript(script.module.inputstreamhelper,info)"/>
         <setting label="30667" type="action" id="install_widevine" action="RunScript(script.module.inputstreamhelper,widevine_install)" visible="!system.platform.android"/>
         <setting label="30668" type="action" id="remove_widevine" action="RunScript(script.module.inputstreamhelper, widevine_remove)" visible="!system.platform.android"/>
+        <setting label="" type="lsep"/>
+        <setting label="30669" type="action" id="ishelper_settings" option="close" action="Addon.OpenSettings(script.module.inputstreamhelper)"/>
     </category>
     <!-- Advanced -->
 	<category label="30670">
     <setting label="30671" type="bool" id="forcescrap" default="false"/>
     <setting label="30680" type="lsep"/>
-    <setting label="30681" type="number" id="sessionvalid" default="2"/>
     <setting id="logout" type="action" label="30106" action="RunPlugin(plugin://plugin.video.hbogoeu/?url=logou&mode=7)" option="close"/>
     <setting label="30690" type="lsep"/>
     <setting label="30691" type="bool" id="sensitivedebug" default="false"/>