Reorganize settings

This PR implements:
- **Credentials**
  - Username
  - Password
- **Video**
  - Show subtitles
  - Use DRM
- **Interface**
  - Permalink in plot
- **Debug**
  - Inputstream Adaptive settings
  - Clear VRT cookies
  - Log level

README.md

@@ -101,15 +101,15 @@ you can send a message to [our Facebook page](https://facebook.com/kodivrtnu/).
 - Roaming support added (@mediaminister)
 
 #### v1.5.0 (2018-12-27)
- - 720p Livestreams when enabling in settings + having kodi 18 + having widevine.dll present (@mediaminister)
- - Fixed bug where watched icon was not showing in Kodi 18
- - Implemented different way of working with subtitles (@mediaminister)
+- 720p Livestreams when enabling in settings + having kodi 18 + having widevine.dll present (@mediaminister)
+- Fixed bug where watched icon was not showing in Kodi 18
+- Implemented different way of working with subtitles (@mediaminister)
 
 #### v1.4.3 (2018-11-07)
- - Livestreams working again
+- Livestreams working again
 
 #### v1.4.2 (2018-10-11)
- - Changed way of working with urls when a season is refering to href="#"
+- Changed way of working with urls when a season is refering to href="#"
 
 #### v1.4.1 (2018-09-24)
 - Adapted plugin to new vrtnu layout for showing multiple seasons

addon.py

@@ -28,6 +28,11 @@ def router(params_string):
 
     kodi_wrapper = kodiwrapper.KodiWrapper(_ADDON_HANDLE, _ADDON_URL, addon)
 
+    if action == actions.CLEAR_COOKIES:
+        from resources.lib.vrtplayer import tokenresolver
+        token_resolver = tokenresolver.TokenResolver(kodi_wrapper)
+        token_resolver.reset_cookies()
+        return
     if action == actions.LISTING_TVGUIDE:
         from resources.lib.vrtplayer import tvguide
         tv_guide = tvguide.TVGuide(kodi_wrapper)

resources/language/resource.language.en_gb/strings.po

@@ -27,38 +27,50 @@ msgctxt "#30002"
 msgid "Password"
 msgstr "Password"
 
-msgctxt "#30003"
-msgid "Delete cookies"
-msgstr "Delete cookies"
-
 msgctxt "#30010"
-msgid "Subtitles"
-msgstr "Subtitles"
+msgid "Video"
+msgstr "Video"
 
 msgctxt "#30011"
 msgid "Show subtitles when available"
 msgstr "Show subtitles when available"
 
-msgctxt "#30020"
-msgid "DRM"
-msgstr "DRM"
-
-msgctxt "#30021"
+msgctxt "#30012"
 msgid "Use DRM for 720p HD-quality livestreams"
 msgstr "Use DRM for 720p HD-quality livestreams"
 
-msgctxt "#30022"
+msgctxt "#30013"
 msgid "Maximum bandwidth (bits/sec)"
 msgstr "Maximum bandwidth (bits/sec)"
 
-msgctxt "#30030"
-msgid "Advanced"
-msgstr "Advanced"
+msgctxt "#30020"
+msgid "Interface"
+msgstr "Interface"
 
-msgctxt "#30031"
+msgctxt "#30021"
 msgid "Show episode permalink in plot"
 msgstr "Show episode permalink in plot"
 
+msgctxt "#30040"
+msgid "Debug"
+msgstr "Debug"
+
+msgctxt "#30041"
+msgid "InputStream Adaptive settings"
+msgstr "InputStream Adaptive settings"
+
+msgctxt "#30042"
+msgid "Install Widevine (for DRM content)"
+msgstr "Install Widevine (for DRM content)"
+
+msgctxt "#30048"
+msgid "Clear VRT cookies"
+msgstr "Clear VRT cookies"
+
+msgctxt "#30049"
+msgid "Log level"
+msgstr "Log level"
+
 msgctxt "#30051"
 msgid "Login failed!"
 msgstr "Login failed!"
@@ -72,8 +84,8 @@ msgid "This program cannot be played. To view this program outside of Belgium, y
 msgstr "This program cannot be played. To view this program outside of Belgium, you first have to validate a Belgian mobile phone number on the VRT NU website."
 
 msgctxt "#30054"
-msgid "Woops something went wrong, check the log for more details"
-msgstr "Woops something went wrong, check the log for more details"
+msgid "Whoops something went wrong, check the kodi log for more details."
+msgstr "Whoops something went wrong, check the kodi log for more details."
 
 msgctxt "#30055"
 msgid "Please fill in your email address to login."

resources/language/resource.language.nl_nl/strings.po

@@ -28,38 +28,58 @@ msgctxt "#30002"
 msgid "Password"
 msgstr "Wachtwoord"
 
-msgctxt "#30003"
-msgid "Delete cookies"
-msgstr "Verwijder cookies"
-
 msgctxt "#30010"
-msgid "Subtitles"
-msgstr "Ondertiteling"
+msgid "Video"
+msgstr "Video"
 
 msgctxt "#30011"
 msgid "Show subtitles when available"
 msgstr "Toon ondertiteling indien beschikbaar"
 
-msgctxt "#30020"
-msgid "DRM"
-msgstr "DRM"
-
-msgctxt "#30021"
+msgctxt "#30012"
 msgid "Use DRM for 720p HD-quality livestreams"
 msgstr "Gebruik DRM voor de livestreams in 720p HD-kwaliteit"
 
-msgctxt "#30022"
+msgctxt "#30013"
 msgid "Maximum bandwidth (bits/sec)"
 msgstr "Maximale bandbreedte (bits/sec)"
 
-msgctxt "#30030"
-msgid "Advanced"
-msgstr "Geavanceerd"
+msgctxt "#30020"
+msgid "Interface"
+msgstr "Interface"
 
-msgctxt "#30031"
+msgctxt "#30021"
 msgid "Show episode permalink in plot"
 msgstr "Toon aflevering permalink in beschrijving"
 
+msgctxt "#30030"
+msgid "VRT Radio"
+msgstr "VRT Radio"
+
+msgctxt "#30031"
+msgid "Use VRT Radio addon (plugin.audio.vrt.radio)"
+msgstr "Gebruik VRT Radio addon (plugin.audio.vrt.radio)"
+
+msgctxt "#30040"
+msgid "Debug"
+msgstr "Debug"
+
+msgctxt "#30041"
+msgid "InputStream Adaptive settings"
+msgstr "InputStream Adaptive instellingen"
+
+msgctxt "#30042"
+msgid "Install Widevine (for DRM content)"
+msgstr "Installeer Widevine (voor DRM content)"
+
+msgctxt "#30048"
+msgid "Clear VRT cookies"
+msgstr "Verwijder VRT cookies"
+
+msgctxt "#30049"
+msgid "Log level"
+msgstr "Log level"
+
 msgctxt "#30051"
 msgid "Login failed!"
 msgstr "Inloggen mislukt!"
@@ -73,8 +93,8 @@ msgid "This program cannot be played. To view this program outside of Belgium, y
 msgstr "Het programma kan niet afgespeeld worden. Om dit programma buiten België te bekijken moet je eerst een Belgisch gsm-nummer valideren via de VRT NU-website."
 
 msgctxt "#30054"
-msgid "Woops something went wrong, check the log for more details"
-msgstr "Oeps, er ging iets mis, check de log voor meer informatie"
+msgid "Whoops something went wrong, check the kodi log for more details."
+msgstr "Oeps, er ging iets mis, check de kodi log voor meer informatie."
 
 msgctxt "#30055"
 msgid "Please fill in your email address to login."

resources/lib/vrtplayer/actions.py

@@ -5,6 +5,7 @@
 from __future__ import absolute_import, division, unicode_literals
 
 
+CLEAR_COOKIES = 'clearcookies'
 LISTING_AZ_TVSHOWS = 'listingaztvshows'
 LISTING_CATEGORIES = 'listingcategories'
 LISTING_CATEGORY_TVSHOWS = 'listingcategorytvshows'
@@ -13,5 +14,4 @@
 LISTING_LIVE = 'listinglive'
 LISTING_RECENT = 'listingrecent'
 LISTING_TVGUIDE = 'listingtvguide'
-
 PLAY = 'play'

resources/settings.xml

@@ -1,28 +1,21 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <settings>
-    <category label="30000">
+    <category label="30000"> <!-- Credentials -->
         <setting label="30001" type="text" id="username"/>
         <setting label="30002" type="text" id="password" option="hidden"/>
     </category>
-    <category label="30010">
+    <category label="30010"> <!-- Video -->
         <setting label="30011" type="bool" id="showsubtitles" default="true"/>
+        <setting label="30012" type="bool" id="usedrm" default="false"/>
+        <!-- setting label="14041" type="select" id="max_bandwidth" help="36386" default="0" values="0|256|512|1024|1536|2048|2560|3072|4096|6144|8192|10240|15360|20480|25600|30720"/ -->
     </category>
-    <category label="30020">
-        <setting label="30021" type="bool" id="usedrm" default="false"/>
-        <setting label="14041" type="number" id="max_bandwidth" help="36386">
-          <level>1</level>
-          <default>0</default>
-          <constraints>
-            <minimum label="351">0</minimum>
-            <step>512</step>
-            <maximum>102400</maximum>
-          </constraints>
-          <control type="list" format="string">
-            <formatlabel>14048</formatlabel>
-          </control>
-        </setting>
+    <category label="30020"> <!-- Interface -->
+        <setting label="30021" type="bool" id="showpermalink" default="false"/>
     </category>
-    <category label="30030">
-        <setting label="30031" type="bool" id="showpermalink" default="false"/>
+    <category label="30040"> <!-- Troubleshooting -->
+        <setting label="30041" type="action" id="adaptive_settings" option="close" action="Addon.OpenSettings(inputstream.adaptive)" enable="System.HasAddon(inputstream.adaptive)"/>
+        <!-- setting label="30042" type="action" id="widevine_install" option="close" action="RunPlugin(plugin://plugin.video.vrt.nu?action=installwidevine)" enable="System.HasAddon(script.module.inputstreamhelper)"/ -->
+        <setting label="30048" type="action" id="clear_tokens" action="RunPlugin(plugin://plugin.video.vrt.nu/?action=clearcookies)"/>
+        <setting label="30049" type="select" id="log_level" values="Info|Verbose|Debug" default="Info"/>
     </category>
 </settings>