From 9ab1b9218c15664c7a9f154275589b48abf9b2ce Mon Sep 17 00:00:00 2001
From: texke <jens.rogier@gmail.com>
Date: Wed, 20 Mar 2019 15:21:21 +0100
Subject: [PATCH] Update to Kodi MusicDB 72

---
 resources/lib/objects/kodi/music.py         | 11 ++++++-----
 resources/lib/objects/kodi/queries_music.py | 14 +++++++-------
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/resources/lib/objects/kodi/music.py b/resources/lib/objects/kodi/music.py
index 5402a3b5..98716587 100644
--- a/resources/lib/objects/kodi/music.py
+++ b/resources/lib/objects/kodi/music.py
@@ -189,14 +189,15 @@ class Music(Kodi):
 
         ''' Add genres, but delete current genres first.
         '''
+		#Removed for DB version 72
         if media == 'album':
-            self.cursor.execute(QU.delete_genres_album, (kodi_id,))
-
+            #self.cursor.execute(QU.delete_genres_album, (kodi_id,))
+		
             for genre in genres:
-
+		
                 genre_id = self.get_genre(genre)
-                self.cursor.execute(QU.update_genre_album, (genre_id, kodi_id))
-
+                #self.cursor.execute(QU.update_genre_album, (genre_id, kodi_id))
+		
         elif media == 'song':
             self.cursor.execute(QU.delete_genres_song, (kodi_id,))
 
diff --git a/resources/lib/objects/kodi/queries_music.py b/resources/lib/objects/kodi/queries_music.py
index da481f36..e509f3bc 100644
--- a/resources/lib/objects/kodi/queries_music.py
+++ b/resources/lib/objects/kodi/queries_music.py
@@ -49,11 +49,11 @@ get_album =     		"""	SELECT 	idAlbum
 						"""
 get_album_obj =             [   "{AlbumId}","{Title}","{UniqueId}","{Artists}","album"
                             ]
-get_album_by_name = 	"""	SELECT 	idAlbum, strArtists  
+get_album_by_name = 	"""	SELECT 	idAlbum, strArtistDisp  
 							FROM 	album 
 							WHERE 	strAlbum = ? 
 						"""
-get_album_artist =  	"""	SELECT 	strArtists 
+get_album_artist =  	"""	SELECT 	strArtistDisp 
 							FROM 	album 
 							WHERE 	idAlbum = ? 
 						"""
@@ -82,7 +82,7 @@ add_single =    		"""	INSERT INTO	album(idAlbum, strGenres, iYear, strReleaseTyp
     					"""
 add_single_obj =            [   "{AlbumId}","{Genre}","{Year}","single"
                             ]
-add_song =	     		"""	INSERT INTO song(idSong, idAlbum, idPath, strArtists, strGenres, strTitle, iTrack, 
+add_song =	     		"""	INSERT INTO song(idSong, idAlbum, idPath, strArtistDisp, strGenres, strTitle, iTrack, 
                 							 iDuration, iYear, strFileName, strMusicBrainzTrackID, iTimesPlayed, lastplayed, 
                 							 rating, comment, dateAdded) 
             				VALUES 		(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) 
@@ -131,7 +131,7 @@ update_discography =    """	INSERT OR REPLACE INTO	discography(idArtist, strAlbu
 update_discography_obj =    [   "{ArtistId}","{Title}","{Year}"
                             ]
 update_album =  		"""	UPDATE 	album 
-				            SET 	strArtists = ?, iYear = ?, strGenres = ?, strReview = ?, strImage = ?, 
+				            SET 	strArtistDisp = ?, iYear = ?, strGenres = ?, strReview = ?, strImage = ?, 
 				                	iUserrating = ?, lastScraped = ?, strReleaseType = ? 
 				            WHERE 	idAlbum = ? 
 				        """
@@ -139,11 +139,11 @@ update_album_obj =          [   "{Artists}","{Year}","{Genre}","{Bio}","{Thumb}"
                                 "album","{AlbumId}"
                             ]
 update_album_artist =	"""	UPDATE 	album 
-							SET 	strArtists = ? 
+							SET 	strArtistDisp = ? 
 							WHERE 	idAlbum = ? 
 						"""
 update_song =   		"""	UPDATE 	song 
-            				SET 	idAlbum = ?, strArtists = ?, strGenres = ?, strTitle = ?, iTrack = ?, 
+            				SET 	idAlbum = ?, strArtistDisp = ?, strGenres = ?, strTitle = ?, iTrack = ?, 
                 					iDuration = ?, iYear = ?, strFilename = ?, iTimesPlayed = ?, lastplayed = ?, 
                 					rating = ?, comment = ?, dateAdded = ? 
             				WHERE 	idSong = ? 
@@ -157,7 +157,7 @@ update_song_artist =	""" INSERT OR REPLACE INTO	song_artist(idArtist, idSong, id
             			"""
 update_song_artist_obj =    [   "{ArtistId}","{SongId}",1,"{Index}","{Name}"
                             ]
-update_song_album = 	"""	INSERT OR REPLACE INTO albuminfosong(idAlbumInfoSong, idAlbumInfo, iTrack, 
+update_song_album = 	"""	INSERT OR REPLACE INTO song(idSong, idAlbum, iTrack, 
     															 strTitle, iDuration) 
     				        VALUES (?, ?, ?, ?, ?) 
     				    """