Rework to use new authentication, remove broken features. (#311)

* Rework to use new authentication, remove broken features.

Author: michaelarnauts

.env.example

@@ -1,6 +1,4 @@
-ADDON_USERNAME=
-ADDON_PASSWORD=
-ADDON_PROFILE=
+ADDON_TOKEN=
 
 KODI_HOME=tests/home
 KODI_INTERACTIVE=0

.gitattributes

@@ -1,9 +1,10 @@
 .env.example export-ignore
 .github/ export-ignore
-tests/ export-ignore
 .gitattributes export-ignore
 .gitignore export-ignore
 .pylintrc export-ignore
 codecov.yml export-ignore
 Makefile export-ignore
 requirements.txt export-ignore
+scripts/ export-ignore
+tests/ export-ignore

.github/workflows/ci.yml

@@ -15,17 +15,18 @@ jobs:
       fail-fast: false
       matrix:
         os: [ ubuntu-latest ]
-        python-version: [ 2.7, 3.5, 3.6, 3.7, 3.8, 3.9 ]
-        include:
-          # Kodi Leia on Windows uses a bundled Python 2.7.
-          - os: windows-latest
-            python-version: 2.7
-
-          # Kodi Matrix on Windows uses a bundled Python 3.8, but we test 3.9 also to be sure.
-          - os: windows-latest
-            python-version: 3.8
-          - os: windows-latest
-            python-version: 3.9
+        python-version: [ 3.9 ]
+#        python-version: [ 2.7, 3.5, 3.6, 3.7, 3.8, 3.9 ]
+#        include:
+#          # Kodi Leia on Windows uses a bundled Python 2.7.
+#          - os: windows-latest
+#            python-version: 2.7
+#
+#          # Kodi Matrix on Windows uses a bundled Python 3.8, but we test 3.9 also to be sure.
+#          - os: windows-latest
+#            python-version: 3.8
+#          - os: windows-latest
+#            python-version: 3.9
     steps:
       - name: Check out ${{ github.sha }} from repository ${{ github.repository }}
         uses: actions/checkout@v2

.pylintrc

@@ -22,3 +22,4 @@ disable=
 
     super-with-arguments, # Python 2.7 compatibility
     raise-missing-from, # Python 2.7 compatibility
+    consider-using-f-string, # Python 2.7 compatibility

Makefile

@@ -30,8 +30,9 @@ check-pylint:
 check-translations:
 	@printf ">>> Running translation checks\n"
 	@$(foreach lang,$(languages), \
-		msgcmp resources/language/resource.language.$(lang)/strings.po resources/language/resource.language.en_gb/strings.po; \
+		msgcmp --use-untranslated resources/language/resource.language.$(lang)/strings.po resources/language/resource.language.en_gb/strings.po; \
 	)
+	@scripts/check_for_unused_translations.py
 
 check-addon: clean build
 	@printf ">>> Running addon checks\n"

README.md

@@ -21,9 +21,7 @@ De volgende features worden ondersteund:
 * Bekijk en speel rechtstreeks vanaf de TV gids
 * Doorzoek de catalogus
 * Bekijk YouTube-filmpjes van enkele DPG Media kanalen
-* Gebruikersprofielen (VTM GO of VTM GO Kids)
 * Integratie met [IPTV Manager](https://github.com/add-ons/service.iptv.manager)
-* Integratie met Kodi bibliotheek
 
 ## Screenshots
 

addon.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<addon id="plugin.video.vtm.go" name="VTM GO" version="1.2.12" provider-name="Michaël Arnauts">
+<addon id="plugin.video.vtm.go" name="VTM GO" version="1.3.0" provider-name="Michaël Arnauts">
     <requires>
         <import addon="xbmc.python" version="2.26.0"/>
         <import addon="script.module.dateutil" version="2.6.0"/>
@@ -12,8 +12,6 @@
     </requires>
     <extension point="xbmc.python.pluginsource" library="addon_entry.py">
         <provides>video</provides>
-        <medialibraryscanpath content="movies">library/movies/</medialibraryscanpath>
-        <medialibraryscanpath content="tvshows">library/tvshows/</medialibraryscanpath>
     </extension>
     <extension point="xbmc.service" library="service_entry.py"/>
     <extension point="xbmc.addon.metadata">
@@ -25,8 +23,8 @@
         <disclaimer lang="nl_NL">Deze add-on wordt niet ondersteund door DPG Media en wordt aangeboden 'as is', zonder enige garantie. De VTM GO naam, VTM GO logo en de kanaallogo's zijn eigendom van DPG Media en worden gebruikt in overeenstemming met de fair use policy.</disclaimer>
         <platform>all</platform>
         <license>GPL-3.0-only</license>
-	<news>v1.2.12 (2021-09-08)
-- Fix playback of VOD content.</news>
+	<news>v1.3 (XXXX-XX-XX)
+- Rewrite authentication, update API and remove broken features.</news>
         <source>https://github.com/add-ons/plugin.video.vtm.go</source>
         <assets>
             <icon>resources/icon.png</icon>

requirements.txt

@@ -8,5 +8,6 @@ python-dateutil
 pysocks
 requests
 git+git://github.com/dagwieers/kodi-plugin-routing.git@setup#egg=routing
+mock
 sakee
 win-inet-pton; platform_system=="Windows"

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

@@ -5,15 +5,7 @@ msgstr ""
 "Language: en\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-### MENUS
-msgctxt "#30001"
-msgid "A-Z"
-msgstr ""
-
-msgctxt "#30002"
-msgid "Alphabetically sorted list of programs"
-msgstr ""
-
+# MENUS
 msgctxt "#30003"
 msgid "Movies"
 msgstr ""
@@ -46,22 +38,10 @@ msgctxt "#30010"
 msgid "Search the VTM GO catalogue"
 msgstr ""
 
-msgctxt "#30011"
-msgid "Switch Profile ([B]{profile}[/B])"
-msgstr ""
-
-msgctxt "#30012"
-msgid "Select a different profile to use"
-msgstr ""
-
 msgctxt "#30013"
 msgid "TV guide"
 msgstr ""
 
-msgctxt "#30014"
-msgid "Browse the TV Guide"
-msgstr ""
-
 msgctxt "#30015"
 msgid "Recommendations"
 msgstr ""
@@ -95,11 +75,7 @@ msgid "Show the VTM GO recommendations for Kids"
 msgstr ""
 
 
-### SUBMENUS
-msgctxt "#30051"
-msgid "Watch [B]{channel}[/B]"
-msgstr ""
-
+# SUBMENUS
 msgctxt "#30052"
 msgid "Watch live [B]{channel}[/B]"
 msgstr ""
@@ -112,21 +88,8 @@ msgctxt "#30054"
 msgid "Browse the TV Guide for [B]{channel}[/B]"
 msgstr ""
 
-msgctxt "#30055"
-msgid "Catalog for [B]{channel}[/B]"
-msgstr ""
-
-msgctxt "#30056"
-msgid "Browse the Catalog for [B]{channel}[/B]"
-msgstr ""
-
-msgctxt "#30057"
-msgid "Select Profile"
-msgstr ""
-
-
-### CONTEXT MENU
 
+# CONTEXT MENU
 msgctxt "#30100"
 msgid "Add to My List"
 msgstr ""
@@ -143,32 +106,12 @@ msgctxt "#30103"
 msgid "Watch Live"
 msgstr ""
 
-msgctxt "#30104"
-msgid "TV Guide"
-msgstr ""
-
 msgctxt "#30105"
 msgid "Play from Catalog"
 msgstr ""
 
 
-### CODE
-msgctxt "#30200"
-msgid "Using a SOCKS proxy requires the PySocks library (script.module.pysocks) installed."
-msgstr ""
-
-msgctxt "#30201"
-msgid "[B][COLOR lightblue]Kids zone[/COLOR][/B]"
-msgstr ""
-
-msgctxt "#30202"
-msgid "Credentials are correct!"
-msgstr ""
-
-msgctxt "#30203"
-msgid "Your credentials are not valid!"
-msgstr ""
-
+# CODE
 msgctxt "#30204"
 msgid "All seasons"
 msgstr ""
@@ -213,20 +156,12 @@ msgctxt "#30214"
 msgid "[B]Next:[/B] {start} - {end}\n» {title}"
 msgstr ""
 
-msgctxt "#30215"
-msgid "Browse the TV-Guide of [B]{channel}[/B]"
-msgstr ""
-
 msgctxt "#30216"
 msgid "All ages"
 msgstr ""
 
 
-### Dates
-msgctxt "#30300"
-msgid "2 days ago"
-msgstr ""
-
+# Dates
 msgctxt "#30301"
 msgid "Yesterday"
 msgstr ""
@@ -239,26 +174,18 @@ msgctxt "#30303"
 msgid "Tomorrow"
 msgstr ""
 
-msgctxt "#30304"
-msgid "In 2 days"
-msgstr ""
-
 
-### MESSAGES
+# MESSAGES
 msgctxt "#30701"
-msgid "You need to configure your credentials before you can access the content of VTM GO. Do you want to enter them now?"
+msgid "Go to {url} on another device and enter use code [B]{code}[/B] when logging in."
 msgstr ""
 
 msgctxt "#30702"
-msgid "Unknown error while logging in: {code}"
+msgid "This device is successfully logged in to the VTM Go Service."
 msgstr ""
 
 msgctxt "#30703"
-msgid "Your account has no profiles defined. Please login on vtm.be/vtmgo and create a profile."
-msgstr ""
-
-msgctxt "#30704"
-msgid "This video may be geo-blocked, or your account is already being used currently."
+msgid "The login code has expired. Please try again."
 msgstr ""
 
 msgctxt "#30705"
@@ -293,18 +220,6 @@ msgctxt "#30713"
 msgid "The requested video was not found in the guide."
 msgstr ""
 
-msgctxt "#30714"
-msgid "Local metadata is cleared."
-msgstr ""
-
-msgctxt "#30715"
-msgid "Updating metadata..."
-msgstr ""
-
-msgctxt "#30716"
-msgid "Updating metadata ({index}/{total})..."
-msgstr ""
-
 msgctxt "#30717"
 msgid "This program is not available in the VTM GO catalogue."
 msgstr ""
@@ -314,35 +229,7 @@ msgid "The Manifest proxy is not running. Please restart Kodi."
 msgstr ""
 
 
-### SETTINGS
-msgctxt "#30800"
-msgid "Credentials"
-msgstr ""
-
-msgctxt "#30801"
-msgid "Credentials"
-msgstr ""
-
-msgctxt "#30803"
-msgid "Email address"
-msgstr ""
-
-msgctxt "#30805"
-msgid "Password"
-msgstr ""
-
-msgctxt "#30809"
-msgid "Profile"
-msgstr ""
-
-msgctxt "#30810"
-msgid "Always use the current profile"
-msgstr ""
-
-msgctxt "#30811"
-msgid "Current profile"
-msgstr ""
-
+# SETTINGS
 msgctxt "#30820"
 msgid "Interface"
 msgstr ""
@@ -359,22 +246,6 @@ msgctxt "#30826"
 msgid "Show Continue watching"
 msgstr ""
 
-msgctxt "#30827"
-msgid "Metadata"
-msgstr ""
-
-msgctxt "#30829"
-msgid "Periodically refresh metadata in the background"
-msgstr ""
-
-msgctxt "#30831"
-msgid "Update local metadata now…"
-msgstr ""
-
-msgctxt "#30833"
-msgid "Clear local metadata…"
-msgstr ""
-
 msgctxt "#30840"
 msgid "Playback"
 msgstr ""
@@ -431,46 +302,6 @@ msgctxt "#30869"
 msgid "IPTV Manager settings…"
 msgstr ""
 
-msgctxt "#30870"
-msgid "Kodi Library"
-msgstr ""
-
-msgctxt "#30871"
-msgid "Indexing"
-msgstr ""
-
-msgctxt "#30872"
-msgid "Add video locations to the Kodi Library… [COLOR gray](See README.md)[/COLOR]"
-msgstr ""
-
-msgctxt "#30873"
-msgid "Index the following movies"
-msgstr ""
-
-msgctxt "#30874"
-msgid "Index the following series"
-msgstr ""
-
-msgctxt "#30875"
-msgid "Full catalog"
-msgstr ""
-
-msgctxt "#30876"
-msgid "Items on 'My List' only"
-msgstr ""
-
-msgctxt "#30877"
-msgid "Maintenance"
-msgstr ""
-
-msgctxt "#30878"
-msgid "Refresh Library…"
-msgstr ""
-
-msgctxt "#30879"
-msgid "Clean Library…"
-msgstr ""
-
 msgctxt "#30880"
 msgid "Expert"
 msgstr ""