Initial Matrix Compatible commit

addon.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<addon id="plugin.audio.subsonic" name="Subsonic" version="2.0.8" provider-name="BasilFX,grosbouff,silascutler,Heruwar">
+<addon id="plugin.audio.subsonic" name="Subsonic" version="2.1.0" provider-name="BasilFX,grosbouff,silascutler,Heruwar,warwickh">
 <requires>
-    <import addon="xbmc.python" version="2.14.0"/>
+    <import addon="xbmc.python" version="3.0.0"/>
     <import addon="script.module.dateutil" version="2.4.2"/>
 </requires>
 <extension point="xbmc.python.pluginsource" library="main.py">
@@ -32,6 +32,10 @@
             Beihilfe ist Willkommen:
             https://github.com/gordielachance/plugin.audio.subsonic
         </description>
+        <assets>
+            <icon>icon.png</icon>
+            <fanart>icon.jpg</fanart>
+        </assets>
         <disclaimer lang="en"></disclaimer>
         <language>multi</language>
         <platform>all</platform>

lib/libsonic/__init__.py

@@ -1,32 +1,24 @@
 """
 This file is part of py-sonic.
-
 py-sonic is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation, either version 3 of the License, or
 (at your option) any later version.
-
 py-sonic is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
-
 You should have received a copy of the GNU General Public License
 along with py-sonic.  If not, see <http://www.gnu.org/licenses/>
-
 For information on method calls, see 'pydoc libsonic.connection'
-
 ----------
 Basic example:
 ----------
-
 import libsonic
-
 conn = libsonic.Connection('http://localhost' , 'admin' , 'password')
 print conn.ping()
-
 """
 
-from connection import *
+from .connection import *
 
-__version__ = '0.6.2'
+__version__ = '0.7.9'

lib/libsonic/connection.py

@@ -15,23 +15,28 @@ You should have received a copy of the GNU General Public License
 along with py-sonic.  If not, see <http://www.gnu.org/licenses/>
 """
 
-from urllib import urlencode
+from libsonic.errors import *
-from .errors import *
-from pprint import pprint
-from cStringIO import StringIO
 from netrc import netrc
 from hashlib import md5
-import json, urllib2, httplib, logging, socket, ssl, sys, os
+import urllib.request
+import urllib.error
+from http import client as http_client
+from urllib.parse import urlencode
+from io import StringIO
 
-API_VERSION = '1.14.0'
+import json
+import logging
+import socket
+import ssl
+import sys
+import os
+import xbmc
+
+API_VERSION = '1.16.1'
 
 logger = logging.getLogger(__name__)
 
-class HTTPSConnectionChain(httplib.HTTPSConnection):
+class HTTPSConnectionChain(http_client.HTTPSConnection):
-    _preferred_ssl_protos = sorted([ p for p in dir(ssl)
-        if p.startswith('PROTOCOL_') ], reverse=True)
-    _ssl_working_proto = None
-
     def _create_sock(self):
         sock = socket.create_connection((self.host, self.port), self.timeout)
         if self._tunnel_host:
@@ -40,38 +45,21 @@ class HTTPSConnectionChain(httplib.HTTPSConnection):
         return sock
 
     def connect(self):
-        if self._ssl_working_proto is not None:
+        sock = self._create_sock()
-            # If we have a working proto, let's use that straight away
+        try:
-            logger.debug("Using known working proto: '%s'",
+            self.sock = ssl.create_default_context().wrap_socket(sock,
-                         self._ssl_working_proto)
+                server_hostname=self.host)
-            sock = self._create_sock()
+        except:
-            self.sock = ssl.wrap_socket(sock, self.key_file, self.cert_file,
+            sock.close()
-                ssl_version=self._ssl_working_proto)
-            return
 
-        # Try connecting via the different SSL protos in preference order
+class HTTPSHandlerChain(urllib.request.HTTPSHandler):
-        for proto_name in self._preferred_ssl_protos:
-            sock = self._create_sock()
-            proto = getattr(ssl, proto_name, None)
-            try:
-                self.sock = ssl.wrap_socket(sock, self.key_file, self.cert_file,
-                    ssl_version=proto)
-            except:
-                sock.close()
-            else:
-                # Cache the working ssl version
-                HTTPSConnectionChain._ssl_working_proto = proto
-                break
-
-
-class HTTPSHandlerChain(urllib2.HTTPSHandler):
     def https_open(self, req):
         return self.do_open(HTTPSConnectionChain, req)
 
 # install opener
-urllib2.install_opener(urllib2.build_opener(HTTPSHandlerChain()))
+urllib.request.install_opener(urllib.request.build_opener(HTTPSHandlerChain()))
 
-class PysHTTPRedirectHandler(urllib2.HTTPRedirectHandler):
+class PysHTTPRedirectHandler(urllib.request.HTTPRedirectHandler):
     """
     This class is used to override the default behavior of the
     HTTPRedirectHandler, which does *not* redirect POST data
@@ -81,24 +69,30 @@ class PysHTTPRedirectHandler(urllib2.HTTPRedirectHandler):
         if (code in (301, 302, 303, 307) and m in ("GET", "HEAD")
             or code in (301, 302, 303) and m == "POST"):
             newurl = newurl.replace(' ', '%20')
-            newheaders = dict((k, v) for k, v in req.headers.items()
+            newheaders = dict((k, v) for k, v in list(req.headers.items())
                 if k.lower() not in ("content-length", "content-type")
             )
             data = None
-            if req.has_data():
+            if req.data:
-                data = req.get_data()
+                data = req.data
-            return urllib2.Request(newurl,
+            return urllib.request.Request(newurl,
                            data=data,
                            headers=newheaders,
-                           origin_req_host=req.get_origin_req_host(),
+                           origin_req_host=req.origin_req_host,
                            unverifiable=True)
         else:
-            raise urllib2.HTTPError(req.get_full_url(), code, msg, headers, fp)
+            raise urllib.error.HTTPError(
+                req.get_full_url(),
+                code,
+                msg,
+                headers,
+                fp,
+            )
 
 class Connection(object):
     def __init__(self, baseUrl, username=None, password=None, port=4040,
             serverPath='/rest', appName='py-sonic', apiVersion=API_VERSION,
-            insecure=False, useNetrc=None, legacyAuth=False, useGET=False):
+            insecure=False, useNetrc=None, legacyAuth=False, useGET=True):
         """
         This will create a connection to your subsonic server
 
@@ -236,6 +230,8 @@ class Connection(object):
         viewName = '%s.view' % methodName
 
         req = self._getRequest(viewName)
+        #res = self._doInfoReq(req)
+        #xbmc.log(res,xbmc.LOGINFO)
         try:
             res = self._doInfoReq(req)
         except:
@@ -271,6 +267,52 @@ class Connection(object):
         self._checkStatus(res)
         return res
 
+    def getScanStatus(self):
+        """
+        since: 1.15.0
+
+        returns the current status for media library scanning.
+        takes no extra parameters.
+
+        returns a dict like the following:
+
+        {'status': 'ok', 'version': '1.15.0',
+        'scanstatus': {'scanning': true, 'count': 4680}}
+
+        'count' is the total number of items to be scanned
+        """
+        methodName = 'getScanStatus'
+        viewName = '%s.view' % methodName
+
+        req = self._getRequest(viewName)
+        res = self._doInfoReq(req)
+        self._checkStatus(res)
+        return res
+
+    def startScan(self):
+        """
+        since: 1.15.0
+
+        Initiates a rescan of the media libraries.
+        Takes no extra parameters.
+
+        returns a dict like the following:
+
+        {'status': 'ok', 'version': '1.15.0',
+        'scanstatus': {'scanning': true, 'count': 0}}
+
+        'scanning' changes to false when a scan is complete
+        'count' starts a 0 and ends at the total number of items scanned
+
+        """
+        methodName = 'startScan'
+        viewName = '%s.view' % methodName
+
+        req = self._getRequest(viewName)
+        res = self._doInfoReq(req)
+        self._checkStatus(res)
+        return res
+
     def getMusicFolders(self):
         """
         since: 1.0.0
@@ -344,7 +386,7 @@ class Connection(object):
                                 artists for the given folder ID from
                                 the getMusicFolders call
         ifModifiedSince:int     If specified, return a result if the artist
-                                collection has changed since the given 
+                                collection has changed since the given
                                 unix timestamp
 
         Returns a dict like the following:
@@ -809,6 +851,57 @@ class Connection(object):
             self._checkStatus(res)
         return res
 
+    def streamUrl(self, sid, maxBitRate=0, tformat=None, timeOffset=None,
+            size=None, estimateContentLength=False, converted=False):
+        """
+        since: 1.0.0
+
+        Downloads a given music file.
+
+        sid:str         The ID of the music file to download.
+        maxBitRate:int  (since: 1.2.0) If specified, the server will
+                        attempt to limit the bitrate to this value, in
+                        kilobits per second. If set to zero (default), no limit
+                        is imposed. Legal values are: 0, 32, 40, 48, 56, 64,
+                        80, 96, 112, 128, 160, 192, 224, 256 and 320.
+        tformat:str     (since: 1.6.0) Specifies the target format
+                        (e.g. "mp3" or "flv") in case there are multiple
+                        applicable transcodings (since: 1.9.0) You can use
+                        the special value "raw" to disable transcoding
+        timeOffset:int  (since: 1.6.0) Only applicable to video
+                        streaming.  Start the stream at the given
+                        offset (in seconds) into the video
+        size:str        (since: 1.6.0) The requested video size in
+                        WxH, for instance 640x480
+        estimateContentLength:bool  (since: 1.8.0) If set to True,
+                                    the HTTP Content-Length header
+                                    will be set to an estimated
+                                    value for trancoded media
+        converted:bool  (since: 1.14.0) Only applicable to video streaming.
+                        Subsonic can optimize videos for streaming by
+                        converting them to MP4. If a conversion exists for
+                        the video in question, then setting this parameter
+                        to "true" will cause the converted video to be
+                        returned instead of the original.
+
+        Returns the file-like object for reading or raises an exception
+        on error
+        """
+        methodName = 'stream'
+        viewName = '%s.view' % methodName
+
+        q = self._getQueryDict({'id': sid, 'maxBitRate': maxBitRate,
+            'format': tformat, 'timeOffset': timeOffset, 'size': size,
+            'estimateContentLength': estimateContentLength,
+            'converted': converted})
+
+        req = self._getRequest(viewName, q)
+        res = self._doBinReq(req)
+        if isinstance(res, dict):
+            self._checkStatus(res)
+        return req.full_url
+
+
     def getCoverArt(self, aid, size=None):
         """
         since: 1.0.0
@@ -827,11 +920,37 @@ class Connection(object):
         q = self._getQueryDict({'id': aid, 'size': size})
 
         req = self._getRequest(viewName, q)
+        xbmc.log("Is this what I need? %s"%str(req.full_url),xbmc.LOGINFO)
         res = self._doBinReq(req)
         if isinstance(res, dict):
             self._checkStatus(res)
         return res
 
+    def getCoverArtUrl(self, aid, size=None):
+        """
+        since: 1.0.0
+
+        Returns a cover art image
+
+        aid:str     ID string for the cover art image to download
+        size:int    If specified, scale image to this size
+
+        Returns the file-like object for reading or raises an exception
+        on error
+        """
+        methodName = 'getCoverArt'
+        viewName = '%s.view' % methodName
+
+        q = self._getQueryDict({'id': aid, 'size': size})
+
+        req = self._getRequest(viewName, q)
+        xbmc.log("Is this what I need? %s"%str(req.full_url),xbmc.LOGINFO)
+        res = self._doBinReq(req)
+        if isinstance(res, dict):
+            self._checkStatus(res)
+        return req.full_url
+
+
     def scrobble(self, sid, submission=True, listenTime=None):
         """
         since: 1.5.0
@@ -980,7 +1099,7 @@ class Connection(object):
             streamRole=True, jukeboxRole=False, downloadRole=False,
             uploadRole=False, playlistRole=False, coverArtRole=False,
             commentRole=False, podcastRole=False, shareRole=False,
-            musicFolderId=None):
+            videoConversionRole=False, musicFolderId=None):
         """
         since: 1.1.0
 
@@ -1011,6 +1130,7 @@ class Connection(object):
             'uploadRole': uploadRole, 'playlistRole': playlistRole,
             'coverArtRole': coverArtRole, 'commentRole': commentRole,
             'podcastRole': podcastRole, 'shareRole': shareRole,
+            'videoConversionRole': videoConversionRole,
             'musicFolderId': musicFolderId
         })
 
@@ -1024,7 +1144,7 @@ class Connection(object):
             streamRole=True, jukeboxRole=False, downloadRole=False,
             uploadRole=False, playlistRole=False, coverArtRole=False,
             commentRole=False, podcastRole=False, shareRole=False,
-            musicFolderId=None, maxBitRate=0):
+            videoConversionRole=False, musicFolderId=None, maxBitRate=0):
         """
         since 1.10.1
 
@@ -1056,6 +1176,7 @@ class Connection(object):
             'uploadRole': uploadRole, 'playlistRole': playlistRole,
             'coverArtRole': coverArtRole, 'commentRole': commentRole,
             'podcastRole': podcastRole, 'shareRole': shareRole,
+            'videoConversionRole': videoConversionRole,
             'musicFolderId': musicFolderId, 'maxBitRate': maxBitRate
         })
         req = self._getRequest(viewName, q)
@@ -1960,7 +2081,7 @@ class Connection(object):
         req = self._getRequest(viewName, q)
         try:
             res = self._doBinReq(req)
-        except urllib2.HTTPError:
+        except urllib.error.HTTPError:
             # Avatar is not set/does not exist, return None
             return None
         if isinstance(res, dict):
@@ -2065,7 +2186,7 @@ class Connection(object):
         musicFolderId:int   Only return results from the music folder
                             with the given ID. See getMusicFolders
         """
-        methodName = 'getGenres'
+        methodName = 'getSongsByGenre'
         viewName = '%s.view' % methodName
 
         q = self._getQueryDict({'genre': genre,
@@ -2112,7 +2233,7 @@ class Connection(object):
         req = self._getRequest(viewName, q)
         try:
             res = self._doBinReq(req)
-        except urllib2.HTTPError:
+        except urllib.error.HTTPError:
             # Avatar is not set/does not exist, return None
             return None
         if isinstance(res, dict):
@@ -2224,6 +2345,70 @@ class Connection(object):
         self._checkStatus(res)
         return res
 
+    def createInternetRadioStation(self, streamUrl, name, homepageUrl=None):
+        """
+        since 1.16.0
+
+        Create an internet radio station
+
+        streamUrl:str   The stream URL for the station
+        name:str        The user-defined name for the station
+        homepageUrl:str The homepage URL for the station
+        """
+        methodName = 'createInternetRadioStation'
+        viewName = '{}.view'.format(methodName)
+
+        q = self._getQueryDict({
+            'streamUrl': streamUrl, 'name': name, 'homepageUrl': homepageUrl})
+
+        req = self._getRequest(viewName, q)
+        res = self._doInfoReq(req)
+        self._checkStatus(res)
+        return res
+
+    def updateInternetRadioStation(self, iid, streamUrl, name,
+            homepageUrl=None):
+        """
+        since 1.16.0
+
+        Create an internet radio station
+
+        iid:str         The ID for the station
+        streamUrl:str   The stream URL for the station
+        name:str        The user-defined name for the station
+        homepageUrl:str The homepage URL for the station
+        """
+        methodName = 'updateInternetRadioStation'
+        viewName = '{}.view'.format(methodName)
+
+        q = self._getQueryDict({
+            'id': iid, 'streamUrl': streamUrl, 'name': name,
+            'homepageUrl': homepageUrl,
+        })
+
+        req = self._getRequest(viewName, q)
+        res = self._doInfoReq(req)
+        self._checkStatus(res)
+        return res
+
+    def deleteInternetRadioStation(self, iid):
+        """
+        since 1.16.0
+
+        Create an internet radio station
+
+        iid:str         The ID for the station
+        """
+        methodName = 'deleteInternetRadioStation'
+        viewName = '{}.view'.format(methodName)
+
+        q = {'id': iid}
+
+        req = self._getRequest(viewName, q)
+        res = self._doInfoReq(req)
+        self._checkStatus(res)
+        return res
+
     def getBookmarks(self):
         """
         since: 1.9.0
@@ -2376,10 +2561,10 @@ class Connection(object):
         position:int        The position, in milliseconds, within the current
                             playing song
 
-        Saves the state of the play queue for this user. This includes 
+        Saves the state of the play queue for this user. This includes
-        the tracks in the play queue, the currently playing track, and 
+        the tracks in the play queue, the currently playing track, and
-        the position within this track. Typically used to allow a user to 
+        the position within this track. Typically used to allow a user to
-        move between different clients/apps while retaining the same play 
+        move between different clients/apps while retaining the same play
         queue (for instance when listening to an audio book).
         """
         methodName = 'savePlayQueue'
@@ -2388,7 +2573,7 @@ class Connection(object):
             qids = [qids]
 
         q = self._getQueryDict({'current': current, 'position': position})
-        
+
         req = self._getRequestWithLists(viewName, {'id': qids}, q)
         res = self._doInfoReq(req)
         self._checkStatus(res)
@@ -2398,16 +2583,16 @@ class Connection(object):
         """
         since 1.12.0
 
-        Returns the state of the play queue for this user (as set by 
+        Returns the state of the play queue for this user (as set by
-        savePlayQueue). This includes the tracks in the play queue, 
+        savePlayQueue). This includes the tracks in the play queue,
-        the currently playing track, and the position within this track. 
+        the currently playing track, and the position within this track.
-        Typically used to allow a user to move between different 
+        Typically used to allow a user to move between different
-        clients/apps while retaining the same play queue (for instance 
+        clients/apps while retaining the same play queue (for instance
         when listening to an audio book).
         """
         methodName = 'getPlayQueue'
         viewName = '%s.view' % methodName
-        
+
         req = self._getRequest(viewName)
         res = self._doInfoReq(req)
         self._checkStatus(res)
@@ -2424,9 +2609,9 @@ class Connection(object):
         """
         methodName = 'getTopSongs'
         viewName = '%s.view' % methodName
-        
+
         q = {'artist': artist, 'count': count}
-        
+
         req = self._getRequest(viewName, q)
         res = self._doInfoReq(req)
         self._checkStatus(res)
@@ -2442,9 +2627,9 @@ class Connection(object):
         """
         methodName = 'getNewestPodcasts'
         viewName = '%s.view' % methodName
-        
+
         q = {'count': count}
-        
+
         req = self._getRequest(viewName, q)
         res = self._doInfoReq(req)
         self._checkStatus(res)
@@ -2561,7 +2746,7 @@ class Connection(object):
 
         url = '%s:%d/%s/%s?%s' % (self._baseUrl, self._port,
             self._separateServerPath(), viewName, methodName)
-        req = urllib2.Request(url)
+        req = urllib.request.Request(url)
         res = self._opener.open(req)
         res_msg = res.msg.lower()
         return res_msg == 'ok'
@@ -2575,14 +2760,17 @@ class Connection(object):
         if sys.version_info[:3] >= (2, 7, 9) and self._insecure:
             https_chain = HTTPSHandlerChain(
                 context=ssl._create_unverified_context())
-        opener = urllib2.build_opener(PysHTTPRedirectHandler, https_chain)
+        opener = urllib.request.build_opener(
+            PysHTTPRedirectHandler,
+            https_chain,
+        )
         return opener
 
     def _getQueryDict(self, d):
         """
         Given a dictionary, it cleans out all the values set to None
         """
-        for k, v in d.items():
+        for k, v in list(d.items()):
             if v is None:
                 del d[k]
         return d
@@ -2599,7 +2787,7 @@ class Connection(object):
             qdict['p'] = 'enc:%s' % self._hexEnc(self._rawPass)
         else:
             salt = self._getSalt()
-            token = md5(self._rawPass + salt).hexdigest()
+            token = md5((self._rawPass + salt).encode('utf-8')).hexdigest()
             qdict.update({
                 's': salt,
                 't': token,
@@ -2612,12 +2800,14 @@ class Connection(object):
         qdict.update(query)
         url = '%s:%d/%s/%s' % (self._baseUrl, self._port, self._serverPath,
             viewName)
-        req = urllib2.Request(url, urlencode(qdict))
+        xbmc.log("Standard URL %s"%url,level=xbmc.LOGINFO)
+        xbmc.log("Qdict %s"%str(qdict),level=xbmc.LOGINFO)
+        req = urllib.request.Request(url, urlencode(qdict).encode('utf-8'))
 
         if self._useGET:
             url += '?%s' % urlencode(qdict)
-            req = urllib2.Request(url)
+            xbmc.log("UseGET URL %s"%(url),xbmc.LOGINFO)
-
+            req = urllib.request.Request(url)
         return req
 
     def _getRequestWithList(self, viewName, listName, alist, query={}):
@@ -2633,7 +2823,7 @@ class Connection(object):
         data.write(urlencode(qdict))
         for i in alist:
             data.write('&%s' % urlencode({listName: i}))
-        req = urllib2.Request(url, data.getvalue())
+        req = urllib.request.Request(url, data.getvalue().encode('utf-8'))
 
         if self._useGET:
             url += '?%s' % data.getvalue()
@@ -2657,10 +2847,10 @@ class Connection(object):
             viewName)
         data = StringIO()
         data.write(urlencode(qdict))
-        for k, l in listMap.iteritems():
+        for k, l in listMap.items():
             for i in l:
                 data.write('&%s' % urlencode({k: i}))
-        req = urllib2.Request(url, data.getvalue())
+        req = urllib.request.Request(url, data.getvalue().encode('utf-8'))
 
         if self._useGET:
             url += '?%s' % data.getvalue()
@@ -2671,12 +2861,18 @@ class Connection(object):
     def _doInfoReq(self, req):
         # Returns a parsed dictionary version of the result
         res = self._opener.open(req)
-        dres = json.loads(res.read())
+        dres = json.loads(res.read().decode('utf-8'))
+        xbmc.log("ddres %s"%(str(dres)),xbmc.LOGINFO)
         return dres['subsonic-response']
 
     def _doBinReq(self, req):
         res = self._opener.open(req)
-        contType = res.info().getheader('Content-Type')
+        info = res.info()
+        if hasattr(info, 'getheader'):
+            contType = info.getheader('Content-Type')
+        else:
+            contType = info.get('Content-Type')
+
         if contType:
             if contType.startswith('text/html') or \
                     contType.startswith('application/json'):
@@ -2716,7 +2912,7 @@ class Connection(object):
         """
         separate REST portion of URL from base server path.
         """
-        return urllib2.splithost(self._serverPath)[1].split('/')[0]
+        return urllib.parse.splithost(self._serverPath)[1].split('/')[0]
 
     def _fixLastModified(self, data):
         """
@@ -2726,9 +2922,9 @@ class Connection(object):
         of SECONDS since the unix epoch.  JAVA SUCKS!
         """
         if isinstance(data, dict):
-            for k, v in data.items():
+            for k, v in list(data.items()):
                 if k == 'lastModified':
-                    data[k] = long(v) / 1000.0
+                    data[k] = int(v) / 1000.0
                     return
                 elif isinstance(v, (tuple, list, dict)):
                     return self._fixLastModified(v)

lib/libsonic_extra/__init__.py

@@ -1,442 +0,0 @@
-import urllib
-import urlparse
-import libsonic
-
-def force_list(value):
-    """
-    Coerce the input value to a list.
-
-    If `value` is `None`, return an empty list. If it is a single value, create
-    a new list with that element on index 0.
-
-    :param value: Input value to coerce.
-    :return: Value as list.
-    :rtype: list
-    """
-
-    if value is None:
-        return []
-    elif type(value) == list:
-        return value
-    else:
-        return [value]
-
-
-class SubsonicClient(libsonic.Connection):
-    """
-    Extend `libsonic.Connection` with new features and fix a few issues.
-
-    - Parse URL for host and port for constructor.
-    - Make sure API results are of of uniform type.
-    - Provide methods to intercept URL of binary requests.
-    - Add order property to playlist items.
-    - Add conventient `walk_*' methods to iterate over the API responses.
-    """
-
-    def __init__(self, url, username, password, apiversion, insecure, legacyauth):
-        """
-        Construct a new SubsonicClient.
-
-        :param str url: Full URL (including scheme) of the Subsonic server.
-        :param str username: Username of the server.
-        :param str password: Password of the server.
-        """
-
-        self.intercept_url = False
-
-        # Parse Subsonic URL
-        parts = urlparse.urlparse(url)
-        scheme = parts.scheme or "http"
-
-        # Make sure there is hostname
-        if not parts.hostname:
-            raise ValueError("Expected hostname for URL: %s" % url)
-
-        # Validate scheme
-        if scheme not in ("http", "https"):
-            raise ValueError("Unexpected scheme '%s' for URL: %s" % (
-                scheme, url))
-
-        # Pick a default port
-        host = "%s://%s" % (scheme, parts.hostname)
-        port = parts.port or {"http": 80, "https": 443}[scheme]
-        path = parts.path.rstrip('/') + '/rest'
-
-        # Invoke original constructor
-        super(SubsonicClient, self).__init__(
-            host, username, password, port=port, serverPath=path, appName='Kodi', apiVersion=apiversion, insecure=insecure, legacyAuth=legacyauth)
-
-    def getIndexes(self, *args, **kwargs):
-        """
-        Improve the getIndexes method. Ensures IDs are integers.
-        """
-
-        def _artists_iterator(artists):
-            for artist in force_list(artists):
-                artist["id"] = int(artist["id"])
-                yield artist
-
-        def _index_iterator(index):
-            for index in force_list(index):
-                index["artist"] = list(_artists_iterator(index.get("artist")))
-                yield index
-
-        def _children_iterator(children):
-            for child in force_list(children):
-                child["id"] = int(child["id"])
-
-                if "parent" in child:
-                    child["parent"] = int(child["parent"])
-                if "coverArt" in child:
-                    child["coverArt"] = int(child["coverArt"])
-                if "artistId" in child:
-                    child["artistId"] = int(child["artistId"])
-                if "albumId" in child:
-                    child["albumId"] = int(child["albumId"])
-
-                yield child
-
-        response = super(SubsonicClient, self).getIndexes(*args, **kwargs)
-        response["indexes"] = response.get("indexes", {})
-        response["indexes"]["index"] = list(
-            _index_iterator(response["indexes"].get("index")))
-        response["indexes"]["child"] = list(
-            _children_iterator(response["indexes"].get("child")))
-
-        return response
-
-    def getPlaylists(self, *args, **kwargs):
-        """
-        Improve the getPlaylists method. Ensures IDs are integers.
-        """
-
-        def _playlists_iterator(playlists):
-            for playlist in force_list(playlists):
-                playlist["id"] = int(playlist["id"])
-                yield playlist
-
-        response = super(SubsonicClient, self).getPlaylists(*args, **kwargs)
-        response["playlists"]["playlist"] = list(
-            _playlists_iterator(response["playlists"].get("playlist")))
-
-        return response
-
-    def getPlaylist(self, *args, **kwargs):
-        """
-        Improve the getPlaylist method. Ensures IDs are integers and add an
-        order property to each entry.
-        """
-
-        def _entries_iterator(entries):
-            for order, entry in enumerate(force_list(entries), start=1):
-                entry["id"] = int(entry["id"])
-                entry["order"] = order
-                yield entry
-
-        response = super(SubsonicClient, self).getPlaylist(*args, **kwargs)
-        response["playlist"]["entry"] = list(
-            _entries_iterator(response["playlist"].get("entry")))
-
-        return response
-
-    def getArtists(self, *args, **kwargs):
-        """
-        (ID3 tags)
-        Improve the getArtists method. Ensures IDs are integers.
-        """
-
-        def _artists_iterator(artists):
-            for artist in force_list(artists):
-                artist["id"] = int(artist["id"])
-                yield artist
-
-        def _index_iterator(index):
-            for index in force_list(index):
-                index["artist"] = list(_artists_iterator(index.get("artist")))
-                yield index
-
-        response = super(SubsonicClient, self).getArtists(*args, **kwargs)
-        response["artists"] = response.get("artists", {})
-        response["artists"]["index"] = list(
-            _index_iterator(response["artists"].get("index")))
-
-        return response
-
-    def getArtist(self, *args, **kwargs):
-        """
-        (ID3 tags) 
-        Improve the getArtist method. Ensures IDs are integers.
-        """
-
-        def _albums_iterator(albums):
-            for album in force_list(albums):
-                album["id"] = int(album["id"])
-
-                if "artistId" in album:
-                    album["artistId"] = int(album["artistId"])
-
-                yield album
-
-        response = super(SubsonicClient, self).getArtist(*args, **kwargs)
-        response["artist"]["album"] = list(
-            _albums_iterator(response["artist"].get("album")))
-
-        return response
-
-    def getMusicDirectory(self, *args, **kwargs):
-        """
-        Improve the getMusicDirectory method. Ensures IDs are integers.
-        """
-
-        def _children_iterator(children):
-            for child in force_list(children):
-                child["id"] = int(child["id"])
-
-                if "parent" in child:
-                    child["parent"] = int(child["parent"])
-                if "coverArt" in child:
-                    child["coverArt"] = int(child["coverArt"])
-                if "artistId" in child:
-                    child["artistId"] = int(child["artistId"])
-                if "albumId" in child:
-                    child["albumId"] = int(child["albumId"])
-
-                yield child
-
-        response = super(SubsonicClient, self).getMusicDirectory(
-            *args, **kwargs)
-        response["directory"]["child"] = list(
-            _children_iterator(response["directory"].get("child")))
-
-        return response
-
-    def getAlbum(self, *args, **kwargs):
-        """
-        (ID3 tags)
-        Improve the getAlbum method. Ensures the IDs are real integers.
-        """
-
-        def _songs_iterator(songs):
-            for song in force_list(songs):
-                song["id"] = int(song["id"])
-                yield song
-
-        response = super(SubsonicClient, self).getAlbum(*args, **kwargs)
-        response["album"]["song"] = list(
-            _songs_iterator(response["album"].get("song")))
-
-        return response
-
-    def getAlbumList2(self, *args, **kwargs):
-        """
-        Improve the getAlbumList2 method. Ensures the IDs are real integers.
-        """
-
-        def _album_iterator(albums):
-            for album in force_list(albums):
-                album["id"] = int(album["id"])
-                yield album
-
-        response = super(SubsonicClient, self).getAlbumList2(*args, **kwargs)
-        response["albumList2"]["album"] = list(
-            _album_iterator(response["albumList2"].get("album")))
-
-        return response
-
-    def getStarred(self, *args, **kwargs):
-        """
-        Improve the getStarred method. Ensures the IDs are real integers.
-        """
-
-        def _song_iterator(songs):
-            for song in force_list(songs):
-                song["id"] = int(song["id"])
-                yield song
-
-        response = super(SubsonicClient, self).getStarred(*args, **kwargs)
-        response["starred"]["song"] = list(
-            _song_iterator(response["starred"].get("song")))
-
-        return response
-
-    def getCoverArtUrl(self, *args, **kwargs):
-        """
-        Return an URL to the cover art.
-        """
-
-        self.intercept_url = True
-        url = self.getCoverArt(*args, **kwargs)
-        self.intercept_url = False
-
-        return url
-
-    def streamUrl(self, *args, **kwargs):
-        """
-        Return an URL to the file to stream.
-        """
-
-        self.intercept_url = True
-        url = self.stream(*args, **kwargs)
-        self.intercept_url = False
-
-        return url
-
-    def _doBinReq(self, *args, **kwargs):
-        """
-        Intercept request URL to provide the URL of the item that is requested.
-
-        If the URL is intercepted, the request is not executed. A username and
-        password is added to provide direct access to the stream.
-        """
-
-        if self.intercept_url:
-            parts = list(urlparse.urlparse(
-                args[0].get_full_url() + "?" + args[0].data))
-            parts[4] = dict(urlparse.parse_qsl(parts[4]))
-            if self._legacyAuth:
-                parts[4].update({"u": self.username, "p": 'enc:%s' % self._hexEnc(self._rawPass)})
-            parts[4] = urllib.urlencode(parts[4])
-
-            return urlparse.urlunparse(parts)
-        else:
-            return super(SubsonicClient, self)._doBinReq(*args, **kwargs)
-
-    def walk_index(self, folder_id=None):
-        """
-        Request Subsonic's index and iterate each item.
-        """
-
-        response = self.getIndexes(folder_id)
-
-        for index in response["indexes"]["index"]:
-            for artist in index["artist"]:
-                yield artist
-
-
-    def walk_playlists(self):
-        """
-        Request Subsonic's playlists and iterate over each item.
-        """
-
-        response = self.getPlaylists()
-
-        for child in response["playlists"]["playlist"]:
-            yield child
-
-    def walk_playlist(self, playlist_id):
-        """
-        Request Subsonic's playlist items and iterate over each item.
-        """
-
-        response = self.getPlaylist(playlist_id)
-
-        for child in response["playlist"]["entry"]:
-            yield child
-            
-    def walk_folders(self):
-        response = self.getMusicFolders()
-        
-        for child in response["musicFolders"]["musicFolder"]:
-            yield child
-
-    def walk_directory(self, directory_id):
-        """
-        Request a Subsonic music directory and iterate over each item.
-        """
-
-        response = self.getMusicDirectory(directory_id)
-
-        for child in response["directory"]["child"]:
-            if child.get("isDir"):
-                for child in self.walk_directory(child["id"]):
-                    yield child
-            else:
-                yield child
-
-    def walk_artist(self, artist_id):
-        """
-        Request a Subsonic artist and iterate over each album.
-        """
-
-        response = self.getArtist(artist_id)
-
-        for child in response["artist"]["album"]:
-            yield child
-
-    def walk_artists(self):
-        """
-        (ID3 tags)
-        Request all artists and iterate over each item.
-        """
-
-        response = self.getArtists()
-
-        for index in response["artists"]["index"]:
-            for artist in index["artist"]:
-                yield artist
-
-    def walk_genres(self):
-        """
-        (ID3 tags)
-        Request all genres and iterate over each item.
-        """
-
-        response = self.getGenres()
-
-        for genre in response["genres"]["genre"]:
-            yield genre
-
-    def walk_albums(self, ltype, size=None, fromYear=None,toYear=None, genre=None, offset=None):
-        """
-        (ID3 tags)
-        Request all albums for a given genre and iterate over each album.
-        """
-        
-        if ltype == 'byGenre' and genre is None:
-            return
-        
-        if ltype == 'byYear' and (fromYear is None or toYear is None):
-            return
-
-        response = self.getAlbumList2(
-            ltype=ltype, size=size, fromYear=fromYear, toYear=toYear,genre=genre, offset=offset)
-
-        if not response["albumList2"]["album"]:
-            return
-
-        for album in response["albumList2"]["album"]:
-            yield album
-
-
-    def walk_album(self, album_id):
-        """
-        (ID3 tags)
-        Request an album and iterate over each item.
-        """
-
-        response = self.getAlbum(album_id)
-
-        for song in response["album"]["song"]:
-            yield song
-
-    def walk_tracks_random(self, size=None, genre=None, fromYear=None,toYear=None):
-        """
-        Request random songs by genre and/or year and iterate over each song.
-        """
-
-        response = self.getRandomSongs(
-            size=size, genre=genre, fromYear=fromYear, toYear=toYear)
-
-        for song in response["randomSongs"]["song"]:
-            yield song
-            
-
-    def walk_tracks_starred(self):
-        """
-        Request Subsonic's starred songs and iterate over each item.
-        """
-
-        response = self.getStarred()
-
-        for song in response["starred"]["song"]:
-            yield song

lib/simpleplugin/__init__.py

@@ -1,4 +1,4 @@
 #v2.1.0
 #https://github.com/romanvm/script.module.simpleplugin/releases
 
-from simpleplugin import *
+from .simpleplugin import *

main.py

@@ -6,6 +6,7 @@
 # Created on: 14 January 2017
 # License: GPL v.3 https://www.gnu.org/copyleft/gpl.html
 
+import xbmcvfs
 import os
 import xbmcaddon
 import xbmcplugin
@@ -14,12 +15,13 @@ import json
 import shutil
 import dateutil.parser
 from datetime import datetime
+from collections import MutableMapping, namedtuple
 
 # Add the /lib folder to sys
-sys.path.append(xbmc.translatePath(os.path.join(xbmcaddon.Addon("plugin.audio.subsonic").getAddonInfo("path"), "lib")))
+sys.path.append(xbmcvfs.translatePath(os.path.join(xbmcaddon.Addon("plugin.audio.subsonic").getAddonInfo("path"), "lib")))
 
 
-import libsonic_extra #TO FIX - we should get rid of this and use only libsonic
+import libsonic#Removed libsonic_extra
 
 from simpleplugin import Plugin
 from simpleplugin import Addon
@@ -33,6 +35,8 @@ plugin = Plugin()
 connection = None
 cachetime = int(Addon().get_setting('cachetime'))
 
+ListContext = namedtuple('ListContext', ['listing', 'succeeded','update_listing', 'cache_to_disk','sort_methods', 'view_mode','content', 'category'])
+PlayContext = namedtuple('PlayContext', ['path', 'play_item', 'succeeded'])
 def popup(text, time=5000, image=None):
     title = plugin.addon.getAddonInfo('name')
     icon = plugin.addon.getAddonInfo('icon')
@@ -42,26 +46,25 @@ def popup(text, time=5000, image=None):
 def get_connection():
     global connection
     
-    if connection is None:
+    if connection==None:   
-        
+        connected = False  
-        connected = False
-        
         # Create connection
-
         try:
-            connection = libsonic_extra.SubsonicClient(
+            connection = libsonic.Connection(
-                Addon().get_setting('subsonic_url'),
+                baseUrl=Addon().get_setting('subsonic_url'),
-                Addon().get_setting('username', convert=False),
+                username=Addon().get_setting('username', convert=False),
-                Addon().get_setting('password', convert=False),
+                password=Addon().get_setting('password', convert=False),
-                Addon().get_setting('apiversion'),
+                port=4040,#TO FIX
-                Addon().get_setting('insecure') == 'true',
+                apiVersion=Addon().get_setting('apiversion'),
-                Addon().get_setting('legacyauth') == 'true',
+                insecure=Addon().get_setting('insecure') == 'true',
-                )
+                legacyAuth=Addon().get_setting('legacyauth') == 'true',
+                useGET=True,#Addon().get_setting('useget') == 'True', #TO FIX
+            )
             connected = connection.ping()
         except:
             pass
 
-        if connected is False:
+        if connected==False:
             popup('Connection error')
             return False
 
@@ -73,7 +76,7 @@ def root(params):
     # get connection
     connection = get_connection()
     
-    if connection is False:
+    if connection==False:
         return
     
     listing = []
@@ -129,7 +132,7 @@ def root(params):
                         )
         })  # Item label
 
-    return plugin.create_listing(
+    add_directory_items(create_listing(
         listing,
         #succeeded = True, #if False Kodi won’t open a new listing and stays on the current level.
         #update_listing = False, #if True, Kodi won’t open a sub-listing but refresh the current one. 
@@ -137,7 +140,7 @@ def root(params):
         sort_methods = None, #he list of integer constants representing virtual folder sort methods.
         #view_mode = None, #a numeric code for a skin view mode. View mode codes are different in different skins except for 50 (basic listing).
         #content = None #string - current plugin content, e.g. ‘movies’ or ‘episodes’.
-    )
+    ))
 
 @plugin.action()
 def menu_albums(params):
@@ -145,7 +148,7 @@ def menu_albums(params):
     # get connection
     connection = get_connection()
     
-    if connection is False:
+    if connection==False:
         return
     
     listing = []
@@ -195,7 +198,7 @@ def menu_albums(params):
                         )
         })  # Item label
 
-    return plugin.create_listing(
+    add_directory_items(create_listing(
         listing,
         #succeeded = True, #if False Kodi won’t open a new listing and stays on the current level.
         #update_listing = False, #if True, Kodi won’t open a sub-listing but refresh the current one. 
@@ -203,7 +206,7 @@ def menu_albums(params):
         #sort_methods = None, #he list of integer constants representing virtual folder sort methods.
         #view_mode = None, #a numeric code for a skin view mode. View mode codes are different in different skins except for 50 (basic listing).
         #content = None #string - current plugin content, e.g. ‘movies’ or ‘episodes’.
-    )
+    ))
 
 @plugin.action()
 def menu_tracks(params):
@@ -211,7 +214,7 @@ def menu_tracks(params):
     # get connection
     connection = get_connection()
     
-    if connection is False:
+    if connection==False:
         return
     
     listing = []
@@ -247,7 +250,7 @@ def menu_tracks(params):
             )
         })  # Item label
 
-    return plugin.create_listing(
+    add_directory_items(create_listing(
         listing,
         #succeeded = True, #if False Kodi won’t open a new listing and stays on the current level.
         #update_listing = False, #if True, Kodi won’t open a sub-listing but refresh the current one. 
@@ -255,7 +258,7 @@ def menu_tracks(params):
         #sort_methods = None, #he list of integer constants representing virtual folder sort methods.
         #view_mode = None, #a numeric code for a skin view mode. View mode codes are different in different skins except for 50 (basic listing).
         #content = None #string - current plugin content, e.g. ‘movies’ or ‘episodes’.
-    )
+    ))
 
 @plugin.action()
 #@plugin.cached(cachetime) # cache (in minutes)
@@ -263,13 +266,13 @@ def browse_folders(params):
     # get connection
     connection = get_connection()
     
-    if connection is False:
+    if connection==False:
         return
 
     listing = []
 
     # Get items
-    items = connection.walk_folders()
+    items = walk_folders()
 
     # Iterate through items
     for item in items:
@@ -288,7 +291,7 @@ def browse_folders(params):
         plugin.log('One single Media Folder found; do return listing from browse_indexes()...')
         return browse_indexes(params)
     else:
-        return plugin.create_listing(listing)
+        add_directory_items(create_listing(listing))
 
 @plugin.action()
 #@plugin.cached(cachetime) # cache (in minutes)
@@ -296,7 +299,7 @@ def browse_indexes(params):
     # get connection
     connection = get_connection()
     
-    if connection is False:
+    if connection==False:
         return
 
     listing = []
@@ -304,7 +307,7 @@ def browse_indexes(params):
     # Get items 
     # optional folder ID
     folder_id = params.get('folder_id')
-    items = connection.walk_index(folder_id)
+    items = walk_index(folder_id)
 
     # Iterate through items
     for item in items:
@@ -318,9 +321,9 @@ def browse_indexes(params):
         }
         listing.append(entry)
         
-    return plugin.create_listing(
+    add_directory_items(create_listing(
         listing
-    )
+    ))
 
 @plugin.action()
 #@plugin.cached(cachetime) # cache (in minutes)
@@ -328,14 +331,14 @@ def list_directory(params):
     # get connection
     connection = get_connection()
     
-    if connection is False:
+    if connection==False:
         return
 
     listing = []
     
     # Get items
     id = params.get('id')
-    items = connection.walk_directory(id)
+    items = walk_directory(id)
     
     # Iterate through items
     for item in items:
@@ -356,9 +359,9 @@ def list_directory(params):
 
         listing.append(entry)
         
-    return plugin.create_listing(
+    add_directory_items(create_listing(
         listing
-    )
+    ))
 
 @plugin.action()
 #@plugin.cached(cachetime) # cache (in minutes)
@@ -370,13 +373,13 @@ def browse_library(params):
     # get connection
     connection = get_connection()
     
-    if connection is False:
+    if connection==False:
         return
 
     listing = []
 
     # Get items
-    items = connection.walk_artists()
+    items = walk_artists()
 
     # Iterate through items
 
@@ -394,7 +397,7 @@ def browse_library(params):
         
         listing.append(entry)
  
-    return plugin.create_listing(
+    add_directory_items(create_listing(
         listing,
         #succeeded = True, #if False Kodi won’t open a new listing and stays on the current level.
         #update_listing = False, #if True, Kodi won’t open a sub-listing but refresh the current one. 
@@ -402,7 +405,7 @@ def browse_library(params):
         sort_methods = get_sort_methods('artists',params), #he list of integer constants representing virtual folder sort methods.
         #view_mode = None, #a numeric code for a skin view mode. View mode codes are different in different skins except for 50 (basic listing).
         content = 'artists' #string - current plugin content, e.g. ‘movies’ or ‘episodes’.
-    )
+    ))
 
 @plugin.action()
 #@plugin.cached(cachetime) #cache (in minutes)
@@ -417,7 +420,7 @@ def list_albums(params):
     # get connection
     connection = get_connection()
     
-    if connection is False:
+    if connection==False:
         return
 
     #query
@@ -443,14 +446,14 @@ def list_albums(params):
 
     #Get items
     if 'artist_id' in params:
-        generator = connection.walk_artist(params.get('artist_id'))
+        generator = walk_artist(params.get('artist_id'))
     else:
-        generator = connection.walk_albums(**query_args)
+        generator = walk_albums(**query_args)
     
     #make a list out of the generator so we can iterate it several times
     items = list(generator)
     
-    #check if there is only one artist for this album (and then hide it)
+    #check if there==only one artist for this album (and then hide it)
     artists = [item.get('artist',None) for item in items]
     if len(artists) <= 1:
         params['hide_artist']   = True
@@ -471,7 +474,7 @@ def list_albums(params):
         link_next = navigate_next(params)
         listing.append(link_next)
 
-    return plugin.create_listing(
+    add_directory_items(create_listing(
         listing,
         #succeeded = True, #if False Kodi won’t open a new listing and stays on the current level.
         #update_listing = False, #if True, Kodi won’t open a sub-listing but refresh the current one. 
@@ -479,7 +482,7 @@ def list_albums(params):
         sort_methods = get_sort_methods('albums',params), 
         #view_mode = None, #a numeric code for a skin view mode. View mode codes are different in different skins except for 50 (basic listing).
         content = 'albums' #string - current plugin content, e.g. ‘movies’ or ‘episodes’.
-    )
+    ))
 
 @plugin.action()
 #@plugin.cached(cachetime) #cache (in minutes)
@@ -513,16 +516,16 @@ def list_tracks(params):
     # get connection
     connection = get_connection()
     
-    if connection is False:
+    if connection==False:
         return
 
     # Album
     if 'album_id' in params:
-        generator = connection.walk_album(params['album_id'])
+        generator = walk_album(params['album_id'])
         
     # Playlist
     elif 'playlist_id' in params:
-        generator = connection.walk_playlist(params['playlist_id'])
+        generator = walk_playlist(params['playlist_id'])
         
         #TO FIX
         #tracknumber = 0
@@ -532,12 +535,12 @@ def list_tracks(params):
         
     # Starred
     elif menu_id == 'tracks_starred':
-        generator = connection.walk_tracks_starred()
+        generator = walk_tracks_starred()
         
     
     # Random
     elif menu_id == 'tracks_random':
-        generator = connection.walk_tracks_random(**query_args)
+        generator = walk_tracks_random(**query_args)
     # Filters
     #else:
         #TO WORK
@@ -545,7 +548,7 @@ def list_tracks(params):
     #make a list out of the generator so we can iterate it several times
     items = list(generator)
 
-    #check if there is only one artist for this album (and then hide it)
+    #check if there==only one artist for this album (and then hide it)
     artists = [item.get('artist',None) for item in items]
     if len(artists) <= 1:
         params['hide_artist']   = True
@@ -573,7 +576,7 @@ def list_tracks(params):
 
 
 
-    return plugin.create_listing(
+    add_directory_items(create_listing(
         listing,
         #succeeded =        True, #if False Kodi won’t open a new listing and stays on the current level.
         #update_listing =   False, #if True, Kodi won’t open a sub-listing but refresh the current one. 
@@ -581,9 +584,9 @@ def list_tracks(params):
         sort_methods=       get_sort_methods('tracks',params),
         #view_mode =        None, #a numeric code for a skin view mode. View mode codes are different in different skins except for 50 (basic listing).
         content =           'songs' #string - current plugin content, e.g. ‘movies’ or ‘episodes’.
-    )
+    ))
 
-#stars (persistent) cache is used to know what context action (star/unstar) we should display.
+#stars (persistent) cache==used to know what context action (star/unstar) we should display.
 #run this function every time we get starred items.
 #ids can be a single ID or a list
 #using a set makes sure that IDs will be unique.
@@ -594,13 +597,13 @@ def list_playlists(params):
     # get connection
     connection = get_connection()
     
-    if connection is False:
+    if connection==False:
         return
 
     listing = []
 
     # Get items
-    items = connection.walk_playlists()
+    items = walk_playlists()
 
     # Iterate through items
 
@@ -608,7 +611,7 @@ def list_playlists(params):
         entry = get_entry_playlist(item,params)
         listing.append(entry)
         
-    return plugin.create_listing(
+    add_directory_items(create_listing(
         listing,
         #succeeded = True, #if False Kodi won’t open a new listing and stays on the current level.
         #update_listing = False, #if True, Kodi won’t open a sub-listing but refresh the current one. 
@@ -616,7 +619,7 @@ def list_playlists(params):
         sort_methods = get_sort_methods('playlists',params), #he list of integer constants representing virtual folder sort methods.
         #view_mode = None, #a numeric code for a skin view mode. View mode codes are different in different skins except for 50 (basic listing).
         #content = None #string - current plugin content, e.g. ‘movies’ or ‘episodes’.
-    )
+    ))
 @plugin.action()
 #@plugin.cached(cachetime) #cache (in minutes)
 def search(params):
@@ -630,7 +633,7 @@ def search(params):
     # get connection
     connection = get_connection()
 
-    if connection is False:
+    if connection==False:
         return
 
     listing = []
@@ -646,7 +649,7 @@ def search(params):
         plugin.log('One single Media Folder found; do return listing from browse_indexes()...')
         return browse_indexes(params)
     else:
-        return plugin.create_listing(listing)
+        add_directory_items(create_listing(listing))
 
 
 
@@ -659,7 +662,7 @@ def play_track(params):
     # get connection
     connection = get_connection()
     
-    if connection is False:
+    if connection==False:
         return
 
     url = connection.streamUrl(sid=id,
@@ -667,7 +670,8 @@ def play_track(params):
         tformat=Addon().get_setting('transcode_format_streaming')
     )
 
-    return url
+    #return url
+    _set_resolved_url(resolve_url(url))
 
 @plugin.action()
 def star_item(params):
@@ -697,7 +701,7 @@ def star_item(params):
     # get connection
     connection = get_connection()
     
-    if connection is False:
+    if connection==False:
         return
 
     ###
@@ -774,7 +778,8 @@ def download_item(params):
         plugin.log_error('Unable to downloaded %s #%s' % (type,id))
 
     return did_action
-    
+
+@plugin.cached(cachetime) #cache (in minutes)    
 def get_entry_playlist(item,params):
     image = connection.getCoverArtUrl(item.get('coverArt'))
     return {
@@ -796,6 +801,7 @@ def get_entry_playlist(item,params):
     }
 
 #star (or unstar) an item
+@plugin.cached(cachetime) #cache (in minutes)
 def get_entry_artist(item,params):
     image = connection.getCoverArtUrl(item.get('coverArt'))
     return {
@@ -815,6 +821,7 @@ def get_entry_artist(item,params):
         }
     }
 
+@plugin.cached(cachetime) #cache (in minutes)
 def get_entry_album(item, params):
     
     image = connection.getCoverArtUrl(item.get('coverArt'))
@@ -857,6 +864,7 @@ def get_entry_album(item, params):
 
     return entry
 
+@plugin.cached(cachetime) #cache (in minutes)
 def get_entry_track(item,params):
     
     menu_id = params.get('menu_id')
@@ -904,11 +912,13 @@ def get_entry_track(item,params):
 
     return entry
 
+@plugin.cached(cachetime) #cache (in minutes)
 def get_starred_label(id,label):
     if is_starred(id):
         label = '[COLOR=FF00FF00]%s[/COLOR]' % label
     return label
 
+@plugin.cached(cachetime) #cache (in minutes)
 def get_entry_track_label(item,hide_artist = False):
     if hide_artist:
         label = item.get('title', '<Unknown>')
@@ -920,6 +930,7 @@ def get_entry_track_label(item,hide_artist = False):
 
     return get_starred_label(item.get('id'),label)
 
+@plugin.cached(cachetime) #cache (in minutes)
 def get_entry_album_label(item,hide_artist = False):
     if hide_artist:
         label = item.get('name', '<Unknown>')
@@ -928,7 +939,7 @@ def get_entry_album_label(item,hide_artist = False):
                              item.get('name', '<Unknown>'))
     return get_starred_label(item.get('id'),label)
 
-
+#@plugin.cached(cachetime) #cache (in minutes)
 def get_sort_methods(type,params):
     #sort method for list types
     #https://github.com/xbmc/xbmc/blob/master/xbmc/SortFileItem.h
@@ -947,7 +958,7 @@ def get_sort_methods(type,params):
         xbmcplugin.SORT_METHOD_UNSORTED
     ]
     
-    if type is 'artists':
+    if type=='artists':
         
         artists = [
             xbmcplugin.SORT_METHOD_ARTIST
@@ -955,7 +966,7 @@ def get_sort_methods(type,params):
 
         sortable = sortable + artists
         
-    elif type is 'albums':
+    elif type=='albums':
         
         albums = [
             xbmcplugin.SORT_METHOD_ALBUM,
@@ -969,7 +980,7 @@ def get_sort_methods(type,params):
 
         sortable = sortable + albums
         
-    elif type is 'tracks':
+    elif type=='tracks':
 
         tracks = [
             xbmcplugin.SORT_METHOD_TITLE,
@@ -992,7 +1003,7 @@ def get_sort_methods(type,params):
         
         sortable = sortable + tracks
         
-    elif type is 'playlists':
+    elif type=='playlists':
 
         playlists = [
             xbmcplugin.SORT_METHOD_TITLE,
@@ -1010,7 +1021,7 @@ def stars_cache_update(ids,remove=False):
     #get existing cache set
     starred = stars_cache_get()
     
-    #make sure this is a list
+    #make sure this==a list
     if not isinstance(ids, list):
         ids = [ids]
     
@@ -1098,7 +1109,7 @@ def context_action_star(type,id):
         'XBMC.RunPlugin(%s)' % plugin.get_url(action='star_item',type=type,ids=id,unstar=starred)
     )
 
-#Subsonic API says this is supported for artist,tracks and albums,
+#Subsonic API says this==supported for artist,tracks and albums,
 #But I can see it available only for tracks on Subsonic 5.3, so disable it.
 def can_star(type,ids = None):
     
@@ -1128,7 +1139,7 @@ def context_action_download(type,id):
     )
 
 def can_download(type,id = None):
-    if id is None:
+    if id==None:
         return False
     
     if type == 'track':
@@ -1138,7 +1149,7 @@ def can_download(type,id = None):
     
 def download_tracks(ids):
 
-    #popup is fired before, in download_item
+    #popup==fired before, in download_item
     download_folder = Addon().get_setting('download_folder')
     if not download_folder:
         return
@@ -1163,7 +1174,7 @@ def download_tracks(ids):
     # get connection
     connection = get_connection()
     
-    if connection is False:
+    if connection==False:
         return
 
     #progress...
@@ -1236,7 +1247,7 @@ def download_album(id):
     # get connection
     connection = get_connection()
     
-    if connection is False:
+    if connection==False:
         return
 
     # get album infos
@@ -1255,6 +1266,250 @@ def download_album(id):
 
     download_tracks(ids)
 
+@plugin.cached(cachetime) #cache (in minutes)
+def create_listing(listing, succeeded=True, update_listing=False, cache_to_disk=False, sort_methods=None,view_mode=None, content=None, category=None):
+        return ListContext(listing, succeeded, update_listing, cache_to_disk,sort_methods, view_mode, content, category)
+
+
+def resolve_url(path='', play_item=None, succeeded=True):
+        """
+        Create and return a context dict to resolve a playable URL
+        :param path: the path to a playable media.
+        :type path: str or unicode
+        :param play_item: a dict of item properties as described in the class docstring.
+            It allows to set additional properties for the item being played, like graphics, metadata etc.
+            if ``play_item`` parameter==present, then ``path`` value==ignored, and the path must be set via
+            ``'path'`` property of a ``play_item`` dict.
+        :type play_item: dict
+        :param succeeded: if ``False``, Kodi won't play anything
+        :type succeeded: bool
+        :return: context object containing necessary parameters
+            for Kodi to play the selected media.
+        :rtype: PlayContext
+        """
+        return PlayContext(path, play_item, succeeded)
+
+#@plugin.cached(cachetime) #cache (in minutes)
+def create_list_item(item):
+    """
+    Create an :class:`xbmcgui.ListItem` instance from an item dict
+
+    :param item: a dict of ListItem properties
+    :type item: dict
+    :return: ListItem instance
+    :rtype: xbmcgui.ListItem
+    """
+    major_version = xbmc.getInfoLabel('System.BuildVersion')[:2]
+    if major_version >= '18':
+        list_item = xbmcgui.ListItem(label=item.get('label', ''),
+                                     label2=item.get('label2', ''),
+                                     path=item.get('path', ''),
+                                     offscreen=item.get('offscreen', False))
+    else:
+        list_item = xbmcgui.ListItem(label=item.get('label', ''),
+                                     label2=item.get('label2', ''),
+                                     path=item.get('path', ''))
+    if major_version >= '16':
+        art = item.get('art', {})
+        art['thumb'] = item.get('thumb', '')
+        art['icon'] = item.get('icon', '')
+        art['fanart'] = item.get('fanart', '')
+        item['art'] = art
+        cont_look = item.get('content_lookup')
+        if cont_look is not None:
+            list_item.setContentLookup(cont_look)
+    else:
+        list_item.setThumbnailImage(item.get('thumb', ''))
+        list_item.setIconImage(item.get('icon', ''))
+        list_item.setProperty('fanart_image', item.get('fanart', ''))
+    if item.get('art'):
+        list_item.setArt(item['art'])
+    if item.get('stream_info'):
+        for stream, stream_info in item['stream_info'].iteritems():
+            list_item.addStreamInfo(stream, stream_info)
+    if item.get('info'):
+        for media, info in item['info'].iteritems():
+            list_item.setInfo(media, info)
+    if item.get('context_menu') is not None:
+        list_item.addContextMenuItems(item['context_menu'])
+    if item.get('subtitles'):
+        list_item.setSubtitles(item['subtitles'])
+    if item.get('mime'):
+        list_item.setMimeType(item['mime'])
+    if item.get('properties'):
+        for key, value in item['properties'].iteritems():
+            list_item.setProperty(key, value)
+    if major_version >= '17':
+        cast = item.get('cast')
+        if cast is not None:
+            list_item.setCast(cast)
+        db_ids = item.get('online_db_ids')
+        if db_ids is not None:
+            list_item.setUniqueIDs(db_ids)
+        ratings = item.get('ratings')
+        if ratings is not None:
+            for rating in ratings:
+                list_item.setRating(**rating)
+    return list_item
+
+def _set_resolved_url(context):
+
+    plugin.log_debug('Resolving URL from {0}'.format(str(context)))
+    if context.play_item==None:
+        list_item = xbmcgui.ListItem(path=context.path)
+    else:
+        list_item = self.create_list_item(context.play_item)
+    xbmcplugin.setResolvedUrl(plugin.handle, context.succeeded, list_item)
+
+
+#@plugin.cached(cachetime) #cache (in minutes)
+def add_directory_items(context):
+        plugin.log_debug('Creating listing from {0}'.format(str(context)))
+        if context.category is not None:
+            xbmcplugin.setPluginCategory(plugin.handle, context.category)
+        if context.content is not None:
+            xbmcplugin.setContent(plugin.handle, context.content)  # This must be at the beginning
+        for item in context.listing:
+            is_folder = item.get('is_folder', True)
+            if item.get('list_item') is not None:
+                list_item = item['list_item']
+            else:
+                list_item = create_list_item(item)
+                if item.get('is_playable'):
+                    list_item.setProperty('IsPlayable', 'true')
+                    is_folder = False
+            xbmcplugin.addDirectoryItem(plugin.handle, item['url'], list_item, is_folder)
+        if context.sort_methods is not None:
+            if isinstance(context.sort_methods, (int, dict)):
+                sort_methods = [context.sort_methods]
+            elif isinstance(context.sort_methods, (tuple, list)):
+                sort_methods = context.sort_methods
+            else:
+                raise TypeError(
+                    'sort_methods parameter must be of int, dict, tuple or list type!')
+            for method in sort_methods:
+                if isinstance(method, int):
+                    xbmcplugin.addSortMethod(plugin.handle, method)
+                elif isinstance(method, dict):
+                    xbmcplugin.addSortMethod(plugin.handle, **method)
+                else:
+                    raise TypeError(
+                        'method parameter must be of int or dict type!')
+                    
+        xbmcplugin.endOfDirectory(plugin.handle,
+                                  context.succeeded,
+                                  context.update_listing,
+                                  context.cache_to_disk)
+        if context.view_mode is not None:
+            xbmc.executebuiltin('Container.SetViewMode({0})'.format(context.view_mode))
+
+def walk_playlists():
+        """
+        Request Subsonic's playlists and iterate over each item.
+        """
+
+        response = connection.getPlaylists()
+
+        for child in response["playlists"]["playlist"]:
+            yield child
+
+
+def walk_playlist(playlist_id):
+        """
+        Request Subsonic's playlist items and iterate over each item.
+        """
+        response = connection.getPlaylist(playlist_id)
+
+        for child in response["playlist"]["entry"]:
+            yield child
+
+def walk_artist(artist_id):
+    """
+    Request a Subsonic artist and iterate over each album.
+    """
+
+    response = connection.getArtist(artist_id)
+
+    for child in response["artist"]["album"]:
+        yield child
+
+def walk_artists():
+    """
+    (ID3 tags)
+    Request all artists and iterate over each item.
+    """
+
+    response = connection.getArtists()
+
+    for index in response["artists"]["index"]:
+        for artist in index["artist"]:
+            yield artist
+
+def walk_genres():
+    """
+    (ID3 tags)
+    Request all genres and iterate over each item.
+    """
+
+    response = connection.getGenres()
+
+    for genre in response["genres"]["genre"]:
+        yield genre
+
+def walk_albums(ltype, size=None, fromYear=None,toYear=None, genre=None, offset=None):
+    """
+    (ID3 tags)
+    Request all albums for a given genre and iterate over each album.
+    """
+    
+    if ltype == 'byGenre' and genre is None:
+        return
+    
+    if ltype == 'byYear' and (fromYear is None or toYear is None):
+        return
+
+    response = connection.getAlbumList2(
+        ltype=ltype, size=size, fromYear=fromYear, toYear=toYear,genre=genre, offset=offset)
+
+    if not response["albumList2"]["album"]:
+        return
+
+    for album in response["albumList2"]["album"]:
+        yield album
+
+
+def walk_album(album_id):
+    """
+    (ID3 tags)
+    Request an album and iterate over each item.
+    """
+
+    response = connection.getAlbum(album_id)
+
+    for song in response["album"]["song"]:
+        yield song
+
+def walk_tracks_random(size=None, genre=None, fromYear=None,toYear=None):
+    """
+    Request random songs by genre and/or year and iterate over each song.
+    """
+
+    response = connection.getRandomSongs(
+        size=size, genre=genre, fromYear=fromYear, toYear=toYear)
+
+    for song in response["randomSongs"]["song"]:
+        yield song
+        
+
+def walk_tracks_starred():
+    """
+    Request Subsonic's starred songs and iterate over each item.
+    """
+
+    response = connection.getStarred()
+
+    for song in response["starred"]["song"]:
+        yield song
 
 
 # Start plugin from within Kodi.

resources/language/English/strings.po

@@ -157,4 +157,14 @@ msgctxt "#30039"
 msgid "Search"
 msgstr ""
 
+msgctxt "#30040"
+msgid "useGET"
+msgstr ""
 
+msgctxt "#30041"
+msgid "legacyauth"
+msgstr ""
+
+msgctxt "#30042"
+msgid "port"
+msgstr ""

resources/language/French/strings.po

@@ -158,3 +158,14 @@ msgid "Search"
 msgstr "Rechercher"
 
 
+msgctxt "#30040"
+msgid "useGET"
+msgstr ""
+
+msgctxt "#30041"
+msgid "legacyauth"
+msgstr ""
+
+msgctxt "#30042"
+msgid "port"
+msgstr ""

resources/language/German/strings.po

@@ -155,3 +155,16 @@ msgstr "Durchsuchen"
 msgctxt "#30039"
 msgid "Search"
 msgstr "Suche"
+
+
+msgctxt "#30040"
+msgid "useGET"
+msgstr ""
+
+msgctxt "#30041"
+msgid "legacyauth"
+msgstr ""
+
+msgctxt "#30042"
+msgid "port"
+msgstr ""

resources/settings.xml

@@ -4,6 +4,7 @@
     <category label="30000">
         <setting label="30001" type="lsep" />
         <setting label="30002" id="subsonic_url" type="text"  default="http://demo.subsonic.org"/>
+        <setting label="30042" id="port" type="labelenum"  default="4040"/>
         <setting label="30003" id="username" type="text" default="guest3"/>
         <setting label="30004" id="password" type="text" option="hidden"  default="guest"/>
         <setting label="30005" type="lsep" />
@@ -13,14 +14,16 @@
         <setting label="30009" id="download_folder"  type="folder"  source="auto" option="writeable"/>
         <setting label="30010" type="lsep" />
         <setting label="30011" id="transcode_format_streaming" type="labelenum"  values="mp3|raw|flv|ogg"/>
-        <setting label="30012" id="bitrate_streaming" type="labelenum"  values="320|256|224|192|160|128|112|96|80|64|56|48|40|32"/>
+        <setting label="30012" id="bitrate_streaming" type="labelenum"  values="320|256|224|192|160|128|112|96|80|64|56|48|40|32|0"/>
     </category>
     
     <!-- ADVANCED -->
   	<category label="30013">
         <setting label="30001" type="lsep" />
-        <setting label="30014" id="apiversion" type="labelenum"  values="1.11.0|1.12.0|1.13.0|1.14.0" default="1.13.0"/>
+        <setting label="30014" id="apiversion" type="labelenum"  values="1.11.0|1.12.0|1.13.0|1.14.0|1.15.0" default="1.15.0"/>
 		<setting label="30016" id="insecure" type="bool"  default="false" />
+		<setting label="30040" id="useget" type="bool"  default="false" />
+		<setting label="30041" id="legacyauth" type="bool" default="false" />
         <setting label="30017" type="lsep" />
         <setting label="30018" id="cachetime" type="labelenum"  default="15" values="1|5|15|30|60|120|180|720|1440"/>