Jellyfin
/
jellyfin-kodi
mirror of https://github.com/jellyfin/jellyfin-kodi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Define the music cursor 

Make sure we use the proper cursor for music when using the incremental
sync. Fix for artist table not found database error.
This commit is contained in:
angelblue05 2016-01-04 21:58:45 -06:00
parent 22f71efaf5
commit 2c7a0c0b65
2 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
resources/lib/itemtypes.py
View File

@ -1876,9 +1876,10 @@ class TVShows(Items):
class Music(Items):
def __init__(self, embycursor, kodicursor):
def __init__(self, embycursor, musiccursor):
Items.__init__(self, embycursor, kodicursor)
Items.__init__(self, embycursor, musiccursor)
self.musiccursor = musiccursor
self.directstream = utils.settings('streamMusic') == "true"
self.userid = utils.window('emby_currUser')
@ -1935,7 +1936,7 @@ class Music(Items):
def add_updateArtist(self, item, artisttype="MusicArtist"):
# Process a single artist
kodiversion = self.kodiversion
kodicursor = self.kodicursor
kodicursor = self.musiccursor
emby_db = self.emby_db
kodi_db = self.kodi_db
artwork = self.artwork
@ -2018,7 +2019,7 @@ class Music(Items):
# Process a single artist
emby = self.emby
kodiversion = self.kodiversion
kodicursor = self.kodicursor
kodicursor = self.musiccursor
emby_db = self.emby_db
kodi_db = self.kodi_db
artwork = self.artwork
@ -2176,7 +2177,7 @@ class Music(Items):
def add_updateSong(self, item):
# Process single song
kodiversion = self.kodiversion
kodicursor = self.kodicursor
kodicursor = self.musiccursor
emby_db = self.emby_db
kodi_db = self.kodi_db
artwork = self.artwork
@ -2425,7 +2426,7 @@ class Music(Items):
def updateUserdata(self, item):
# This updates: Favorite, LastPlayedDate, Playcount, PlaybackPositionTicks
# Poster with progress bar
kodicursor = self.kodicursor
kodicursor = self.musiccursor
emby_db = self.emby_db
kodi_db = self.kodi_db
API = api.API(item)
@ -2464,7 +2465,7 @@ class Music(Items):
def remove(self, itemid):
# Remove kodiid, fileid, pathid, emby reference
emby_db = self.emby_db
kodicursor = self.kodicursor
kodicursor = self.musiccursor
artwork = self.artwork
emby_dbitem = emby_db.getItem_byId(itemid)
@ -2529,7 +2530,7 @@ class Music(Items):
def removeSong(self, kodiid):
kodicursor = self.kodicursor
kodicursor = self.musiccursor
artwork = self.artwork
artwork.deleteArtwork(kodiid, "song", kodicursor)
@ -2537,7 +2538,7 @@ class Music(Items):
def removeAlbum(self, kodiid):
kodicursor = self.kodicursor
kodicursor = self.musiccursor
artwork = self.artwork
artwork.deleteArtwork(kodiid, "album", kodicursor)
@ -2545,7 +2546,7 @@ class Music(Items):
def removeArtist(self, kodiid):
kodicursor = self.kodicursor
kodicursor = self.musiccursor
artwork = self.artwork
artwork.deleteArtwork(kodiid, "artist", kodicursor)

2
resources/lib/librarysync.py
View File

@ -357,7 +357,7 @@ class LibrarySync(threading.Thread):
if folderid in groupedFolders:
# Media folders are grouped into userview
for grouped_view in grouped_views:
# This is only reserved for the detection or grouped views
# This is only reserved for the detection of grouped views
if (grouped_view['Type'] == "UserView" and
grouped_view.get('CollectionType') == mediatype and
grouped_view['Id'] not in grouped_view['Path']):