Troplo/PlexKodiConnect
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge remote-tracking branch 'MediaBrowser/master' into develop

Browse source
This commit is contained in:
tomkat83 2016-01-31 17:18:10 +01:00
commit dc44f1a879
5 changed files with 56 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
addon.xml
View file

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?> <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<addon id="plugin.video.plexkodiconnect" <addon id="plugin.video.plexkodiconnect"
name="PlexKodiConnect" name="PlexKodiConnect"
version="1.1.80" version="1.1.81"
provider-name="croneter"> provider-name="croneter">
<requires> <requires>
<import addon="xbmc.python" version="2.1.0"/> <import addon="xbmc.python" version="2.1.0"/>

4
changelog.txt
View file

@ -1,3 +1,7 @@
version 1.1.81
- Fix missing deviceId
- Fix to newly added album/songs (if you experienced the bug, you will need to reset to fix it. Know that moving forward, it is corrected.)
version 1.1.80 version 1.1.80
- Add refresh for video nodes - Add refresh for video nodes
- Fix for home videos (being unable to back out of the menu). Running refresh playlists/nodes will fix this. - Fix for home videos (being unable to back out of the menu). Running refresh playlists/nodes will fix this.

71
resources/lib/itemtypes.py
View file

@ -1934,39 +1934,50 @@ class Music(Items):
self.logMsg("Song itemid: %s has no albumId." % itemid, 1) self.logMsg("Song itemid: %s has no albumId." % itemid, 1)
return return
except TypeError: except TypeError:
# No album found, create a single's album # No album found. Let's create it
kodicursor.execute("select coalesce(max(idAlbum),0) from album") self.logMsg("Album database entry missing.", 1)
albumid = kodicursor.fetchone()[0] + 1 emby_albumId = item['AlbumId']
if kodiversion in (16, 17): album = self.emby.getItem(emby_albumId)
# Kodi Jarvis, Krypton self.add_updateAlbum(album)
query = ( emby_dbalbum = emby_db.getItem_byId(emby_albumId)
''' try:
INSERT INTO album(idAlbum, strGenres, iYear, strReleaseType) albumid = emby_dbalbum[0]
self.logMsg("Found albumid: %s" % albumid, 1)
except TypeError:
# No album found, create a single's album
self.logMsg("Failed to add album. Creating singles.", 1)
kodicursor.execute("select coalesce(max(idAlbum),0) from album")
albumid = kodicursor.fetchone()[0] + 1
if kodiversion == 16:
# Kodi Jarvis
query = (
'''
INSERT INTO album(idAlbum, strGenres, iYear, strReleaseType)
VALUES (?, ?, ?, ?) VALUES (?, ?, ?, ?)
''' '''
) )
kodicursor.execute(query, (albumid, genre, year, "single")) kodicursor.execute(query, (albumid, genre, year, "single"))
elif kodiversion == 15: elif kodiversion == 15:
# Kodi Isengard # Kodi Isengard
query = ( query = (
''' '''
INSERT INTO album(idAlbum, strGenres, iYear, dateAdded, strReleaseType) INSERT INTO album(idAlbum, strGenres, iYear, dateAdded, strReleaseType)
VALUES (?, ?, ?, ?, ?) VALUES (?, ?, ?, ?, ?)
''' '''
) )
kodicursor.execute(query, (albumid, genre, year, dateadded, "single")) kodicursor.execute(query, (albumid, genre, year, dateadded, "single"))
else: else:
# Kodi Helix # Kodi Helix
query = ( query = (
''' '''
INSERT INTO album(idAlbum, strGenres, iYear, dateAdded) INSERT INTO album(idAlbum, strGenres, iYear, dateAdded)
VALUES (?, ?, ?, ?) VALUES (?, ?, ?, ?)
''' '''
) )
kodicursor.execute(query, (albumid, genre, year, dateadded)) kodicursor.execute(query, (albumid, genre, year, dateadded))
# Create the song entry # Create the song entry
kodicursor.execute("select coalesce(max(idSong),0) from song") kodicursor.execute("select coalesce(max(idSong),0) from song")

2
resources/lib/playbackutils.py
View file

@ -258,7 +258,7 @@ class PlaybackUtils():
############### -- ADD MAIN ITEM ONLY FOR HOMESCREEN ############### ############### -- ADD MAIN ITEM ONLY FOR HOMESCREEN ###############
if homeScreen and not sizePlaylist: if homeScreen and not seektime and not sizePlaylist:
# Extend our current playlist with the actual item to play # Extend our current playlist with the actual item to play
# only if there's no playlist first # only if there's no playlist first
self.logMsg("Adding main item to playlist.", 1) self.logMsg("Adding main item to playlist.", 1)

9
resources/lib/playutils.py
View file

@ -107,6 +107,15 @@ class PlayUtils():
except (IndexError, KeyError): except (IndexError, KeyError):
playurl = item['Path'] playurl = item['Path']
if item.get('VideoType'):
# Specific format modification
type = item['VideoType']
if type == "Dvd":
playurl = "%s/VIDEO_TS/VIDEO_TS.IFO" % playurl
elif type == "BluRay":
playurl = "%s/BDMV/index.bdmv" % playurl
# Assign network protocol # Assign network protocol
if playurl.startswith('\\\\'): if playurl.startswith('\\\\'):
playurl = playurl.replace("\\\\", "smb://") playurl = playurl.replace("\\\\", "smb://")