From 1ef24be65e90d1c9b7480de88c713e2a6691b7cf Mon Sep 17 00:00:00 2001 From: xnappo Date: Sun, 31 Jul 2016 09:07:38 -0500 Subject: [PATCH 1/3] Update README.md --- README.md | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index a9fdc034..88f085c0 100644 --- a/README.md +++ b/README.md @@ -7,15 +7,15 @@ The Emby addon for Kodi combines the best of Kodi - ultra smooth navigation, bea View this short [Youtube video](https://youtu.be/IaecDPcXI3I?t=119) to give you a better idea of the general process. -1. Install the Emby repository for Kodi, from the repo install the Emby addon. -2. Within a few seconds you should be prompted for your server-details (or auto discovered). If not, try to restart Kodi -3. Once you're succesfully authenticated to your Emby server, the initial sync will start. -4. The first sync of the Emby server to local Kodi database may take some time depending on your device and library size. -5. Once the full sync is done, you can browse your media in Kodi, syncs will be automatically done in the background. +1. Install the Emby for Kodi repository, from the repo install the Emby addon. +2. Within a few seconds you should be prompted for your server-details (or it may be auto discovered). If not, try to restart Kodi +3. Once you're succesfully authenticated with your Emby server, the initial sync will start. +4. The first sync of the Emby server to the local Kodi database may take some time depending on your device and library size. +5. Once the full sync is done, you can browse your media in Kodi, and syncs will be done automatically in the background. ### Our Wiki -If you need additional information on Emby for Kodi, check out our [wiki](https://github.com/MediaBrowser/plugin.video.emby/wiki). +If you need additional information for Emby for Kodi, check out our [wiki](https://github.com/MediaBrowser/plugin.video.emby/wiki). ### What does Emby for Kodi do? @@ -26,11 +26,11 @@ The Emby addon synchronizes your media on your Emby server to the native Kodi da - If you require help, post to our [Emby-Kodi forums](http://emby.media/community/index.php?/forum/99-kodi/) for faster replies. - To achieve direct play, you will need to ensure your Emby library paths point to network paths (e.g: "\\\\server\Media\Movies"). See the [Emby wiki](https://github.com/MediaBrowser/Wiki/wiki/Path%20Substitution) for additional information. - **The addon is not (and will not be) compatible with the MySQL database replacement in Kodi.** In fact, Emby takes over the point of having a MySQL database because it acts as a "man in the middle" for your entire media library. -- Emby for Kodi is currently not compatible with Kodi's Video Extras addon unless native playback mode is used. **Deactivate Video Extras if content start randomly playing.** +- Emby for Kodi is notcurrently compatible with Kodi's Video Extras addon unless native playback mode is used. **Deactivate Video Extras if content start randomly playing.** ### What is currently supported? -Emby for Kodi is constantly being worked on. The following features are currently provided: +Emby for Kodi is under constant development. The following features are currently provided: - Library types available: + Movies From 5744f30c66aaeb8d62a153155027034b1648ce9e Mon Sep 17 00:00:00 2001 From: xnappo Date: Sun, 31 Jul 2016 09:09:56 -0500 Subject: [PATCH 2/3] Update README.md typo --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 88f085c0..849b3b20 100644 --- a/README.md +++ b/README.md @@ -26,7 +26,7 @@ The Emby addon synchronizes your media on your Emby server to the native Kodi da - If you require help, post to our [Emby-Kodi forums](http://emby.media/community/index.php?/forum/99-kodi/) for faster replies. - To achieve direct play, you will need to ensure your Emby library paths point to network paths (e.g: "\\\\server\Media\Movies"). See the [Emby wiki](https://github.com/MediaBrowser/Wiki/wiki/Path%20Substitution) for additional information. - **The addon is not (and will not be) compatible with the MySQL database replacement in Kodi.** In fact, Emby takes over the point of having a MySQL database because it acts as a "man in the middle" for your entire media library. -- Emby for Kodi is notcurrently compatible with Kodi's Video Extras addon unless native playback mode is used. **Deactivate Video Extras if content start randomly playing.** +- Emby for Kodi is not currently compatible with Kodi's Video Extras addon unless native playback mode is used. **Deactivate Video Extras if content start randomly playing.** ### What is currently supported? From 133773d5b6f4d76711039d5e1ace17cce16172f4 Mon Sep 17 00:00:00 2001 From: xnappo Date: Sun, 31 Jul 2016 12:15:38 -0500 Subject: [PATCH 3/3] Krypton prep --- resources/lib/itemtypes.py | 39 +++++++++++++++++++++++++++++--------- resources/lib/utils.py | 2 +- 2 files changed, 31 insertions(+), 10 deletions(-) diff --git a/resources/lib/itemtypes.py b/resources/lib/itemtypes.py index 7438c83f..ad408b0f 100644 --- a/resources/lib/itemtypes.py +++ b/resources/lib/itemtypes.py @@ -2158,15 +2158,36 @@ class Music(Items): artist_edb = emby_db.getItem_byId(artist_eid) artistid = artist_edb[0] finally: - query = ( - ''' - INSERT OR REPLACE INTO song_artist(idArtist, idSong, iOrder, strArtist) - - VALUES (?, ?, ?, ?) - ''' - ) - kodicursor.execute(query, (artistid, songid, index, artist_name)) - + if self.kodiversion >= 17: + # Kodi Krypton + query = ( + ''' + INSERT OR REPLACE INTO song_artist(idArtist, idSong, idRole, iOrder, strArtist) + + VALUES (?, ?, ?, ?, ?) + ''' + ) + kodicursor.execute(query, (artistid, songid, 1, index, artist_name)) + + # May want to look into only doing this once? + query = ( + ''' + INSERT OR REPLACE INTO role(idRole, strRole) + + VALUES (?, ?) + ''' + ) + kodicursor.execute(query, (1, 'Composer')) + else: + query = ( + ''' + INSERT OR REPLACE INTO song_artist(idArtist, idSong, iOrder, strArtist) + + VALUES (?, ?, ?, ?) + ''' + ) + kodicursor.execute(query, (artistid, songid, index, artist_name)) + # Verify if album artist exists album_artists = [] for artist in item['AlbumArtists']: diff --git a/resources/lib/utils.py b/resources/lib/utils.py index db01fd35..84c32624 100644 --- a/resources/lib/utils.py +++ b/resources/lib/utils.py @@ -79,7 +79,7 @@ def getKodiVideoDBPath(): "14": 90, # Helix "15": 93, # Isengard "16": 99, # Jarvis - "17": 104 # Krypton + "17": 106 # Krypton } dbPath = xbmc.translatePath(