Some cleanup

Merge Matrix compatible to master

CHANGELOG.md

@@ -1,5 +1,49 @@
 # Changelog
 
+## v3.0.3
+Released 29th September 2021 (by warwickh)
+* Added enhanced data collection and display from musicbrainz and wikipedia 
+* Added aqlite storage of artist information to speed loading
+
+## v3.0.2
+Released 29th September 2021 (by warwickh)
+* Removed dependency on future and dateutil 
+* Simpleplugin modified - no longer py2 compatible
+
+## v3.0.1
+Released 2nd September 2021 (by warwickh)
+* Added Navidrome compatibility (remove dependency on integer ids)
+
+## v3.0.0
+Released 29th June 2021 (by warwickh)
+* Basic update to provide Matrix compatility. Not tested on Kodi below v19
+* Updates simpleplugin to latest version (3.0.0) https://github.com/vlmaksime/script.module.simpleplugin
+* Moves some legacy simpleplugin static routines into main.py
+* Removes dependancy on libsonic_extra by moving some walk functions into main.py
+* Updates libsonic to latest version and adds functions for returning raw url for populating menus
+* Move to version 3+ for diffferentiation from Leia compatible version
+
+## v2.0.8
+Released 29th November 2017 (by Heruwar)
+* Fixes a security issue where the password is sent as plaintext in the URL query parameters when methods from libsonic_extas are used. 
+Also adds Subsonic hex encoding when using legacy auth.
+* Adds support for URL paths like https://hostname.com/subsonic as requested in Github issue #17 and also encountered in some of the reports (#14 and #5)
+* Fixes an error when the password only contains digits, which simpleplugin converts to a Long, which later fails when libsonic tries to salt the password expecting a string.
+
+## v2.0.7
+Released 18 April 2017
+* Added Search (by silascutler)
+
+## v2.0.6
+Released 14 January 2017
+* Upgrade to simpleplugin 2.1.0
+* Browse/Library menus (file structure vs ID3 tags)
+* Added multilanguage support
+
+## v2.0.5
+Released 15 October 2016
+* Fixed images when listing entries
+
 ## v2.0.4
 Released 5 October 2016
 * Cache (permanently) starred items so we can know everywhere if an item is starred or not without querying it

README.md

@@ -1,22 +1,40 @@
 # Subsonic
-Kodi plugin to stream, star and download music from Subsonic.
+Kodi plugin to stream, star and download music from Subsonic/Airsonic/Navidrome (requires Subsonic API compatibility)
+
 For feature requests / issues:
-https://github.com/gordielachance/plugin.audio.subsonic/issues
+https://github.com/warwickh/plugin.audio.subsonic/issues
+
 Contributions are welcome:
-https://github.com/gordielachance/plugin.audio.subsonic
+https://github.com/warwickh/plugin.audio.subsonic
+
+Master branch updated to support Kodi 19 Matrix
+
+Leia compatible version available in alternate branch
 
 ## Features
 * Browse by artist, albums (newest/most played/recently played/random), tracks (starred/random), and playlists
 * Download songs
 * Star songs
+* Navidrome compatibility added (please report any issues)
+* Scrobble to Last.FM
+* Enhanced data loading from Musicbrainz and wikipedia (switch on in settings and restart)
 
 ## Installation
+From repository
+[repository.warwickh-0.9.0.zip](https://github.com/warwickh/repository.warwickh/raw/master/matrix/zips/repository.warwickh/repository.warwickh-0.9.0.zip) (Please report any issues)
+
+From GitHub
+* Click the code button and download
+* Enable unknown sources and install from zip in Kodi
+ 
+or
 * Navigate to your `.kodi/addons/` folder
-* Clone this repository: `git clone https://github.com/gordielachance/plugin.audio.subsonic.git`
+* Clone this repository: `git clone https://github.com/warwickh/plugin.audio.subsonic.git`
 * (Re)start Kodi.
 
+Note: You will need to enter your server settings into the plugin configuration before use
+
 ## TODO
-* Scrobble to Last.FM (http://forum.kodi.tv/showthread.php?tid=195597&pid=2429362#pid2429362)
 * Improve the caching system
 * Search filter GUI for tracks and albums
 
@@ -24,7 +42,8 @@ https://github.com/gordielachance/plugin.audio.subsonic
 See the `LICENSE` file.
 
 Additional copyright notices:
+* [Previous version of this plugin](https://github.com/gordielachance/plugin.audio.subsonic) by gordielachance
 * [Previous version of this plugin](https://github.com/basilfx/plugin.audio.subsonic) by basilfx
-* [SimplePlugin](https://github.com/romanvm/script.module.simpleplugin/stargazers) by romanvm
+* [SimplePlugin](https://github.com/romanvm/script.module.simpleplugin/stargazers) by romanvm now at [SimplePlugin3](https://github.com/vlmaksime/script.module.simpleplugin)
 * The original [SubKodi](https://github.com/DarkAllMan/SubKodi) plugin
 * [`py-sonic`](https://github.com/crustymonkey/py-sonic) Python module

addon.xml

@@ -1,28 +1,48 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<addon id="plugin.audio.subsonic" name="Subsonic" version="2.0.4" provider-name="BasilFX,grosbouff,lrusak">
-<requires>
-    <import addon="xbmc.python" version="2.14.0"/>
-    <import addon="script.module.dateutil" version="2.4.2"/>
-</requires>
-<extension point="xbmc.python.pluginsource" library="main.py">
-  <provides>audio</provides>
-</extension>
+<addon id="plugin.audio.subsonic" name="Subsonic" version="3.0.3" provider-name="BasilFX,warwickh">
+    <requires>
+        <import addon="xbmc.python" version="3.0.0"/>
+    </requires>
+    <extension point="xbmc.python.pluginsource" library="main.py">
+        <provides>audio</provides>
+    </extension>
+    <extension point="xbmc.service" library="service.py" />
     <extension point="xbmc.addon.metadata">
         <summary lang="en">Subsonic music addon for Kodi.</summary>
+        <summary lang="fr">Extension Subsonic pour Kodi.</summary>
+		<summary lang="de">Subsonic Musik Addon für Kodi.</summary>
         <description lang="en">
             Stream, star and download your tunes, directly to Kodi !
             For feature requests / issues:
-            https://github.com/gordielachance/plugin.audio.subsonic/issues
+            https://github.com/warwickh/plugin.audio.subsonic/issues
             Contributions are welcome:
-            https://github.com/gordielachance/plugin.audio.subsonic
+            https://github.com/warwickh/plugin.audio.subsonic
         </description>
+        <description lang="fr">
+            Jouez, marquez vos favoris et téléchargez votre musique, directement dans Kodi !
+            Pour les demandes et problèmes :
+            https://github.com/warwickh/plugin.audio.subsonic/issues
+            Les contributions sont les bienvenues :
+            https://github.com/warwickh/plugin.audio.subsonic
+        </description>
+		<description lang="de">
+            Streame, bewerte und downloade deine Medien direkt in Kodi !
+	    Für neue Eigentschaften oder Fehler:
+            https://github.com/warwickh/plugin.audio.subsonic/issues
+            Beihilfe ist Willkommen:
+            https://github.com/warwickh/plugin.audio.subsonic
+        </description>
+        <assets>
+            <icon>icon.png</icon>
+            <fanart>fanart.jpg</fanart>
+        </assets>
         <disclaimer lang="en"></disclaimer>
-        <language>en</language>
+        <language>multi</language>
         <platform>all</platform>
         <license>MIT</license>
         <forum></forum>
         <website>http://www.subsonic.org</website>
-        <source>https://github.com/gordielachance/plugin.audio.subsonic</source>
+	<source>https://github.com/warwickh/plugin.audio.subsonic</source>
         <email></email>
     </extension>
 </addon>

lib/dbutils/__init__.py

@@ -0,0 +1,7 @@
+"""
+Databse utilities for plugin.audio.subsonic
+"""
+
+from .dbutils import *
+
+__version__ = '0.0.1'

lib/dbutils/dbutils.py

@@ -0,0 +1,118 @@
+import sqlite3 as sql
+import time
+import xbmc
+
+tbl_artist_info_ddl = str('CREATE TABLE artist_info ('
+                            'artist_id                  TEXT NOT NULL PRIMARY KEY,'
+                            'artist_name                TEXT,'
+                            'artist_info                TEXT,'
+                            'mb_artist_id               TEXT,'
+                            'image_url                  TEXT,'
+                            'wikidata_url               TEXT,'
+                            'wikipedia_url              TEXT,'
+                            'wikipedia_image            TEXT,'
+                            'wikipedia_extract          TEXT,'
+                            'last_update                TEXT);')
+
+class SQLiteDatabase(object):
+    def __init__(self, db_filename):
+        print("Init %s"%db_filename) 
+        self.db_filename = db_filename
+        self.conn = None
+    
+        self.connect()
+
+    def connect(self):
+        try:
+            xbmc.log("Trying connection to the database %s"%self.db_filename, xbmc.LOGINFO)
+            #print("Trying connection to the database %s"%self.db_filename)
+            self.conn = sql.connect(self.db_filename)
+            cursor = self.conn.cursor()
+            cursor.execute(str('SELECT SQLITE_VERSION()'))
+            xbmc.log("Connection %s was successful %s"%(self.db_filename, cursor.fetchone()[0]), xbmc.LOGINFO)
+            #print("Connection %s was successful %s"%(self.db_filename, cursor.fetchone()[0]))
+            cursor.row_factory = lambda cursor, row: row[0]
+            cursor.execute(str('SELECT name FROM sqlite_master WHERE type=\'table\' ''AND name NOT LIKE \'sqlite_%\''))
+            list_tables = cursor.fetchall()
+            if not list_tables:
+                # If no tables exist create a new one
+                xbmc.log("Creating Subsonic local DB", xbmc.LOGINFO)
+                #print("Creating Subsonic local DB")
+                cursor.execute(tbl_artist_info_ddl)
+        except sql.Error as e:
+            xbmc.log("SQLite error %s"%e.args[0], xbmc.LOGINFO)
+            #print("SQLite error %s"%e.args[0])
+
+    def get_cursor(self):
+        return self.conn.cursor()
+
+    def run_query(self, query, params=None, cursor=None):
+        #print("Processing query %s params %s"%(str(query),str(params)))      
+        try:
+            if cursor is None:
+                cursor = self.get_cursor()
+            if params is not None:
+                cursor.execute(query, params)
+            else:
+                cursor.execute(query)
+            #print("%s rows affected"%cursor.rowcount)
+            return cursor
+        except sql.Error as e:
+            print("SQLite error %s"%e.args[0])
+        except ValueError:
+            pass
+            #print("Error query %s"%str(query))  
+            #print("Error query type %s"%type(query))
+            #print("Error params %s"%str(params))  
+            #print("Error params type %s"%type(params))
+
+    def get_record_age(self, artist_id):
+        try:
+            last_update = self.get_value(artist_id, 'last_update')
+            record_age = round(time.time())-round(float(last_update[0][0]))
+            return record_age
+        except IndexError:
+            print("No existing record for artist %s" % artist_id)
+        except Exception as e:
+            print("get_record_age failed %s" % e)
+        return 0
+
+    def get_artist_info(self, artist_id):   
+        query = 'SELECT * FROM artist_info WHERE artist_id = ?'# %str(artist_id)
+        params = [str(artist_id)]    
+        cursor = self.run_query(query, params)
+        return cursor.fetchall()
+
+    def get_all(self):
+        query = 'SELECT * FROM artist_info'
+        #params = [str(artist_id)]    
+        cursor = self.run_query(query)#, params)
+        return cursor.fetchall()
+
+    def update_value(self, artist_id, field_name, field_value):
+        success = False
+        query = 'UPDATE artist_info SET %s = ?, last_update = ? WHERE artist_id = ?' % str(field_name)        
+        params = [str(field_value), str(time.time()), str(artist_id)] 
+        cursor = self.run_query(query, params)
+        if (cursor.rowcount == 0):
+            query = 'INSERT OR IGNORE INTO artist_info (artist_id, %s, last_update) VALUES (?, ?, ?)' % str(field_name)        
+            params = [str(artist_id), str(field_value), str(time.time())] 
+            cursor = self.run_query(query, params)
+        try:
+            self.conn.commit()
+            success = True
+        except Exception as e:
+            print("Exception %s"%e)                
+            pass
+        return success
+
+    def get_value(self, artist_id, field_name):   
+        query = 'SELECT %s FROM artist_info WHERE artist_id = ?' % str(field_name)
+        params = [str(artist_id)]    
+        cursor = self.run_query(query, params)
+        return cursor.fetchall()
+
+    def close(self):
+        if self.conn:
+            self.conn.close()
+        

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 .errors import *
-from pprint import pprint
-from cStringIO import StringIO
+from libsonic.errors import *
 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):
-    _preferred_ssl_protos = sorted([ p for p in dir(ssl)
-        if p.startswith('PROTOCOL_') ], reverse=True)
-    _ssl_working_proto = None
-
+class HTTPSConnectionChain(http_client.HTTPSConnection):
     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:
-            # If we have a working proto, let's use that straight away
-            logger.debug("Using known working proto: '%s'",
-                         self._ssl_working_proto)
-            sock = self._create_sock()
-            self.sock = ssl.wrap_socket(sock, self.key_file, self.cert_file,
-                ssl_version=self._ssl_working_proto)
-            return
+        sock = self._create_sock()
+        try:
+            self.sock = self._context.wrap_socket(sock,
+                server_hostname=self.host)
+        except:
+            sock.close()
 
-        # Try connecting via the different SSL protos in preference order
-        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):
+class HTTPSHandlerChain(urllib.request.HTTPSHandler):
     def https_open(self, req):
-        return self.do_open(HTTPSConnectionChain, req)
+        return self.do_open(HTTPSConnectionChain, req, context=self._context)
 
 # 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():
-                data = req.get_data()
-            return urllib2.Request(newurl,
+            if req.data:
+                data = req.data
+            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
 
@@ -234,11 +228,15 @@ class Connection(object):
         """
         methodName = 'ping'
         viewName = '%s.view' % methodName
-
         req = self._getRequest(viewName)
+        #print("Pinging %s"%str(req.full_url)),level=xbmc.LOGDEBUG)
+        #xbmc.log("Pinging %s"%str(req.full_url),level=xbmc.LOGDEBUG)       
         try:
             res = self._doInfoReq(req)
-        except:
+            #print(res)
+        except Exception as e:
+            #print("Ping failed %s"%e)
+            xbmc.log("Ping failed %s"%e,level=xbmc.LOGDEBUG)
             return False
         if res['status'] == 'ok':
             return True
@@ -271,6 +269,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 +388,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 +853,59 @@ 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)
+        ##xbmc.log("Requesting %s"%str(req.full_url),level=xbmc.LOGDEBUG)
+        return_url = req.full_url
+        if self._insecure:
+            return_url += '|verifypeer=false'
+            #xbmc.log("Request is insecure %s"%return_url,level=xbmc.LOGDEBUG)   
+        return return_url
+
+
     def getCoverArt(self, aid, size=None):
         """
         since: 1.0.0
@@ -832,6 +929,32 @@ class Connection(object):
             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("Requesting %s"%str(req.full_url),level=xbmc.LOGDEBUG)
+        return_url = req.full_url
+        if self._insecure:
+            return_url += '|verifypeer=false'
+            #xbmc.log("Request is insecure %s"%return_url,level=xbmc.LOGDEBUG)   
+        return return_url
+
+
     def scrobble(self, sid, submission=True, listenTime=None):
         """
         since: 1.5.0
@@ -980,7 +1103,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 +1134,7 @@ class Connection(object):
             'uploadRole': uploadRole, 'playlistRole': playlistRole,
             'coverArtRole': coverArtRole, 'commentRole': commentRole,
             'podcastRole': podcastRole, 'shareRole': shareRole,
+            'videoConversionRole': videoConversionRole,
             'musicFolderId': musicFolderId
         })
 
@@ -1024,7 +1148,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 +1180,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)
@@ -1874,6 +1999,7 @@ class Connection(object):
             q['musicFolderId'] = musicFolderId
 
         req = self._getRequest(viewName, q)
+        #xbmc.log("Requesting %s"%str(req.full_url),level=xbmc.LOGDEBUG)        
         res = self._doInfoReq(req)
         self._checkStatus(res)
         return res
@@ -1960,7 +2086,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 +2191,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 +2238,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 +2350,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
@@ -2301,6 +2491,8 @@ class Connection(object):
 
         req = self._getRequest(viewName, q)
         res = self._doInfoReq(req)
+        #print(req.get_full_url())
+        #print(res)
         self._checkStatus(res)
         return res
 
@@ -2376,10 +2568,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 
-        the tracks in the play queue, the currently playing track, and 
-        the position within this track. Typically used to allow a user to 
-        move between different clients/apps while retaining the same play 
+        Saves the state of the play queue for this user. This includes
+        the tracks in the play queue, the currently playing track, and
+        the position within this track. Typically used to allow a user to
+        move between different clients/apps while retaining the same play
         queue (for instance when listening to an audio book).
         """
         methodName = 'savePlayQueue'
@@ -2388,7 +2580,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 +2590,16 @@ class Connection(object):
         """
         since 1.12.0
 
-        Returns the state of the play queue for this user (as set by 
-        savePlayQueue). This includes the tracks in the play queue, 
-        the currently playing track, and the position within this track. 
-        Typically used to allow a user to move between different 
-        clients/apps while retaining the same play queue (for instance 
+        Returns the state of the play queue for this user (as set by
+        savePlayQueue). This includes the tracks in the play queue,
+        the currently playing track, and the position within this track.
+        Typically used to allow a user to move between different
+        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 +2616,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 +2634,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)
@@ -2490,7 +2682,8 @@ class Connection(object):
         methodName = 'getVideoInfo'
         viewName = '%s.view' % methodName
 
-        q = {'id': int(vid)}
+        #q = {'id': int(vid)}
+        q = {'id': vid}
         req = self._getRequest(viewName, q)
         res = self._doInfoReq(req)
         self._checkStatus(res)
@@ -2507,7 +2700,8 @@ class Connection(object):
         methodName = 'getAlbumInfo'
         viewName = '%s.view' % methodName
 
-        q = {'id': int(aid)}
+        #q = {'id': int(aid)}
+        q = {'id': aid}
         req = self._getRequest(viewName, q)
         res = self._doInfoReq(req)
         self._checkStatus(res)
@@ -2524,7 +2718,8 @@ class Connection(object):
         methodName = 'getAlbumInfo2'
         viewName = '%s.view' % methodName
 
-        q = {'id': int(aid)}
+        #q = {'id': int(aid)}
+        q = {'id': aid}
         req = self._getRequest(viewName, q)
         res = self._doInfoReq(req)
         self._checkStatus(res)
@@ -2543,7 +2738,8 @@ class Connection(object):
         methodName = 'getCaptions'
         viewName = '%s.view' % methodName
 
-        q = self._getQueryDict({'id': int(vid), 'format': fmt})
+        #q = self._getQueryDict({'id': int(vid), 'format': fmt})
+        q = self._getQueryDict({'id': vid, 'format': fmt})
         req = self._getRequest(viewName, q)
         res = self._doInfoReq(req)
         self._checkStatus(res)
@@ -2561,7 +2757,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 +2771,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 +2798,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 +2811,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))
-
-        if self._useGET:
+        #xbmc.log("Standard URL %s"%url,level=xbmc.LOGDEBUG)
+        #xbmc.log("Qdict %s"%str(qdict),level=xbmc.LOGDEBUG)
+        req = urllib.request.Request(url, urlencode(qdict).encode('utf-8'))
+        if(self._useGET or ('getCoverArt' in viewName) or ('stream' in viewName)):
             url += '?%s' % urlencode(qdict)
-            req = urllib2.Request(url)
-
+            xbmc.log("UseGET URL %s"%(url), xbmc.LOGDEBUG)
+            #print(url)
+            req = urllib.request.Request(url)
         return req
 
     def _getRequestWithList(self, viewName, listName, alist, query={}):
@@ -2633,7 +2834,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 +2858,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 +2872,17 @@ 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'))
         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 +2922,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 +2932,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,434 +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]
-
-        # Invoke original constructor
-        super(SubsonicClient, self).__init__(
-            host, username, password, port=port, 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):
-        """
-        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):
-        """
-        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):
-        """
-        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]))
-            parts[4].update({"u": self.username, "p": self.password})
-            parts[4] = urllib.urlencode(parts[4])
-
-            return urlparse.urlunparse(parts)
-        else:
-            return super(SubsonicClient, self)._doBinReq(*args, **kwargs)
-
-    def walk_index(self):
-        """
-        Request Subsonic's index and iterate each item.
-        """
-
-        response = self.getIndexes()
-
-        for index in response["indexes"]["index"]:
-            for index in index["artist"]:
-                for item in self.walk_directory(index["id"]):
-                    yield item
-
-        for child in response["indexes"]["child"]:
-            if child.get("isDir"):
-                for child in self.walk_directory(child["id"]):
-                    yield child
-            else:
-                yield child
-
-    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_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):
-        """
-        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):
-        """
-        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):
-        """
-        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):
-        """
-        Request an alum 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/musicbrainz/__init__.py

@@ -0,0 +1,6 @@
+"""
+Musicbrainz utilities for plugin.audio.subsonic
+"""
+from .mbconnection import *
+
+__version__ = '0.0.1'

lib/musicbrainz/mbconnection.py

@@ -0,0 +1,146 @@
+import os
+import json
+import urllib.request
+from urllib.parse import urlencode
+import xml.etree.ElementTree as ET
+import re
+
+urllib.request.install_opener(urllib.request.build_opener(urllib.request.HTTPSHandler))
+
+class MBConnection(object):
+    def __init__(self, lang = "en"):
+        self._lang = lang        
+        self._baseUrl = "https://musicbrainz.org/ws/2"
+        self._wikipediaBaseUrl = "https://{}.wikipedia.org/wiki".format(self._lang)
+        self._wikidataBaseUrl = "https://www.wikidata.org/wiki/Special:EntityData"
+        self._opener = self._getOpener()
+
+    def _getOpener(self):
+        opener = urllib.request.build_opener(urllib.request.HTTPSHandler)
+        return opener
+
+    def search(self, entity, query, limit=None, offset=None):
+        viewName = '%s' % entity
+        q = self._getQueryDict({'query': query, 'limit': limit, 'offset': offset})
+        req = self._getRequest(self._baseUrl, viewName, q)
+        res = self._doInfoReqXml(req)
+        return res
+
+    def get_wiki_extract(self, title):
+        try:        
+            if('http' in title):
+                #accepts search text or full url https://en.wikipedia.org/wiki/Alex_Lloyd
+                pattern = 'wikipedia.org/wiki/(.+)'
+                title = re.search(pattern, title).group(1)
+            viewName = 'api.php'
+            q = self._getQueryDict({'format' : 'json', 'action' : 'query', 'prop' : 'extracts', 'redirects' : 1, 'titles' : title})
+            req = self._getRequest(self._wikipediaBaseUrl[:-3], viewName, q, 'exintro&explaintext&')
+            res = self._doInfoReqJson(req)
+            pages = res['query']['pages']
+            extract = list(pages.values())[0]['extract']
+            return extract
+        except Exception as e:
+            print("get_artist_wikpedia failed %s"%e)
+        return
+
+#https://en.wikipedia.org/w/api.php?exintro&explaintext&format=json&action=query&prop=extracts&redirects=1&titles=%C3%89milie_Simon
+    def get_wiki_image(self, title):
+        try:
+            if('http' in title):
+                #accepts search text or full url https://en.wikipedia.org/wiki/Alex_Lloyd
+                pattern = 'wikipedia.org/wiki/(.+)'
+                title = re.search(pattern, title).group(1)
+            viewName = 'api.php'
+            q = self._getQueryDict({'format' : 'json', 'action' : 'query', 'prop' : 'pageimages', 'pithumbsize' : 800, 'titles' : title})
+            req = self._getRequest(self._wikipediaBaseUrl[:-3], viewName, q)
+            res = self._doInfoReqJson(req)
+            pages = res['query']['pages']
+            print(res['query']['pages'])
+            image_url = list(pages.values())[0]['thumbnail']['source']
+            return image_url
+        except Exception as e:
+            print("get_wiki_image failed %s"%e)
+        return
+
+    def get_artist_id(self, query):
+        try:
+            dres = self.search('artist', query)
+            artist_list = dres.find('{http://musicbrainz.org/ns/mmd-2.0#}artist-list')
+            artist = artist_list.find('{http://musicbrainz.org/ns/mmd-2.0#}artist') 
+            return artist.attrib['id']
+        except Exception as e:
+            print("get_artist_id failed %s"%e)
+        return
+
+    def get_relation(self, artist_id, rel_type):
+        try:
+            viewName = 'artist/%s' % artist_id
+            q = self._getQueryDict({'inc': "url-rels"})
+            req = self._getRequest(self._baseUrl, viewName, q)
+            res = self._doInfoReqXml(req)
+            for relation in res.iter('{http://musicbrainz.org/ns/mmd-2.0#}relation'):
+                if relation.attrib['type'] == rel_type:
+                    return relation.find('{http://musicbrainz.org/ns/mmd-2.0#}target').text
+        except Exception as e:
+            print("get_artist_image failed %s"%e)
+        return
+
+    def get_artist_image(self, artist_id):
+        try:
+            image = self.get_relation(artist_id, 'image')       
+            return image
+        except Exception as e:
+            print("get_artist_image failed %s"%e)
+        return
+
+    def get_artist_wikpedia(self, artist_id):   
+        wikidata_url = self.get_relation(artist_id, 'wikidata') 
+        pattern = 'www.wikidata.org/wiki/(Q\d+)'
+        try:
+            wikidata_ref = re.search(pattern, wikidata_url).group(1)
+            viewName = '%s.rdf' % wikidata_ref
+            q = self._getQueryDict({})
+            req = self._getRequest(self._wikidataBaseUrl, viewName, q )
+            res = self._doInfoReqXml(req)
+            for item in res.iter('{http://www.w3.org/1999/02/22-rdf-syntax-ns#}Description'):
+                try:
+                    url = item.attrib['{http://www.w3.org/1999/02/22-rdf-syntax-ns#}about']
+                    if self._wikipediaBaseUrl in url:
+                        #print(urlencode(url))
+                        #print((url.encode().decode('unicode-escape')))
+                        return urllib.parse.unquote(url)
+                except KeyError:
+                    pass
+        except Exception as e:
+            print("get_artist_wikpedia failed %s"%e)
+        return
+
+    def _getQueryDict(self, d):
+        """
+        Given a dictionary, it cleans out all the values set to None
+        """
+        for k, v in list(d.items()):
+            if v is None:
+                del d[k]
+        return d    
+
+    def _getRequest(self, baseUrl, viewName, query={}, prefix=""):
+        qdict = {}
+        qdict.update(query)
+        url = '%s/%s' % (baseUrl, viewName)
+        if(prefix!='' or qdict!={}):
+            url += "?%s%s" % (prefix, urlencode(qdict))
+        print("UseGET URL %s" % (url))
+        req = urllib.request.Request(url)
+        return req
+
+    def _doInfoReqXml(self, req):
+        res = urllib.request.urlopen(req)
+        data = res.read().decode('utf-8')   
+        dres = ET.fromstring(data)
+        return dres
+
+    def _doInfoReqJson(self, req):
+        res = urllib.request.urlopen(req)
+        dres = json.loads(res.read().decode('utf-8'))
+        return dres

lib/simpleplugin/__init__.py

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

resources/language/English/strings.po

@@ -0,0 +1,182 @@
+# XBMC Media Center language file
+# Addon Name: Subsonic
+# Addon id: plugin.audio.subsonic
+# Addon Provider: 
+# Addon Translate: Moshkopp 
+
+msgid ""
+msgstr ""
+
+
+msgctxt "#30000"
+msgid "General"
+msgstr ""
+
+msgctxt "#30001"
+msgid "Server"
+msgstr ""
+
+msgctxt "#30002"
+msgid "Server URL"
+msgstr ""
+
+msgctxt "#30003"
+msgid "Username"
+msgstr ""
+
+msgctxt "#30004"
+msgid "Password"
+msgstr ""
+
+msgctxt "#30005"
+msgid "Display"
+msgstr ""
+
+msgctxt "#30006"
+msgid "Albums per page"
+msgstr ""
+
+msgctxt "#30007"
+msgid "Tracks per page (ignored in albums & playlists)"
+msgstr ""
+
+msgctxt "#30008"
+msgid "Download"
+msgstr ""
+
+msgctxt "#30009"
+msgid "Download folder"
+msgstr ""
+
+msgctxt "#30010"
+msgid "Streaming"
+msgstr ""
+
+msgctxt "#30011"
+msgid "Transcode format"
+msgstr ""
+
+msgctxt "#30012"
+msgid "Bitrate"
+msgstr ""
+
+msgctxt "#30013"
+msgid "Advanced Settings"
+msgstr ""
+
+msgctxt "#30014"
+msgid "API version"
+msgstr ""
+
+msgctxt "#30016"
+msgid "Allow self signed certificates"
+msgstr ""
+
+msgctxt "#30017"
+msgid "Cache (in minutes)"
+msgstr ""
+
+msgctxt "#30018"
+msgid "Cache data time"
+msgstr ""
+
+msgctxt "#30019"
+msgid "Library"
+msgstr ""
+
+msgctxt "#30020"
+msgid "Albums"
+msgstr ""
+
+msgctxt "#30021"
+msgid "Tracks"
+msgstr ""
+
+msgctxt "#30022"
+msgid "Playlists"
+msgstr ""
+
+msgctxt "#30023"
+msgid "Newest albums"
+msgstr ""
+
+msgctxt "#30024"
+msgid "Most played albums"
+msgstr ""
+
+msgctxt "#30025"
+msgid "Recently played albums"
+msgstr ""
+
+msgctxt "#30026"
+msgid "Random albums"
+msgstr ""
+
+msgctxt "#30029"
+msgid "Next page"
+msgstr ""
+
+
+msgctxt "#30030"
+msgid "Back to Menu"
+msgstr ""
+
+msgctxt "#30031"
+msgid "Item has been unstarred."
+msgstr ""
+
+msgctxt "#30032"
+msgid "Item has been starred!"
+msgstr ""
+
+msgctxt "#30033"
+msgid "Star on Subsonic"
+msgstr ""
+
+msgctxt "#30034"
+msgid "Unstar on Subsonic"
+msgstr ""
+
+msgctxt "#30035"
+msgid "Download"
+msgstr ""
+
+msgctxt "#30036"
+msgid "Starred tracks"
+msgstr ""
+
+msgctxt "#30037"
+msgid "Random tracks"
+msgstr ""
+
+msgctxt "#30038"
+msgid "Browse"
+msgstr ""
+
+msgctxt "#30039"
+msgid "Search"
+msgstr ""
+
+msgctxt "#30040"
+msgid "useGET"
+msgstr ""
+
+msgctxt "#30041"
+msgid "legacyauth"
+msgstr ""
+
+msgctxt "#30042"
+msgid "port"
+msgstr ""
+
+msgctxt "#30043"
+msgid "Merge album folders"
+msgstr ""
+
+msgctxt "#30044"
+msgid "Scrobble to Last.FM"
+msgstr ""
+
+msgctxt "#30045"
+msgid "Enhanced Information"
+msgstr ""

resources/language/French/strings.po

@@ -0,0 +1,182 @@
+# XBMC Media Center language file
+# Addon Name: Subsonic
+# Addon id: plugin.audio.subsonic
+# Addon Provider: 
+# Addon Translate: Gordie 
+
+msgid ""
+msgstr ""
+
+
+msgctxt "#30000"
+msgid "General"
+msgstr "Général"
+
+msgctxt "#30001"
+msgid "Server"
+msgstr "Serveur"
+
+msgctxt "#30002"
+msgid "Server URL"
+msgstr "URL du serveur"
+
+msgctxt "#30003"
+msgid "Username"
+msgstr "Nom d'utilisateur"
+
+msgctxt "#30004"
+msgid "Password"
+msgstr "Mot de passe"
+
+msgctxt "#30005"
+msgid "Display"
+msgstr "Affichage"
+
+msgctxt "#30006"
+msgid "Albums per page"
+msgstr "Albums par page"
+
+msgctxt "#30007"
+msgid "Tracks per page (ignored in albums & playlists)"
+msgstr "Pistes par page (ignoré dans les albums & listes de lecture)"
+
+msgctxt "#30008"
+msgid "Download"
+msgstr "Télécharger"
+
+msgctxt "#30009"
+msgid "Download folder"
+msgstr "Répertoire de téléchargement"
+
+msgctxt "#30010"
+msgid "Streaming"
+msgstr "Diffusion"
+
+msgctxt "#30011"
+msgid "Transcode format"
+msgstr "Format de transcodage"
+
+msgctxt "#30012"
+msgid "Bitrate"
+msgstr "Bitrate"
+
+msgctxt "#30013"
+msgid "Advanced Settings"
+msgstr "Paramètres avancés"
+
+msgctxt "#30014"
+msgid "API version"
+msgstr "Version de l'API"
+
+msgctxt "#30016"
+msgid "Allow self signed certificates"
+msgstr "Autoriser les certificats auto-signés"
+
+msgctxt "#30017"
+msgid "Cache (in minutes)"
+msgstr "Cache (en minutes)"
+
+msgctxt "#30018"
+msgid "Cache datas time"
+msgstr "Durée du cache pour les données"
+
+msgctxt "#30019"
+msgid "Library"
+msgstr "Bibliothèque"
+
+msgctxt "#30020"
+msgid "Albums"
+msgstr "Albums"
+
+msgctxt "#30021"
+msgid "Tracks"
+msgstr "Pistes"
+
+msgctxt "#30022"
+msgid "Playlists"
+msgstr "Playlists"
+
+msgctxt "#30023"
+msgid "Newest albums"
+msgstr "Nouveaux albums"
+
+msgctxt "#30024"
+msgid "Most played albums"
+msgstr "Albums les plus joués"
+
+msgctxt "#30025"
+msgid "Recently played albums"
+msgstr "Albums joués récemment"
+
+msgctxt "#30026"
+msgid "Random albums"
+msgstr "Albums au hasard"
+
+msgctxt "#30029"
+msgid "Next page"
+msgstr "Page suivante"
+
+msgctxt "#30030"
+msgid "Back to Menu"
+msgstr "Retour au menu"
+
+msgctxt "#30031"
+msgid "Item has been unstarred."
+msgstr "Cet élément a été retiré des favoris"
+
+msgctxt "#30032"
+msgid "Item has been starred!"
+msgstr "Cet élément a été ajouté aux favoris !"
+
+msgctxt "#30033"
+msgid "Star on Subsonic"
+msgstr "Ajouter aux favoris Subsonic"
+
+msgctxt "#30034"
+msgid "Unstar on Subsonic"
+msgstr "Retirer des favoris Subsonic"
+
+msgctxt "#30035"
+msgid "Download"
+msgstr "Télécharger"
+
+msgctxt "#30036"
+msgid "Starred tracks"
+msgstr "Pistes favorites"
+
+msgctxt "#30037"
+msgid "Random tracks"
+msgstr "Pistes au hasard"
+
+msgctxt "#30038"
+msgid "Browse"
+msgstr "Parcourir"
+
+msgctxt "#30039"
+msgid "Search"
+msgstr "Rechercher"
+
+
+msgctxt "#30040"
+msgid "useGET"
+msgstr ""
+
+msgctxt "#30041"
+msgid "legacyauth"
+msgstr ""
+
+msgctxt "#30042"
+msgid "port"
+msgstr ""
+
+msgctxt "#30043"
+msgid "Merge album folders"
+msgstr ""
+
+msgctxt "#30044"
+msgid "Scrobble to Last.FM"
+msgstr ""
+
+msgctxt "#30045"
+msgid "Enhanced Information"
+msgstr ""

resources/language/German/strings.po

@@ -0,0 +1,181 @@
+# XBMC Media Center language file
+# Addon Name: Subsonic
+# Addon id: plugin.audio.subsonic
+# Addon Provider: 
+# Addon Translate: Moshkopp 
+
+msgid ""
+msgstr ""
+
+
+msgctxt "#30000"
+msgid "General"
+msgstr "Allgemein"
+
+msgctxt "#30001"
+msgid "Server"
+msgstr "Server"
+
+msgctxt "#30002"
+msgid "Server URL"
+msgstr "Serveradresse"
+
+msgctxt "#30003"
+msgid "Username"
+msgstr "Benutzername"
+
+msgctxt "#30004"
+msgid "Password"
+msgstr "Passwort"
+
+msgctxt "#30005"
+msgid "Display"
+msgstr "Anzeige"
+
+msgctxt "#30006"
+msgid "Albums per page"
+msgstr "Alben pro Seite"
+
+msgctxt "#30007"
+msgid "Tracks per page (ignored in albums & playlists)"
+msgstr "Lieder pro Seite (wird in Alben und Playlisten ignoriert)"
+
+msgctxt "#30008"
+msgid "Download"
+msgstr "Download"
+
+msgctxt "#30009"
+msgid "Download folder"
+msgstr "Download Verzeichnis"
+
+msgctxt "#30010"
+msgid "Streaming"
+msgstr "Übertragung"
+
+msgctxt "#30011"
+msgid "Transcode format"
+msgstr "Umwandlungs Format"
+
+msgctxt "#30012"
+msgid "Bitrate"
+msgstr "Bitrate"
+
+msgctxt "#30013"
+msgid "Advanced Settings"
+msgstr "Erweitert"
+
+msgctxt "#30014"
+msgid "API version"
+msgstr "API Version"
+
+msgctxt "#30016"
+msgid "Allow self signed certificates"
+msgstr "Erlaube eigensignierte Zertifikate"
+
+msgctxt "#30017"
+msgid "Cache (in minutes)"
+msgstr "Speicher (in Minuten)"
+
+msgctxt "#30018"
+msgid "Cache datas time"
+msgstr "Speicher Daten Zeit"
+
+msgctxt "#30019"
+msgid "Library"
+msgstr "Bibliothek"
+
+msgctxt "#30020"
+msgid "Albums"
+msgstr "Alben"
+
+msgctxt "#30021"
+msgid "Tracks"
+msgstr "Lieder"
+
+msgctxt "#30022"
+msgid "Playlists"
+msgstr "Playlisten"
+
+msgctxt "#30023"
+msgid "Newest albums"
+msgstr "Neueste Alben"
+
+msgctxt "#30024"
+msgid "Most played albums"
+msgstr "Häufig gehörte Alben"
+
+msgctxt "#30025"
+msgid "Recently played albums"
+msgstr "Zuletzt gehörte Alben"
+
+msgctxt "#30026"
+msgid "Random albums"
+msgstr "Zufällige Alben"
+
+msgctxt "#30029"
+msgid "Next page"
+msgstr "Nächste Seite"
+
+msgctxt "#30030"
+msgid "Back to Menu"
+msgstr "Hauptmenü"
+
+msgctxt "#30031"
+msgid "Item has been unstarred."
+msgstr "Bewertung entfernt"
+
+msgctxt "#30032"
+msgid "Item has been starred!"
+msgstr "Bewertung hinzugefügt"
+
+msgctxt "#30033"
+msgid "Star on Subsonic"
+msgstr "Bewerten auf Subsonic"
+
+msgctxt "#30034"
+msgid "Unstar on Subsonic"
+msgstr "Löschen auf Subsonic"
+
+msgctxt "#30035"
+msgid "Download"
+msgstr "Herunterladen"
+
+msgctxt "#30036"
+msgid "Starred tracks"
+msgstr "Lieblings lieder"
+
+msgctxt "#30037"
+msgid "Random tracks"
+msgstr "Zufällig lieder"
+
+msgctxt "#30038"
+msgid "Browse"
+msgstr "Durchsuchen"
+
+msgctxt "#30039"
+msgid "Search"
+msgstr "Suche"
+
+msgctxt "#30040"
+msgid "useGET"
+msgstr ""
+
+msgctxt "#30041"
+msgid "legacyauth"
+msgstr ""
+
+msgctxt "#30042"
+msgid "port"
+msgstr ""
+
+msgctxt "#30043"
+msgid "Merge album folders"
+msgstr ""
+
+msgctxt "#30044"
+msgid "Scrobble to Last.FM"
+msgstr ""
+
+msgctxt "#30045"
+msgid "Enhanced Information"
+msgstr ""

resources/settings.xml

@@ -1,27 +1,34 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <settings>
     <!-- GENERAL -->
-    <category label="General">
-        <setting label="Server" type="lsep" />
-        <setting id="subsonic_url" type="text" label="Server URL" default="http://demo.subsonic.org"/>
-        <setting id="username" type="text" label="Username" default="guest3"/>
-        <setting id="password" type="text" option="hidden" label="Password" default="guest"/>
-        <setting label="Display" type="lsep" />
-        <setting id="albums_per_page" type="labelenum" label="Albums per page" default="50" values="10|25|50|100|250|500"/>
-        <setting id="tracks_per_page" type="labelenum" label="Tracks per page (ignored in albums & playlists)" default="100" values="10|25|50|100|250|500"/>
-        <setting label="Download" type="lsep" />
-        <setting id="download_folder"  type="folder" label="Download folder" source="auto" option="writeable"/>
-        <setting label="Streaming" type="lsep" />
-        <setting id="transcode_format_streaming" type="labelenum" label="Transcode format" values="mp3|raw|flv|ogg"/>
-        <setting id="bitrate_streaming" type="labelenum" label="Bitrate" values="320|256|224|192|160|128|112|96|80|64|56|48|40|32"/>
+    <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="text"  default="80"/>
+        <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" />
+        <setting label="30006" id="albums_per_page" type="labelenum"  default="50" values="10|25|50|100|250|500"/>
+        <setting label="30007" id="tracks_per_page" type="labelenum"  default="100" values="10|25|50|100|250|500"/>
+        <setting label="30008" type="lsep" />
+        <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" default="0" values="320|256|224|192|160|128|112|96|80|64|56|48|40|32|0"/>
     </category>
     
     <!-- ADVANCED -->
-  	<category label="Advanced Settings">
-        <setting label="Server" type="lsep" />
-        <setting id="apiversion" type="labelenum" label="API version" values="1.11.0|1.12.0|1.13.0|1.14.0" default="1.13.0"/>
-        <setting id="insecure" type="bool" label="Allow self signed certificates" default="false" />
-        <setting label="Cache (in minutes) - not yet implemented" type="lsep" />
-        <setting id="cachetime" type="labelenum" label="Cache datas time" default="5" values="1|5|15|30|60|120|180|720|1440"/>
+  	<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|1.15.0|1.16.0" default="1.15.0"/>
+		<setting label="30016" id="insecure" type="bool"  default="false" />
+		<setting label="30040" id="useget" type="bool"  default="true" />
+		<setting label="30041" id="legacyauth" type="bool" default="false" />
+        <setting label="30017" type="lsep" />
+        <setting label="30018" id="cachetime" type="labelenum"  default="3600" values="1|5|15|30|60|120|180|720|1440|3600"/>
+        <setting label="30043" id="merge" type="bool" default="false" />
+        <setting label="30044" id="scrobble" type="bool" default="false" />
+        <setting label="30045" id="enhanced_info" type="bool" default="false" />
+		
 	</category>
 </settings>

service.py

@@ -0,0 +1,220 @@
+import re
+import xbmc
+import xbmcvfs
+import os
+import xbmcaddon
+import time
+import random
+
+# Add the /lib folder to sys
+sys.path.append(xbmcvfs.translatePath(os.path.join(xbmcaddon.Addon("plugin.audio.subsonic").getAddonInfo("path"), "lib")))
+
+import dbutils
+import libsonic
+import musicbrainz
+
+connection = None
+db = None
+mb = None
+
+serviceEnabled = True
+
+refresh_age = 86400#3600     #multiple of random to age info records - needs some validation
+check_freq_init = 30   #How often to run a refresh cycle - needs some validation - updates afer first load to
+check_freq_refresh = 86400
+
+
+db_filename = "subsonic_sqlite.db"
+
+last_db_check = 0
+current_artist_index = 0
+
+from simpleplugin import Plugin
+from simpleplugin import Addon
+
+# Create plugin instance
+plugin = Plugin()
+
+try:
+    enhancedInfo = Addon().get_setting('enhanced_info')
+except:
+    enhancedInfo = False
+
+try:
+    scrobbleEnabled = Addon().get_setting('scrobble')
+except:
+    scrobbleEnabled = False
+
+scrobbled = False
+
+def check_address_format():
+    address = Addon().get_setting('subsonic_url')
+    port = Addon().get_setting('port')
+    if len(address.split(":"))>2:
+        found_port = address.split(":")[2]            
+        plugin.log("Found port %s in address %s, splitting"%(found_port, address))
+        plugin.log("Changing port from %s to %s"%(port, found_port))
+        Addon().set_setting('port', int(found_port))
+        Addon().set_setting('subsonic_url', "%s:%s"%(address.split(":")[0],address.split(":")[1]))
+        
+def popup(text, time=5000, image=None):
+    title = plugin.addon.getAddonInfo('name')
+    icon = plugin.addon.getAddonInfo('icon')
+    xbmc.executebuiltin('Notification(%s, %s, %d, %s)' % (title, text, time, icon))
+
+def get_connection():
+    global connection    
+    if connection==None:   
+        connected = False    
+        try:
+            connection = libsonic.Connection(
+                baseUrl=Addon().get_setting('subsonic_url'),
+                username=Addon().get_setting('username', convert=False),
+                password=Addon().get_setting('password', convert=False),
+                port=Addon().get_setting('port'),
+                apiVersion=Addon().get_setting('apiversion'),
+                insecure=Addon().get_setting('insecure'),
+                legacyAuth=Addon().get_setting('legacyauth'),
+                useGET=Addon().get_setting('useget'),
+                appName="Kodi-Subsonic",
+            )            
+            connected = connection.ping()
+        except:
+            pass
+
+        if connected==False:
+            popup('Connection error')
+            return False
+
+    return connection
+
+def get_mb():
+    global mb
+    mb = musicbrainz.MBConnection()
+    return mb
+
+def get_db():
+    global db
+    db_path = os.path.join(plugin.profile_dir, db_filename)   
+    plugin.log("Getting DB %s"%db_path)  
+    try:
+        db = dbutils.SQLiteDatabase(db_path)
+    except Exception as e:
+        plugin.log("Connecting to DB failed: %s"%e)    
+    return db   
+
+def refresh_artist(artist_id):
+    db = get_db()
+    connection = get_connection()
+    artist = connection.getArtist(artist_id)#['subsonic-response']
+    artist_name = artist['artist']['name']
+    db.update_value(artist_id, 'artist_name', artist_name)
+    artist_info = connection.getArtistInfo2(artist_id)
+    try:
+        artist_info = artist_info['artistInfo2']['biography']
+        #pattern = '<a target=\'_blank\' href="https://www.last.fm/music/Afrojack">Read more on Last.fm</a>
+        artist_info = re.sub('<a.*?</a>', '', artist_info)
+        plugin.log("subbed: %s"%artist_info)
+    except:
+        artist_info = ""
+    if(enhancedInfo):
+        mb = get_mb()        
+        mb_artist_id = mb.get_artist_id(artist_name)
+        artist_image_url = mb.get_artist_image(mb_artist_id)
+        wikipedia_url = mb.get_artist_wikpedia(mb_artist_id)
+        artist_wiki_extract = mb.get_wiki_extract(wikipedia_url)
+        wikipedia_image = mb.get_wiki_image(wikipedia_url)
+        db.update_value(artist_id, 'artist_info', artist_info)
+        db.update_value(artist_id, 'mb_artist_id', mb_artist_id)
+        db.update_value(artist_id, 'image_url', artist_image_url)
+        db.update_value(artist_id, 'wikipedia_url', wikipedia_url)
+        db.update_value(artist_id, 'wikipedia_extract', artist_wiki_extract)
+        db.update_value(artist_id, 'wikipedia_image', wikipedia_image)
+
+def check_db_status():
+    global last_db_check
+    global check_freq_init
+    global current_artist_index 
+    try:             
+        if(time.time()-check_freq_init > last_db_check): #Won't check on every run uses check_freq_init
+            plugin.log("DB check starting %s %s" % (time.time(), last_db_check))
+            db = get_db()
+            connection = get_connection()
+            response = connection.getArtists()
+            current_index_content = response["artists"]["index"][current_artist_index] #Completes refresh for alpha index
+            plugin.log("Starting info load for index %s"%current_index_content['name'])
+            for artist in current_index_content["artist"]:
+                artist_id = artist['id']
+                record_age = db.get_record_age(artist_id)
+                rnd_age =  random.randint(1,111)*refresh_age
+                #plugin.log("Record age %s vs %s for %s"%(record_age, rnd_age, artist_id))
+                if(not record_age or (record_age > rnd_age)):
+                    #plugin.log("Refreshing %s" % (artist_id))
+                    refresh_artist(artist_id)
+                    #plugin.log("Refresh complete for %s" % (artist_id))
+            plugin.log("Finished info loading for index %s"%current_index_content['name'])
+            current_artist_index+=1
+            if(current_artist_index>=len(response["artists"]["index"])): #init load complete go to daily check freq
+                plugin.log("Finished info loading for all alpha index")
+                current_artist_index=0
+                check_freq_init = check_freq_refresh
+                plugin.log("check_freq_init is now %s"%check_freq_init)
+            last_db_check = time.time()
+    except Exception as e:
+        plugin.log("Refresh check failed %s"%e)
+
+    return
+
+def check_player_status():
+    global scrobbled
+    if (scrobbleEnabled and xbmc.getCondVisibility("Player.HasMedia")):
+        try:             
+            currentFileName = xbmc.getInfoLabel("Player.Filenameandpath")
+            currentFileProgress = xbmc.getInfoLabel("Player.Progress")   
+            pattern = re.compile(r'plugin:\/\/plugin\.audio\.subsonic\/\?action=play_track&id=(.*?)&')
+            currentTrackId = re.findall(pattern, currentFileName)[0]                
+            #xbmc.log("Name %s Id %s Progress %s"%(currentFileName,currentTrackId,currentFileProgress), xbmc.LOGDEBUG)                
+            if (int(currentFileProgress)<50):
+                scrobbled = False
+            elif (int(currentFileProgress)>=50 and scrobbled == False):
+                xbmc.log("Scrobbling Track Id %s"%(currentTrackId), xbmc.LOGDEBUG)
+                success = scrobble_track(currentTrackId)
+                if success:
+                    scrobbled = True
+            else:
+                pass
+        except IndexError:
+            plugin.log ("Not a Subsonic track")
+            scrobbled = True
+        except Exception as e:
+            xbmc.log("Subsonic scrobble check failed %e"%e, xbmc.LOGINFO)
+    return                
+
+def scrobble_track(track_id):
+    connection = get_connection()
+    if connection==False:
+        return False
+    res = connection.scrobble(track_id)
+    #xbmc.log("response %s"%(res), xbmc.LOGINFO)
+    if res['status'] == 'ok':
+        popup("Scrobbled track")
+        return True
+    else:
+        popup("Scrobble failed")
+        xbmc.log("Scrobble failed", xbmc.LOGERROR)
+        return False
+
+
+if __name__ == '__main__':
+    if serviceEnabled:  
+        check_address_format()        
+        monitor = xbmc.Monitor()
+        xbmc.log("Subsonic service started", xbmc.LOGINFO)
+        popup("Subsonic service started")
+        while not monitor.abortRequested():
+            if monitor.waitForAbort(10):
+                break
+            check_player_status()
+            check_db_status()
+    else:
+        plugin.log("Subsonic service not enabled")