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

Addon paths: include real filename in plugin calls

Browse source
This commit is contained in:
croneter 2018-03-18 14:50:37 +01:00
parent 7096aa35b2
commit 6fcbf29779
1 changed files with 18 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
resources/lib/itemtypes.py
View file

@ -288,9 +288,16 @@ class Movies(Items):
scraper='metadata.local') scraper='metadata.local')
if do_indirect: if do_indirect:
# Set plugin path and media flags using real filename # Set plugin path and media flags using real filename
filename = api.file_path(force_first_media=True)
if "\\" in filename:
# Local path
filename = filename.rsplit("\\", 1)[1]
else:
# Network share
filename = filename.rsplit("/", 1)[1]
path = 'plugin://%s.movies/' % v.ADDON_ID path = 'plugin://%s.movies/' % v.ADDON_ID
filename = ('%s?plex_id=%s&plex_type=%s&mode=play' filename = ('%s?plex_id=%s&plex_type=%s&mode=play&filename=%s'
% (path, itemid, v.PLEX_TYPE_MOVIE)) % (path, itemid, v.PLEX_TYPE_MOVIE, filename))
playurl = filename playurl = filename
pathid = self.kodi_db.get_path(path) pathid = self.kodi_db.get_path(path)
@ -837,8 +844,6 @@ class TVShows(Items):
if state.DIRECT_PATHS: if state.DIRECT_PATHS:
playurl = api.file_path(force_first_media=True) playurl = api.file_path(force_first_media=True)
playurl = api.validate_playurl(playurl, v.PLEX_TYPE_EPISODE) playurl = api.validate_playurl(playurl, v.PLEX_TYPE_EPISODE)
if playurl is None:
return False
if "\\" in playurl: if "\\" in playurl:
# Local path # Local path
filename = playurl.rsplit("\\", 1)[1] filename = playurl.rsplit("\\", 1)[1]
@ -852,9 +857,16 @@ class TVShows(Items):
else: else:
# Set plugin path - do NOT use "intermediate" paths for the show # Set plugin path - do NOT use "intermediate" paths for the show
# as with direct paths! # as with direct paths!
filename = api.file_path(force_first_media=True)
if "\\" in filename:
# Local path
filename = filename.rsplit("\\", 1)[1]
else:
# Network share
filename = filename.rsplit("/", 1)[1]
path = 'plugin://%s.tvshows/' % v.ADDON_ID path = 'plugin://%s.tvshows/' % v.ADDON_ID
filename = ('%s?plex_id=%s&plex_type=%s&mode=play' filename = ('%s?plex_id=%s&plex_type=%s&mode=play&filename=%s'
% (path, itemid, v.PLEX_TYPE_EPISODE)) % (path, itemid, v.PLEX_TYPE_EPISODE, filename))
playurl = filename playurl = filename
# Root path tvshows/ already saved in Kodi DB # Root path tvshows/ already saved in Kodi DB
pathid = self.kodi_db.add_video_path(path) pathid = self.kodi_db.add_video_path(path)