Jellyfin/jellyfin-kodi
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin-kodi.git synced 2024-12-26 02:36:10 +00:00
Code Issues Projects Releases Packages Wiki Activity

Remove get_play_action function

Browse source
This commit is contained in:
Matt 2019-10-20 14:37:40 -04:00 committed by mcarlton00
parent 868b543218
commit d0516a54f6
3 changed files with 6 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
resources/lib/objects/__init__.py
View file

@ -6,5 +6,6 @@ from obj import Objects
from actions import Actions from actions import Actions
from actions import PlaylistWorker from actions import PlaylistWorker
from actions import on_play, on_update, special_listener from actions import on_play, on_update, special_listener
import utils
Objects().mapping() Objects().mapping()

15
resources/lib/objects/actions.py
View file

@ -17,7 +17,6 @@ from downloader import TheVoid
from obj import Objects from obj import Objects
from helper import _, playutils, api, window, settings, dialog from helper import _, playutils, api, window, settings, dialog
from dialogs import resume from dialogs import resume
from utils import get_play_action
################################################################################################# #################################################################################################
@ -94,17 +93,13 @@ class Actions(object):
if item['MediaType'] in ('Video', 'Audio'): if item['MediaType'] in ('Video', 'Audio'):
resume = item['UserData'].get('PlaybackPositionTicks') resume = item['UserData'].get('PlaybackPositionTicks')
if resume: if resume and transcode and not seektime:
if get_play_action() == "Resume": choice = self.resume_dialog(api.API(item, self.server).adjust_resume((resume or 0) / 10000000.0))
seektime = True
if transcode and not seektime: if choice is None:
choice = self.resume_dialog(api.API(item, self.server).adjust_resume((resume or 0) / 10000000.0)) raise Exception("User backed out of resume dialog.")
if choice is None: seektime = False if not choice else True
raise Exception("User backed out of resume dialog.")
seektime = False if not choice else True
if settings('enableCinema.bool') and not seektime: if settings('enableCinema.bool') and not seektime:
self._set_intros(item) self._set_intros(item)

15
resources/lib/objects/utils.py
View file

@ -13,21 +13,6 @@ LOG = logging.getLogger("JELLYFIN." + __name__)
################################################################################################# #################################################################################################
def get_play_action():
''' I could not figure out a way to listen to kodi setting changes?
For now, verify the play action every time play is called.
'''
options = ['Choose', 'Play', 'Resume', 'Show information']
result = JSONRPC('Settings.GetSettingValue').execute({'setting': "myvideos.selectaction"})
try:
return options[result['result']['value']]
except Exception as error:
LOG.exception("Returning play action due to error: %s", error)
return options[1]
def get_grouped_set(): def get_grouped_set():
''' Get if boxsets should be grouped ''' Get if boxsets should be grouped