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

Fix resume flags for ListItems

Browse source
This commit is contained in:
croneter 2019-04-07 14:01:07 +02:00
parent 797a58a3d5
commit 484b03482e
2 changed files with 14 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
resources/lib/playstrm.py
View file

@ -115,8 +115,7 @@ class PlayStrm(object):
else: else:
self.start_index = max(self.kodi_playlist.getposition(), 0) self.start_index = max(self.kodi_playlist.getposition(), 0)
self.index = self.start_index self.index = self.start_index
listitem = widgets.get_listitem(self.xml[0]) self._set_playlist()
self._set_playlist(listitem)
LOG.info('Initiating play for %s', self) LOG.info('Initiating play for %s', self)
if not delayed: if not delayed:
self.start_playback(self.start_index) self.start_playback(self.start_index)
@ -134,7 +133,7 @@ class PlayStrm(object):
if self.kodi_id and self.kodi_type: if self.kodi_id and self.kodi_type:
self.add_to_playlist(self.kodi_id, self.kodi_type, self.index) self.add_to_playlist(self.kodi_id, self.kodi_type, self.index)
else: else:
listitem = widgets.get_listitem(self.xml[0]) listitem = widgets.get_listitem(self.xml[0], resume=True)
url = 'http://127.0.0.1:%s/plex/play/file.strm' % v.WEBSERVICE_PORT url = 'http://127.0.0.1:%s/plex/play/file.strm' % v.WEBSERVICE_PORT
args = { args = {
'mode': 'play', 'mode': 'play',
@ -156,7 +155,7 @@ class PlayStrm(object):
index=self.index) index=self.index)
return self.index return self.index
def _set_playlist(self, listitem): def _set_playlist(self):
''' '''
Verify seektime, set intros, set main item and set additional parts. Verify seektime, set intros, set main item and set additional parts.
Detect the seektime for video type content. Verify the default video Detect the seektime for video type content. Verify the default video
@ -192,6 +191,10 @@ class PlayStrm(object):
PL.get_playlist_details_from_xml(self.playqueue, xml) PL.get_playlist_details_from_xml(self.playqueue, xml)
# See that we add trailers, if they exist in the xml return # See that we add trailers, if they exist in the xml return
self._set_intros(xml) self._set_intros(xml)
if seektime:
listitem = widgets.get_listitem(self.xml[0], resume=True)
else:
listitem = widgets.get_listitem(self.xml[0], resume=False)
listitem.setSubtitles(self.api.cache_external_subs()) listitem.setSubtitles(self.api.cache_external_subs())
play = PlayUtils(self.api, self.playqueue_item) play = PlayUtils(self.api, self.playqueue_item)
url = play.getPlayUrl().encode('utf-8') url = play.getPlayUrl().encode('utf-8')
@ -233,7 +236,7 @@ class PlayStrm(object):
# The main item we're looking at - skip! # The main item we're looking at - skip!
continue continue
api = API(intro) api = API(intro)
listitem = widgets.get_listitem(intro) listitem = widgets.get_listitem(intro, resume=False)
listitem.setSubtitles(api.cache_external_subs()) listitem.setSubtitles(api.cache_external_subs())
playqueue_item = PL.playlist_item_from_xml(intro) playqueue_item = PL.playlist_item_from_xml(intro)
play = PlayUtils(api, playqueue_item) play = PlayUtils(api, playqueue_item)
@ -251,7 +254,7 @@ class PlayStrm(object):
# The first part that we've already added # The first part that we've already added
continue continue
self.api.set_part_number(part) self.api.set_part_number(part)
listitem = widgets.get_listitem(self.xml[0]) listitem = widgets.get_listitem(self.xml[0], resume=False)
listitem.setSubtitles(self.api.cache_external_subs()) listitem.setSubtitles(self.api.cache_external_subs())
playqueue_item = PL.playlist_item_from_xml(self.xml[0]) playqueue_item = PL.playlist_item_from_xml(self.xml[0])
play = PlayUtils(self.api, playqueue_item) play = PlayUtils(self.api, playqueue_item)

7
resources/lib/widgets.py
View file

@ -33,11 +33,14 @@ APPEND_SXXEXX = None
KEY = None KEY = None
def get_listitem(xml_element): def get_listitem(xml_element, resume=True):
""" """
Returns a valid xbmcgui.ListItem() for xml_element Returns a valid xbmcgui.ListItem() for xml_element. Pass in resume=False
to NOT set a resume point for this listitem
""" """
item = generate_item(xml_element) item = generate_item(xml_element)
if not resume and 'resume' in item:
del item['resume']
prepare_listitem(item) prepare_listitem(item)
return create_listitem(item, as_tuple=False) return create_listitem(item, as_tuple=False)