Merge branch 'release/3.0.0'

Author: Brian Hornsby

.gitignore

@@ -1,10 +1,4 @@
-
-resources/__init__.pyc
-
-resources/lib/__init__.pyc
-
-resources/lib/xbmcsettings.pyc
-
-resources/lib/xbmcutils.pyc
-
+resources/*.pyc
+resources/lib/*.pyc
 *.pyc
+*.pyo

README.md

@@ -1,7 +1,7 @@
-SimilarTracks for XBMC
+SimilarTracks for Kodi
 ===========
 
-A script that uses the currently playing track to generate a playlist of similar tracks in your XBMC music library.
+A script that uses the currently playing track to generate a playlist of similar tracks in your Kodi music library.
 
 Features
 --------
@@ -21,7 +21,7 @@ Screenshots
 
 Installation
 -----------
-Download the latest zip file and install the addon. See http://wiki.xbmc.org/?title=Add-ons#How_to_install_from_a_ZIP_file for more details on installing addons from zip file.
+Download the latest zip file and install the addon. See http://kodi.wiki/view/HOW-TO:Install_an_Add-on_from_a_zip_file for more details on installing addons from zip file.
 
 Usage
 -----
@@ -39,7 +39,7 @@ The following settings are available.
 
 License
 -------
-SimilarTracks for XBMC is licensed under the [GPL 3.0 license] [1].
+SimilarTracks for Kodi is licensed under the [GPL 3.0 license] [1].
 
 
 [1]: http://www.gnu.org/licenses/gpl-3.0.html

addon.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<addon id="script.similartracks" name="Similar Tracks" version="2.0.1" provider-name="brianhornsby">
+<addon id="script.similartracks" name="Similar Tracks" version="3.0.0" provider-name="brianhornsby">
 	<requires>
 		<import addon="xbmc.python" version="2.1.0"/>
 		<import addon="script.module.simplejson" version="2.0.10"/>
@@ -9,5 +9,8 @@
 	<summary lang="en">Creates a playlist based on tracks from your music library that are similar to the currently playing track.</summary>
 	<description lang="en">Creates a playlist based on tracks from your music library that are similar to the currently playing track. Uses the last.fm track.getSimilar api.</description>
 	<platform>all</platform>
+	<license>GNU GENERAL PUBLIC LICENSE. Version 3, 29 June 2007</license>
+	<website>http://brianhornsby.com/kodi_addons/similartracks</website>
+	<source>https://github.com/brianhornsby/script.similartracks</source>
   </extension>
 </addon>

changelog.txt

@@ -1,3 +1,6 @@
+*** 3.0.0 ***
+Updated plugin to use Kodi name. Updated copyright date. [d9ac0ea]
+
 *** 2.0.1 ***
 Fix for issue #1 where unicode character was causing script to raise an exception.
 

default.py

@@ -1,9 +1,9 @@
 
 #/*
 # *
-# * SimilarTracks for XBMC.
+# * SimilarTracks for Kodi.
 # *
-# * Copyright (C) 2013 Brian Hornsby
+# * Copyright (C) 2015 Brian Hornsby
 # *
 # * This program is free software: you can redistribute it and/or modify
 # * it under the terms of the GNU General Public License as published by
@@ -27,16 +27,16 @@
 import xbmcgui
 from urllib2 import urlopen, URLError
 
-import resources.lib.xbmcsettings as xbmcsettings
-import resources.lib.xbmcutils as utils
+import resources.lib.kodisettings as kodisettings
+import resources.lib.kodiutils as utils
 
 if sys.version_info < (2, 7):
     import simplejson
 else:
     import json as simplejson
 
 _addonid = 'script.similartracks'
-_settings = xbmcsettings.XBMCSettings(_addonid, sys.argv)
+_settings = kodisettings.KodiSettings(_addonid, sys.argv)
 
 # Get addon information and settings.
 _addonname = _settings.get_name()
@@ -199,7 +199,7 @@ def add_tracks_to_playlist(artist, playlisttracks):
             pDialog.update(25, _settings.get_string(3005), '%s - %s' % (artist.decode('ascii', 'ignore'), title.decode('ascii', 'ignore')))
 
         count, playlisttracks = get_similar_tracks(artist, title)
-        log_debug('Found %d similar tracks in XBMC library' % count)
+        log_debug('Found %d similar tracks in Kodi library' % count)
 
         if _runinbackground or not pDialog.iscanceled():
             index = 0

resources/lib/xbmcsettings.py resources/lib/kodisettings.pyresources/lib/xbmcsettings.py renamed to resources/lib/kodisettings.py

@@ -1,8 +1,8 @@
 #/*
 # *
-# * Add-on Settings class for XBMC.
+# * SimilarTracks for Kodi.
 # *
-# * Copyright (C) 2012 Brian Hornsby
+# * Copyright (C) 2015 Brian Hornsby
 # *
 # * This program is free software: you can redistribute it and/or modify
 # * it under the terms of the GNU General Public License as published by
@@ -23,7 +23,7 @@
 import xbmc
 
 
-class XBMCSettings:
+class KodiSettings:
     def __init__(self, addonid, argv):
         self.__addon__ = xbmcaddon.Addon(id=addonid)
         self.__argv__ = argv

resources/lib/xbmcutils.py resources/lib/kodiutils.pyresources/lib/xbmcutils.py renamed to resources/lib/kodiutils.py

@@ -1,8 +1,8 @@
 #/*
 # *
-# * Utilities for XBMC addons.
+# * SimilarTracks for Kodi.
 # *
-# * Copyright (C) 2012 Brian Hornsby
+# * Copyright (C) 2015 Brian Hornsby
 # *
 # * This program is free software: you can redistribute it and/or modify
 # * it under the terms of the GNU General Public License as published by