Add support for Matrix

Removed Python 2 support.

Resolves #42

.travis.yml

@@ -2,8 +2,10 @@ language: python
 
 jobs:
   include:
+    - python: "3.6"
     - python: "3.7"
     - python: "3.8"
+    - python: "3.9"
     - python: "nightly"
   allow_failures:
     - python: "nightly"

Pipfile

@@ -4,15 +4,14 @@ url = "https://pypi.org/simple"
 verify_ssl = true
 
 [dev-packages]
-kodistubs = "*"
+kodistubs = "~=19.0.1"
 pycodestyle = "*"
 
 [packages]
-future = "*"
-requests = "*"
+requests = "~=2.22.0"
 
 [requires]
-python_version = "2.7"
+python_version = "3.6"
 
 [scripts]
 build = "python scripts/build.py"

README.md

@@ -6,6 +6,7 @@
 [![Build Status](https://travis-ci.com/jaylinski/kodi-addon-soundcloud.svg?branch=master)](https://travis-ci.com/jaylinski/kodi-addon-soundcloud)
 [![Link to Kodi forum](https://img.shields.io/badge/Kodi-Forum-informational.svg)](https://forum.kodi.tv/showthread.php?tid=206635)
 [![Link to Kodi wiki](https://img.shields.io/badge/Kodi-Wiki-informational.svg)](https://kodi.wiki/view/Add-on:SoundCloud)
+[![Link to Kodi releases](https://img.shields.io/badge/Kodi-v19%20%22Matrix%22-green.svg)](https://kodi.wiki/view/Releases)
 [![Link to Kodi releases](https://img.shields.io/badge/Kodi-v18%20%22Leia%22-green.svg)](https://kodi.wiki/view/Releases)
 [![Link to Kodi releases](https://img.shields.io/badge/Kodi-v17%20%22Krypton%22-green.svg)](https://kodi.wiki/view/Releases)
 
@@ -66,8 +67,6 @@ Run `pipenv run lint`.
 
 Run `pipenv run test`.
 
-> Requires at least Python 3.6!
-
 ## Roadmap
 
 * Re-implement all features from original add-on

addon.xml

@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<addon id="plugin.audio.soundcloud" name="SoundCloud" version="3.2.0" provider-name="jaylinski">
+<addon id="plugin.audio.soundcloud" name="SoundCloud" version="4.0.0" provider-name="jaylinski">
     <requires>
-        <import addon="xbmc.python" version="2.25.0"/>
-        <import addon="script.module.future" version="0.16.0"/>
-        <import addon="script.module.requests" version="2.4.3"/>
+        <import addon="xbmc.python" version="3.0.0"/>
+        <import addon="script.module.requests" version="2.22.0"/>
     </requires>
     <extension point="xbmc.python.pluginsource" library="addon.py">
         <provides>audio</provides>
@@ -19,10 +18,8 @@
         <forum>https://forum.kodi.tv/showthread.php?tid=206635</forum>
         <website>https://soundcloud.com</website>
         <source>https://github.com/jaylinski/kodi-addon-soundcloud</source>
-        <news>3.2.0 (2020-04-18)
-[fix] Custom client ID won't be overwritten anymore
-[new] Added ability to clear cache in settings
-[new] Track descriptions can now be viewed in info window
+        <news>4.0.0 (2020-12-12)
+Added support for Kodi v19 (Matrix)
         </news>
         <assets>
             <icon>resources/icon.png</icon>

resources/language/resource.language.de_de/strings.po

@@ -41,11 +41,6 @@ msgctxt "#30013"
 msgid "History size"
 msgstr "Größe der Suchhistorie"
 
-# Settings - Advanced
-msgctxt "#30051"
-msgid "Advanced"
-msgstr "Fortgeschritten"
-
 msgctxt "#30060"
 msgid "API v2"
 msgstr "API v2"

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

@@ -41,11 +41,6 @@ msgctxt "#30013"
 msgid "History size"
 msgstr ""
 
-# Settings - Advanced
-msgctxt "#30051"
-msgid "Advanced"
-msgstr ""
-
 msgctxt "#30060"
 msgid "API v2"
 msgstr ""

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

@@ -40,11 +40,6 @@ msgctxt "#30013"
 msgid "History size"
 msgstr "Zoekgeschiedenis grootte"
 
-# Settings - Advanced
-msgctxt "#30051"
-msgid "Advanced"
-msgstr "Geavanceerd"
-
 msgctxt "#30060"
 msgid "API v2"
 msgstr ""

resources/lib/kodi/items.py

@@ -1,6 +1,3 @@
-from future import standard_library
-standard_library.install_aliases()  # noqa: E402
-
 from resources.lib.kodi.utils import format_bold
 from resources.routes import *
 

resources/lib/kodi/vfs.py

@@ -12,19 +12,15 @@ def __init__(self, path):
     def read(self, filename):
         filepath = os.path.join(self.path, filename)
         if xbmcvfs.exists(filepath):
-            file = xbmcvfs.File(filepath)
-            string = file.read()
-            file.close()
-            return string
+            with xbmcvfs.File(filepath) as file:
+                return file.read()
         else:
             return None
 
     def write(self, filename, string):
         filepath = os.path.join(self.path, filename)
-        file = xbmcvfs.File(filepath, "w")
-        success = file.write(string)
-        file.close()
-        return filepath if success else False
+        with xbmcvfs.File(filepath, "w") as file:
+            return filepath if file.write(string) else False
 
     def remove_dir(self, path):
         dir_list, file_list = xbmcvfs.listdir(path)

resources/lib/models/playlist.py

@@ -1,6 +1,3 @@
-from future import standard_library
-standard_library.install_aliases()  # noqa: E402
-
 from resources.lib.models.list_item import ListItem
 import urllib.parse
 import xbmcgui

resources/lib/models/selection.py

@@ -1,6 +1,3 @@
-from future import standard_library
-standard_library.install_aliases()  # noqa: E402
-
 from resources.lib.models.list_item import ListItem
 from resources.routes import *
 import urllib.parse

resources/lib/models/track.py

@@ -1,6 +1,3 @@
-from future import standard_library
-standard_library.install_aliases()  # noqa: E402
-
 from resources.lib.models.list_item import ListItem
 import urllib.parse
 import xbmcaddon

resources/lib/models/user.py

@@ -1,6 +1,3 @@
-from future import standard_library
-standard_library.install_aliases()  # noqa: E402
-
 from resources.lib.models.list_item import ListItem
 from resources.routes import *
 import urllib.parse

resources/lib/soundcloud/api_interface.py

@@ -1,8 +1,7 @@
-from future.utils import with_metaclass
 from abc import ABCMeta, abstractmethod
 
 
-class ApiInterface(with_metaclass(ABCMeta)):
+class ApiInterface(metaclass=ABCMeta):
     @abstractmethod
     def search(self, query, kind): pass
 

resources/lib/soundcloud/api_v2.py

@@ -1,6 +1,3 @@
-from future import standard_library
-standard_library.install_aliases()  # noqa: E402
-
 import hashlib
 import json
 import re

resources/plugin.py

@@ -1,7 +1,3 @@
-from future import standard_library
-from future.utils import PY2
-standard_library.install_aliases()  # noqa: E402
-
 from resources.lib.soundcloud.api_v2 import ApiV2
 from resources.lib.kodi.cache import Cache
 from resources.lib.kodi.items import Items
@@ -16,13 +12,12 @@
 import xbmcaddon
 import xbmcgui
 import xbmcplugin
+import xbmcvfs
 
 addon = xbmcaddon.Addon()
 addon_id = addon.getAddonInfo("id")
 addon_base = "plugin://" + addon_id
-addon_profile_path = xbmc.translatePath(addon.getAddonInfo("profile"))
-if PY2:
-    addon_profile_path = addon_profile_path.decode("utf-8")
+addon_profile_path = xbmcvfs.translatePath(addon.getAddonInfo("profile"))
 vfs = VFS(addon_profile_path)
 vfs_cache = VFS(os.path.join(addon_profile_path, "cache"))
 settings = Settings(addon)