Merge pull request #30 from warwickh/master

Merge Matrix compatible to master

CHANGELOG.md

@@ -1,5 +1,14 @@
 # Changelog
 
+## 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. 

README.md

@@ -1,20 +1,33 @@
 # Subsonic
 Kodi plugin to stream, star and download music from Subsonic.
+
 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
 
 ## Installation
+* 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 may need to install dependencies manually if installing this way
+
 ## TODO
 * Scrobble to Last.FM (http://forum.kodi.tv/showthread.php?tid=195597&pid=2429362#pid2429362)
 * Improve the caching system
@@ -24,7 +37,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,8 +1,9 @@
 <?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="3.0.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"/>
+    <import addon="script.module.future" version="0.18.2"/>
 </requires>
 <extension point="xbmc.python.pluginsource" library="main.py">
   <provides>audio</provides>
@@ -14,31 +15,35 @@
         <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/gordielachance/plugin.audio.subsonic/issues
+            https://github.com/warwickh/plugin.audio.subsonic/issues
             Les contributions sont les bienvenues :
-            https://github.com/gordielachance/plugin.audio.subsonic
+            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/gordielachance/plugin.audio.subsonic/issues
+            https://github.com/warwickh/plugin.audio.subsonic/issues
             Beihilfe ist Willkommen:
-            https://github.com/gordielachance/plugin.audio.subsonic
+            https://github.com/warwickh/plugin.audio.subsonic
         </description>
+        <assets>
+            <icon>icon.png</icon>
+            <fanart>fanart.png</fanart>
+        </assets>
         <disclaimer lang="en"></disclaimer>
         <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/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'