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-05 17:28:27 +01:00
commit e86b8c2358
4 changed files with 17 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
resources/lib/itemtypes.py
View file

@ -1860,9 +1860,10 @@ class TVShows(Items):
class Music(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.directstream = utils.settings('streamMusic') == "true"
self.userid = utils.window('emby_currUser') self.userid = utils.window('emby_currUser')
@ -1919,7 +1920,7 @@ class Music(Items):
def add_updateArtist(self, item, artisttype="MusicArtist"): def add_updateArtist(self, item, artisttype="MusicArtist"):
# Process a single artist # Process a single artist
kodiversion = self.kodiversion kodiversion = self.kodiversion
kodicursor = self.kodicursor kodicursor = self.musiccursor
emby_db = self.emby_db emby_db = self.emby_db
kodi_db = self.kodi_db kodi_db = self.kodi_db
artwork = self.artwork artwork = self.artwork
@ -2002,7 +2003,7 @@ class Music(Items):
# Process a single artist # Process a single artist
emby = self.emby emby = self.emby
kodiversion = self.kodiversion kodiversion = self.kodiversion
kodicursor = self.kodicursor kodicursor = self.musiccursor
emby_db = self.emby_db emby_db = self.emby_db
kodi_db = self.kodi_db kodi_db = self.kodi_db
artwork = self.artwork artwork = self.artwork
@ -2160,7 +2161,7 @@ class Music(Items):
def add_updateSong(self, item): def add_updateSong(self, item):
# Process single song # Process single song
kodiversion = self.kodiversion kodiversion = self.kodiversion
kodicursor = self.kodicursor kodicursor = self.musiccursor
emby_db = self.emby_db emby_db = self.emby_db
kodi_db = self.kodi_db kodi_db = self.kodi_db
artwork = self.artwork artwork = self.artwork
@ -2409,7 +2410,7 @@ class Music(Items):
def updateUserdata(self, item): def updateUserdata(self, item):
# This updates: Favorite, LastPlayedDate, Playcount, PlaybackPositionTicks # This updates: Favorite, LastPlayedDate, Playcount, PlaybackPositionTicks
# Poster with progress bar # Poster with progress bar
kodicursor = self.kodicursor kodicursor = self.musiccursor
emby_db = self.emby_db emby_db = self.emby_db
kodi_db = self.kodi_db kodi_db = self.kodi_db
API = api.API(item) API = api.API(item)
@ -2448,7 +2449,7 @@ class Music(Items):
def remove(self, itemid): def remove(self, itemid):
# Remove kodiid, fileid, pathid, emby reference # Remove kodiid, fileid, pathid, emby reference
emby_db = self.emby_db emby_db = self.emby_db
kodicursor = self.kodicursor kodicursor = self.musiccursor
artwork = self.artwork artwork = self.artwork
emby_dbitem = emby_db.getItem_byId(itemid) emby_dbitem = emby_db.getItem_byId(itemid)
@ -2513,7 +2514,7 @@ class Music(Items):
def removeSong(self, kodiid): def removeSong(self, kodiid):
kodicursor = self.kodicursor kodicursor = self.musiccursor
artwork = self.artwork artwork = self.artwork
artwork.deleteArtwork(kodiid, "song", kodicursor) artwork.deleteArtwork(kodiid, "song", kodicursor)
@ -2521,7 +2522,7 @@ class Music(Items):
def removeAlbum(self, kodiid): def removeAlbum(self, kodiid):
kodicursor = self.kodicursor kodicursor = self.musiccursor
artwork = self.artwork artwork = self.artwork
artwork.deleteArtwork(kodiid, "album", kodicursor) artwork.deleteArtwork(kodiid, "album", kodicursor)
@ -2529,7 +2530,7 @@ class Music(Items):
def removeArtist(self, kodiid): def removeArtist(self, kodiid):
kodicursor = self.kodicursor kodicursor = self.musiccursor
artwork = self.artwork artwork = self.artwork
artwork.deleteArtwork(kodiid, "artist", kodicursor) artwork.deleteArtwork(kodiid, "artist", kodicursor)

4
resources/lib/librarysync.py
View file

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

2
resources/lib/utils.py
View file

@ -394,7 +394,7 @@ def passwordsXML():
line1= ( line1= (
"Input the server name or IP address as indicated in your emby library paths. " "Input the server name or IP address as indicated in your emby library paths. "
'For example, the server name: \\\\SERVER-PC\\path\\ is "SERVER-PC".')) 'For example, the server name: \\\\SERVER-PC\\path\\ is "SERVER-PC".'))
server = dialog.input("Enter the server name or IP address", settings('ipaddress')) server = dialog.input("Enter the server name or IP address")
if not server: if not server:
return return

4
resources/lib/videonodes.py
View file

@ -73,8 +73,8 @@ class VideoNodes(object):
# Verify the video directory # Verify the video directory
if not xbmcvfs.exists(path): if not xbmcvfs.exists(path):
shutil.copytree( shutil.copytree(
src=xbmc.translatePath("special://xbmc/system/library/video/").decode('utf-8'), src=xbmc.translatePath("special://xbmc/system/library/video").decode('utf-8'),
dst=xbmc.translatePath("special://profile/library/video/").decode('utf-8')) dst=xbmc.translatePath("special://profile/library/video").decode('utf-8'))
xbmcvfs.exists(path) xbmcvfs.exists(path)
# Create the node directory # Create the node directory