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

Fix initializing of playlists on the Plex side

Browse source
This commit is contained in:
Croneter 2018-05-02 09:33:37 +02:00
parent ba0aff0f54
commit 376338a9b0
2 changed files with 30 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
resources/lib/playlist_func.py
View file

@ -4,7 +4,7 @@ Collection of functions associated with Kodi and Plex playlists and playqueues
""" """
from logging import getLogger from logging import getLogger
import os import os
from urllib import quote import urllib
from urlparse import parse_qsl, urlsplit from urlparse import parse_qsl, urlsplit
from re import compile as re_compile from re import compile as re_compile
@ -309,7 +309,8 @@ def playlist_item_from_kodi(kodi_item):
item.plex_id = query.get('plex_id') item.plex_id = query.get('plex_id')
item.plex_type = query.get('itemType') item.plex_type = query.get('itemType')
if item.plex_id is None and item.file is not None: if item.plex_id is None and item.file is not None:
item.uri = 'library://whatever/item/%s' % quote(item.file, safe='') item.uri = ('library://whatever/item/%s'
% urllib.quote(item.file, safe=''))
else: else:
# TO BE VERIFIED - PLEX DOESN'T LIKE PLAYLIST ADDS IN THIS MANNER # TO BE VERIFIED - PLEX DOESN'T LIKE PLAYLIST ADDS IN THIS MANNER
item.uri = ('library://%s/item/library%%2Fmetadata%%2F%s' % item.uri = ('library://%s/item/library%%2Fmetadata%%2F%s' %
@ -456,6 +457,26 @@ def update_playlist_from_PMS(playlist, playlist_id=None, xml=None):
playlist.items.append(playlist_item) playlist.items.append(playlist_item)
def init_plex_playlist(playlist, plex_id):
"""
Initializes a new playlist on the PMS side
"""
LOG.debug('Initializing the playlist with Plex id %s on the Plex side: %s',
plex_id, playlist)
params = {
'type': playlist.type,
'title': playlist.plex_name,
'smart': 0,
'uri': ('library://None/item/%s' % (urllib.quote('/library/metadata/%s'
% plex_id, safe='')))
}
xml = DU().downloadUrl(url='{server}/playlists',
action_type='POST',
parameters=params)
get_playlist_details_from_xml(playlist, xml)
LOG.debug('Initialized the playlist on the Plex side: %s', playlist)
def init_plex_playqueue(playlist, plex_id=None, kodi_item=None): def init_plex_playqueue(playlist, plex_id=None, kodi_item=None):
""" """
Initializes the Plex side without changing the Kodi playlists Initializes the Plex side without changing the Kodi playlists
@ -463,7 +484,7 @@ def init_plex_playqueue(playlist, plex_id=None, kodi_item=None):
Returns the first PKC playlist item or raises PlaylistError Returns the first PKC playlist item or raises PlaylistError
""" """
LOG.debug('Initializing the playlist on the Plex side: %s', playlist) LOG.debug('Initializing the playqueue on the Plex side: %s', playlist)
playlist.clear(kodi=False) playlist.clear(kodi=False)
verify_kodi_item(plex_id, kodi_item) verify_kodi_item(plex_id, kodi_item)
try: try:
@ -486,7 +507,7 @@ def init_plex_playqueue(playlist, plex_id=None, kodi_item=None):
raise PlaylistError('Could not init Plex playlist with plex_id %s and ' raise PlaylistError('Could not init Plex playlist with plex_id %s and '
'kodi_item %s' % (plex_id, kodi_item)) 'kodi_item %s' % (plex_id, kodi_item))
playlist.items.append(item) playlist.items.append(item)
LOG.debug('Initialized the playlist on the Plex side: %s', playlist) LOG.debug('Initialized the playqueue on the Plex side: %s', playlist)
return item return item

7
resources/lib/playlists.py
View file

@ -47,11 +47,14 @@ def create_plex_playlist(playlist=None, path=None):
if not playlist: if not playlist:
playlist = PL.Playlist_Object() playlist = PL.Playlist_Object()
playlist.kodi_path = path playlist.kodi_path = path
LOG.info('Creating Plex playlist from Kodi file: %s', playlist.kodi_path) LOG.info('Creating Plex playlist from Kodi file: %s', path)
plex_ids = _playlist_file_to_plex_ids(playlist) plex_ids = _playlist_file_to_plex_ids(playlist)
if not plex_ids:
LOG.info('No Plex ids found for playlist %s', path)
raise PL.PlaylistError
for pos, plex_id in enumerate(plex_ids): for pos, plex_id in enumerate(plex_ids):
if pos == 0: if pos == 0:
PL.init_Plex_playlist(playlist, plex_id=plex_id) PL.init_plex_playlist(playlist, plex_id)
else: else:
PL.add_item_to_PMS_playlist(playlist, pos, plex_id=plex_id) PL.add_item_to_PMS_playlist(playlist, pos, plex_id=plex_id)
update_plex_table(playlist, update_kodi_hash=True) update_plex_table(playlist, update_kodi_hash=True)