mirror of
https://github.com/jellyfin/jellyfin-kodi.git
synced 2025-06-12 19:26:12 +00:00
Tool black: auto-format Python code
This commit is contained in:
parent
e4d8084c25
commit
7763762212
54 changed files with 6545 additions and 4723 deletions
|
|
@ -44,11 +44,10 @@ class Player(xbmc.Player):
|
|||
return file in self.played
|
||||
|
||||
def onPlayBackStarted(self):
|
||||
|
||||
''' We may need to wait for info to be set in kodi monitor.
|
||||
Accounts for scenario where Kodi starts playback and exits immediately.
|
||||
First, ensure previous playback terminated correctly in Jellyfin.
|
||||
'''
|
||||
"""We may need to wait for info to be set in kodi monitor.
|
||||
Accounts for scenario where Kodi starts playback and exits immediately.
|
||||
First, ensure previous playback terminated correctly in Jellyfin.
|
||||
"""
|
||||
self.stop_playback()
|
||||
self.up_next = False
|
||||
count = 0
|
||||
|
|
@ -69,11 +68,11 @@ class Player(xbmc.Player):
|
|||
if monitor.waitForAbort(1):
|
||||
return
|
||||
else:
|
||||
LOG.info('Cancel playback report')
|
||||
LOG.info("Cancel playback report")
|
||||
|
||||
return
|
||||
|
||||
items = window('jellyfin_play.json')
|
||||
items = window("jellyfin_play.json")
|
||||
item = None
|
||||
|
||||
while not items:
|
||||
|
|
@ -81,7 +80,7 @@ class Player(xbmc.Player):
|
|||
if monitor.waitForAbort(2):
|
||||
return
|
||||
|
||||
items = window('jellyfin_play.json')
|
||||
items = window("jellyfin_play.json")
|
||||
count += 1
|
||||
|
||||
if count == 20:
|
||||
|
|
@ -90,51 +89,49 @@ class Player(xbmc.Player):
|
|||
return
|
||||
|
||||
for item in items:
|
||||
if item['Path'] == current_file:
|
||||
if item["Path"] == current_file:
|
||||
items.pop(items.index(item))
|
||||
|
||||
break
|
||||
else:
|
||||
item = items.pop(0)
|
||||
|
||||
window('jellyfin_play.json', items)
|
||||
window("jellyfin_play.json", items)
|
||||
|
||||
self.set_item(current_file, item)
|
||||
data = {
|
||||
'QueueableMediaTypes': "Video,Audio",
|
||||
'CanSeek': True,
|
||||
'ItemId': item['Id'],
|
||||
'MediaSourceId': item['MediaSourceId'],
|
||||
'PlayMethod': item['PlayMethod'],
|
||||
'VolumeLevel': item['Volume'],
|
||||
'PositionTicks': int(item['CurrentPosition'] * 10000000),
|
||||
'IsPaused': item['Paused'],
|
||||
'IsMuted': item['Muted'],
|
||||
'PlaySessionId': item['PlaySessionId'],
|
||||
'AudioStreamIndex': item['AudioStreamIndex'],
|
||||
'SubtitleStreamIndex': item['SubtitleStreamIndex']
|
||||
"QueueableMediaTypes": "Video,Audio",
|
||||
"CanSeek": True,
|
||||
"ItemId": item["Id"],
|
||||
"MediaSourceId": item["MediaSourceId"],
|
||||
"PlayMethod": item["PlayMethod"],
|
||||
"VolumeLevel": item["Volume"],
|
||||
"PositionTicks": int(item["CurrentPosition"] * 10000000),
|
||||
"IsPaused": item["Paused"],
|
||||
"IsMuted": item["Muted"],
|
||||
"PlaySessionId": item["PlaySessionId"],
|
||||
"AudioStreamIndex": item["AudioStreamIndex"],
|
||||
"SubtitleStreamIndex": item["SubtitleStreamIndex"],
|
||||
}
|
||||
item['Server'].jellyfin.session_playing(data)
|
||||
window('jellyfin.skip.%s.bool' % item['Id'], True)
|
||||
item["Server"].jellyfin.session_playing(data)
|
||||
window("jellyfin.skip.%s.bool" % item["Id"], True)
|
||||
|
||||
if monitor.waitForAbort(2):
|
||||
return
|
||||
|
||||
if item['PlayOption'] == 'Addon':
|
||||
self.set_audio_subs(item['AudioStreamIndex'], item['SubtitleStreamIndex'])
|
||||
if item["PlayOption"] == "Addon":
|
||||
self.set_audio_subs(item["AudioStreamIndex"], item["SubtitleStreamIndex"])
|
||||
|
||||
def set_item(self, file, item):
|
||||
|
||||
''' Set playback information.
|
||||
'''
|
||||
"""Set playback information."""
|
||||
try:
|
||||
item['Runtime'] = int(item['Runtime'])
|
||||
item["Runtime"] = int(item["Runtime"])
|
||||
except (TypeError, ValueError):
|
||||
try:
|
||||
item['Runtime'] = int(self.getTotalTime())
|
||||
LOG.info("Runtime is missing, Kodi runtime: %s" % item['Runtime'])
|
||||
item["Runtime"] = int(self.getTotalTime())
|
||||
LOG.info("Runtime is missing, Kodi runtime: %s" % item["Runtime"])
|
||||
except Exception:
|
||||
item['Runtime'] = 0
|
||||
item["Runtime"] = 0
|
||||
LOG.info("Runtime is missing, Using Zero")
|
||||
|
||||
try:
|
||||
|
|
@ -142,22 +139,26 @@ class Player(xbmc.Player):
|
|||
except Exception: # at this point we should be playing and if not then bail out
|
||||
return
|
||||
|
||||
result = JSONRPC('Application.GetProperties').execute({'properties': ["volume", "muted"]})
|
||||
result = result.get('result', {})
|
||||
volume = result.get('volume')
|
||||
muted = result.get('muted')
|
||||
result = JSONRPC("Application.GetProperties").execute(
|
||||
{"properties": ["volume", "muted"]}
|
||||
)
|
||||
result = result.get("result", {})
|
||||
volume = result.get("volume")
|
||||
muted = result.get("muted")
|
||||
|
||||
item.update({
|
||||
'File': file,
|
||||
'CurrentPosition': item.get('CurrentPosition') or int(seektime),
|
||||
'Muted': muted,
|
||||
'Volume': volume,
|
||||
'Server': Jellyfin(item['ServerId']).get_client(),
|
||||
'Paused': False
|
||||
})
|
||||
item.update(
|
||||
{
|
||||
"File": file,
|
||||
"CurrentPosition": item.get("CurrentPosition") or int(seektime),
|
||||
"Muted": muted,
|
||||
"Volume": volume,
|
||||
"Server": Jellyfin(item["ServerId"]).get_client(),
|
||||
"Paused": False,
|
||||
}
|
||||
)
|
||||
|
||||
self.played[file] = item
|
||||
LOG.info("-->[ play/%s ] %s", item['Id'], item)
|
||||
LOG.info("-->[ play/%s ] %s", item["Id"], item)
|
||||
|
||||
def set_audio_subs(self, audio=None, subtitle=None):
|
||||
if audio:
|
||||
|
|
@ -165,15 +166,15 @@ class Player(xbmc.Player):
|
|||
if subtitle:
|
||||
subtitle = int(subtitle)
|
||||
|
||||
''' Only for after playback started
|
||||
'''
|
||||
""" Only for after playback started
|
||||
"""
|
||||
LOG.info("Setting audio: %s subs: %s", audio, subtitle)
|
||||
current_file = self.get_playing_file()
|
||||
|
||||
if self.is_playing_file(current_file):
|
||||
|
||||
item = self.get_file_info(current_file)
|
||||
mapping = item['SubsMapping']
|
||||
mapping = item["SubsMapping"]
|
||||
|
||||
if audio and len(self.getAvailableAudioStreams()) > 1:
|
||||
self.setAudioStream(audio - 1)
|
||||
|
|
@ -200,82 +201,90 @@ class Player(xbmc.Player):
|
|||
def detect_audio_subs(self, item):
|
||||
|
||||
params = {
|
||||
'playerid': 1,
|
||||
'properties': ["currentsubtitle", "currentaudiostream", "subtitleenabled"]
|
||||
"playerid": 1,
|
||||
"properties": ["currentsubtitle", "currentaudiostream", "subtitleenabled"],
|
||||
}
|
||||
result = JSONRPC('Player.GetProperties').execute(params)
|
||||
result = result.get('result')
|
||||
result = JSONRPC("Player.GetProperties").execute(params)
|
||||
result = result.get("result")
|
||||
|
||||
try: # Audio tracks
|
||||
audio = result['currentaudiostream']['index']
|
||||
audio = result["currentaudiostream"]["index"]
|
||||
except (KeyError, TypeError):
|
||||
audio = 0
|
||||
|
||||
try: # Subtitles tracks
|
||||
subs = result['currentsubtitle']['index']
|
||||
subs = result["currentsubtitle"]["index"]
|
||||
except (KeyError, TypeError):
|
||||
subs = 0
|
||||
|
||||
try: # If subtitles are enabled
|
||||
subs_enabled = result['subtitleenabled']
|
||||
subs_enabled = result["subtitleenabled"]
|
||||
except (KeyError, TypeError):
|
||||
subs_enabled = False
|
||||
|
||||
item['AudioStreamIndex'] = audio + 1
|
||||
item["AudioStreamIndex"] = audio + 1
|
||||
|
||||
if not subs_enabled or not len(self.getAvailableSubtitleStreams()):
|
||||
item['SubtitleStreamIndex'] = None
|
||||
item["SubtitleStreamIndex"] = None
|
||||
|
||||
return
|
||||
|
||||
mapping = item['SubsMapping']
|
||||
mapping = item["SubsMapping"]
|
||||
tracks = len(self.getAvailableAudioStreams())
|
||||
|
||||
if mapping:
|
||||
if str(subs) in mapping:
|
||||
item['SubtitleStreamIndex'] = mapping[str(subs)]
|
||||
item["SubtitleStreamIndex"] = mapping[str(subs)]
|
||||
else:
|
||||
item['SubtitleStreamIndex'] = subs - len(mapping) + tracks + 1
|
||||
item["SubtitleStreamIndex"] = subs - len(mapping) + tracks + 1
|
||||
else:
|
||||
item['SubtitleStreamIndex'] = subs + tracks + 1
|
||||
item["SubtitleStreamIndex"] = subs + tracks + 1
|
||||
|
||||
def next_up(self):
|
||||
|
||||
item = self.get_file_info(self.get_playing_file())
|
||||
objects = Objects()
|
||||
|
||||
if item['Type'] != 'Episode' or not item.get('CurrentEpisode'):
|
||||
if item["Type"] != "Episode" or not item.get("CurrentEpisode"):
|
||||
return
|
||||
|
||||
next_items = item['Server'].jellyfin.get_adjacent_episodes(item['CurrentEpisode']['tvshowid'], item['Id'])
|
||||
next_items = item["Server"].jellyfin.get_adjacent_episodes(
|
||||
item["CurrentEpisode"]["tvshowid"], item["Id"]
|
||||
)
|
||||
|
||||
for index, next_item in enumerate(next_items['Items']):
|
||||
if next_item['Id'] == item['Id']:
|
||||
for index, next_item in enumerate(next_items["Items"]):
|
||||
if next_item["Id"] == item["Id"]:
|
||||
|
||||
try:
|
||||
next_item = next_items['Items'][index + 1]
|
||||
next_item = next_items["Items"][index + 1]
|
||||
except IndexError:
|
||||
LOG.warning("No next up episode.")
|
||||
|
||||
return
|
||||
|
||||
break
|
||||
server_address = item['Server'].auth.get_server_info(item['Server'].auth.server_id)['address']
|
||||
server_address = item["Server"].auth.get_server_info(
|
||||
item["Server"].auth.server_id
|
||||
)["address"]
|
||||
API = api.API(next_item, server_address)
|
||||
data = objects.map(next_item, "UpNext")
|
||||
artwork = API.get_all_artwork(objects.map(next_item, 'ArtworkParent'), True)
|
||||
data['art'] = {
|
||||
'tvshow.poster': artwork.get('Series.Primary'),
|
||||
'tvshow.fanart': None,
|
||||
'thumb': artwork.get('Primary')
|
||||
artwork = API.get_all_artwork(objects.map(next_item, "ArtworkParent"), True)
|
||||
data["art"] = {
|
||||
"tvshow.poster": artwork.get("Series.Primary"),
|
||||
"tvshow.fanart": None,
|
||||
"thumb": artwork.get("Primary"),
|
||||
}
|
||||
if artwork['Backdrop']:
|
||||
data['art']['tvshow.fanart'] = artwork['Backdrop'][0]
|
||||
if artwork["Backdrop"]:
|
||||
data["art"]["tvshow.fanart"] = artwork["Backdrop"][0]
|
||||
|
||||
next_info = {
|
||||
'play_info': {'ItemIds': [data['episodeid']], 'ServerId': item['ServerId'], 'PlayCommand': 'PlayNow'},
|
||||
'current_episode': item['CurrentEpisode'],
|
||||
'next_episode': data
|
||||
"play_info": {
|
||||
"ItemIds": [data["episodeid"]],
|
||||
"ServerId": item["ServerId"],
|
||||
"PlayCommand": "PlayNow",
|
||||
},
|
||||
"current_episode": item["CurrentEpisode"],
|
||||
"next_episode": data,
|
||||
}
|
||||
|
||||
LOG.info("--[ next up ] %s", next_info)
|
||||
|
|
@ -286,7 +295,7 @@ class Player(xbmc.Player):
|
|||
|
||||
if self.is_playing_file(current_file):
|
||||
|
||||
self.get_file_info(current_file)['Paused'] = True
|
||||
self.get_file_info(current_file)["Paused"] = True
|
||||
self.report_playback()
|
||||
LOG.debug("-->[ paused ]")
|
||||
|
||||
|
|
@ -295,24 +304,21 @@ class Player(xbmc.Player):
|
|||
|
||||
if self.is_playing_file(current_file):
|
||||
|
||||
self.get_file_info(current_file)['Paused'] = False
|
||||
self.get_file_info(current_file)["Paused"] = False
|
||||
self.report_playback()
|
||||
LOG.debug("--<[ paused ]")
|
||||
|
||||
def onPlayBackSeek(self, time, seek_offset):
|
||||
|
||||
''' Does not seem to work in Leia??
|
||||
'''
|
||||
"""Does not seem to work in Leia??"""
|
||||
if self.is_playing_file(self.get_playing_file()):
|
||||
|
||||
self.report_playback()
|
||||
LOG.info("--[ seek ]")
|
||||
|
||||
def report_playback(self, report=True):
|
||||
|
||||
''' Report playback progress to jellyfin server.
|
||||
Check if the user seek.
|
||||
'''
|
||||
"""Report playback progress to jellyfin server.
|
||||
Check if the user seek.
|
||||
"""
|
||||
current_file = self.get_playing_file()
|
||||
|
||||
if not self.is_playing_file(current_file):
|
||||
|
|
@ -320,25 +326,29 @@ class Player(xbmc.Player):
|
|||
|
||||
item = self.get_file_info(current_file)
|
||||
|
||||
if window('jellyfin.external.bool'):
|
||||
if window("jellyfin.external.bool"):
|
||||
return
|
||||
|
||||
if not report:
|
||||
|
||||
previous = item['CurrentPosition']
|
||||
previous = item["CurrentPosition"]
|
||||
|
||||
try:
|
||||
item['CurrentPosition'] = int(self.getTime())
|
||||
item["CurrentPosition"] = int(self.getTime())
|
||||
except Exception as e:
|
||||
# getTime() raises RuntimeError if nothing is playing
|
||||
LOG.debug("Failed to get playback position: %s", e)
|
||||
return
|
||||
|
||||
if int(item['CurrentPosition']) == 1:
|
||||
if int(item["CurrentPosition"]) == 1:
|
||||
return
|
||||
|
||||
try:
|
||||
played = float(item['CurrentPosition'] * 10000000) / int(item['Runtime']) * 100
|
||||
played = (
|
||||
float(item["CurrentPosition"] * 10000000)
|
||||
/ int(item["Runtime"])
|
||||
* 100
|
||||
)
|
||||
except ZeroDivisionError: # Runtime is 0.
|
||||
played = 0
|
||||
|
||||
|
|
@ -347,52 +357,48 @@ class Player(xbmc.Player):
|
|||
self.up_next = True
|
||||
self.next_up()
|
||||
|
||||
if (item['CurrentPosition'] - previous) < 30:
|
||||
if (item["CurrentPosition"] - previous) < 30:
|
||||
|
||||
return
|
||||
|
||||
result = JSONRPC('Application.GetProperties').execute({'properties': ["volume", "muted"]})
|
||||
result = result.get('result', {})
|
||||
item['Volume'] = result.get('volume')
|
||||
item['Muted'] = result.get('muted')
|
||||
item['CurrentPosition'] = int(self.getTime())
|
||||
result = JSONRPC("Application.GetProperties").execute(
|
||||
{"properties": ["volume", "muted"]}
|
||||
)
|
||||
result = result.get("result", {})
|
||||
item["Volume"] = result.get("volume")
|
||||
item["Muted"] = result.get("muted")
|
||||
item["CurrentPosition"] = int(self.getTime())
|
||||
self.detect_audio_subs(item)
|
||||
|
||||
data = {
|
||||
'QueueableMediaTypes': "Video,Audio",
|
||||
'CanSeek': True,
|
||||
'ItemId': item['Id'],
|
||||
'MediaSourceId': item['MediaSourceId'],
|
||||
'PlayMethod': item['PlayMethod'],
|
||||
'VolumeLevel': item['Volume'],
|
||||
'PositionTicks': int(item['CurrentPosition'] * 10000000),
|
||||
'IsPaused': item['Paused'],
|
||||
'IsMuted': item['Muted'],
|
||||
'PlaySessionId': item['PlaySessionId'],
|
||||
'AudioStreamIndex': item['AudioStreamIndex'],
|
||||
'SubtitleStreamIndex': item['SubtitleStreamIndex']
|
||||
"QueueableMediaTypes": "Video,Audio",
|
||||
"CanSeek": True,
|
||||
"ItemId": item["Id"],
|
||||
"MediaSourceId": item["MediaSourceId"],
|
||||
"PlayMethod": item["PlayMethod"],
|
||||
"VolumeLevel": item["Volume"],
|
||||
"PositionTicks": int(item["CurrentPosition"] * 10000000),
|
||||
"IsPaused": item["Paused"],
|
||||
"IsMuted": item["Muted"],
|
||||
"PlaySessionId": item["PlaySessionId"],
|
||||
"AudioStreamIndex": item["AudioStreamIndex"],
|
||||
"SubtitleStreamIndex": item["SubtitleStreamIndex"],
|
||||
}
|
||||
item['Server'].jellyfin.session_progress(data)
|
||||
item["Server"].jellyfin.session_progress(data)
|
||||
|
||||
def onPlayBackStopped(self):
|
||||
|
||||
''' Will be called when user stops playing a file.
|
||||
'''
|
||||
window('jellyfin_play', clear=True)
|
||||
"""Will be called when user stops playing a file."""
|
||||
window("jellyfin_play", clear=True)
|
||||
self.stop_playback()
|
||||
LOG.info("--<[ playback ]")
|
||||
|
||||
def onPlayBackEnded(self):
|
||||
|
||||
''' Will be called when kodi stops playing a file.
|
||||
'''
|
||||
"""Will be called when kodi stops playing a file."""
|
||||
self.stop_playback()
|
||||
LOG.info("--<<[ playback ]")
|
||||
|
||||
def stop_playback(self):
|
||||
|
||||
''' Stop all playback. Check for external player for positionticks.
|
||||
'''
|
||||
"""Stop all playback. Check for external player for positionticks."""
|
||||
if not self.played:
|
||||
return
|
||||
|
||||
|
|
@ -401,61 +407,67 @@ class Player(xbmc.Player):
|
|||
for file in self.played:
|
||||
item = self.get_file_info(file)
|
||||
|
||||
window('jellyfin.skip.%s.bool' % item['Id'], True)
|
||||
window("jellyfin.skip.%s.bool" % item["Id"], True)
|
||||
|
||||
if window('jellyfin.external.bool'):
|
||||
window('jellyfin.external', clear=True)
|
||||
if window("jellyfin.external.bool"):
|
||||
window("jellyfin.external", clear=True)
|
||||
|
||||
if int(item['CurrentPosition']) == 1:
|
||||
item['CurrentPosition'] = int(item['Runtime'])
|
||||
if int(item["CurrentPosition"]) == 1:
|
||||
item["CurrentPosition"] = int(item["Runtime"])
|
||||
|
||||
data = {
|
||||
'ItemId': item['Id'],
|
||||
'MediaSourceId': item['MediaSourceId'],
|
||||
'PositionTicks': int(item['CurrentPosition'] * 10000000),
|
||||
'PlaySessionId': item['PlaySessionId']
|
||||
"ItemId": item["Id"],
|
||||
"MediaSourceId": item["MediaSourceId"],
|
||||
"PositionTicks": int(item["CurrentPosition"] * 10000000),
|
||||
"PlaySessionId": item["PlaySessionId"],
|
||||
}
|
||||
item['Server'].jellyfin.session_stop(data)
|
||||
item["Server"].jellyfin.session_stop(data)
|
||||
|
||||
if item.get('LiveStreamId'):
|
||||
if item.get("LiveStreamId"):
|
||||
|
||||
LOG.info("<[ livestream/%s ]", item['LiveStreamId'])
|
||||
item['Server'].jellyfin.close_live_stream(item['LiveStreamId'])
|
||||
LOG.info("<[ livestream/%s ]", item["LiveStreamId"])
|
||||
item["Server"].jellyfin.close_live_stream(item["LiveStreamId"])
|
||||
|
||||
elif item['PlayMethod'] == 'Transcode':
|
||||
elif item["PlayMethod"] == "Transcode":
|
||||
|
||||
LOG.info("<[ transcode/%s ]", item['Id'])
|
||||
item['Server'].jellyfin.close_transcode(item['DeviceId'], item['PlaySessionId'])
|
||||
LOG.info("<[ transcode/%s ]", item["Id"])
|
||||
item["Server"].jellyfin.close_transcode(
|
||||
item["DeviceId"], item["PlaySessionId"]
|
||||
)
|
||||
|
||||
path = translate_path("special://profile/addon_data/plugin.video.jellyfin/temp/")
|
||||
path = translate_path(
|
||||
"special://profile/addon_data/plugin.video.jellyfin/temp/"
|
||||
)
|
||||
|
||||
if xbmcvfs.exists(path):
|
||||
dirs, files = xbmcvfs.listdir(path)
|
||||
|
||||
for file in files:
|
||||
# Only delete the cached files for the previous play session
|
||||
if item['Id'] in file:
|
||||
if item["Id"] in file:
|
||||
xbmcvfs.delete(os.path.join(path, file))
|
||||
|
||||
result = item['Server'].jellyfin.get_item(item['Id']) or {}
|
||||
result = item["Server"].jellyfin.get_item(item["Id"]) or {}
|
||||
|
||||
if 'UserData' in result and result['UserData']['Played']:
|
||||
if "UserData" in result and result["UserData"]["Played"]:
|
||||
delete = False
|
||||
|
||||
if result['Type'] == 'Episode' and settings('deleteTV.bool'):
|
||||
if result["Type"] == "Episode" and settings("deleteTV.bool"):
|
||||
delete = True
|
||||
elif result['Type'] == 'Movie' and settings('deleteMovies.bool'):
|
||||
elif result["Type"] == "Movie" and settings("deleteMovies.bool"):
|
||||
delete = True
|
||||
|
||||
if not settings('offerDelete.bool'):
|
||||
if not settings("offerDelete.bool"):
|
||||
delete = False
|
||||
|
||||
if delete:
|
||||
LOG.info("Offer delete option")
|
||||
|
||||
if dialog("yesno", translate(30091), translate(33015), autoclose=120000):
|
||||
item['Server'].jellyfin.delete_item(item['Id'])
|
||||
if dialog(
|
||||
"yesno", translate(30091), translate(33015), autoclose=120000
|
||||
):
|
||||
item["Server"].jellyfin.delete_item(item["Id"])
|
||||
|
||||
window('jellyfin.external_check', clear=True)
|
||||
window("jellyfin.external_check", clear=True)
|
||||
|
||||
self.played.clear()
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue