admin/jellycon
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dont use home window properties to track playback started events

Browse Source
This commit is contained in:
Shaun
2018-01-04 12:27:50 +11:00
parent 9825c0831f
commit 9b9c087b69
4 changed files with 28 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
addon.xml
View File

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<addon id="plugin.video.embycon"
name="EmbyCon"
version="1.4.20"
version="1.4.21"
provider-name="Team B">
<requires>
<import addon="xbmc.python" version="2.24.0"/>

7
resources/lib/functions.py
View File

@@ -893,15 +893,8 @@ def PLAY(params):
play_info["force_transcode"] = forceTranscode
play_info["media_source_id"] = media_source_id
play_info["use_default"] = use_default
home_window = HomeWindow()
home_window.setProperty("item_id", item_id)
send_event_notification("embycon_play_action", play_info)
#play_data = json.dumps(play_info)
#home_window.setProperty("play_item_message", play_data)
#xbmcgui.Dialog().notification("EmbyCon", "Starting Playback")
def playTrailer(id):
log.debug("== ENTER: playTrailer ==")

59
resources/lib/play_utils.py
View File

@@ -27,7 +27,7 @@ download_utils = DownloadUtils()
@catch_except()
def playFile(play_info):
def playFile(play_info, monitor):
id = play_info.get("item_id")
auto_resume = play_info.get("auto_resume", "-1")
@@ -150,10 +150,6 @@ def playFile(play_info):
elif playback_type == "1":
playback_type_string = "DirectStream"
home_window = HomeWindow()
home_window.setProperty("PlaybackType_" + id, playback_type_string)
home_window.setProperty("PlaySessionId_" + id, play_session_id)
# add the playback type into the overview
if result.get("Overview", None) is not None:
result["Overview"] = playback_type_string + "\n" + result.get("Overview")
@@ -183,6 +179,15 @@ def playFile(play_info):
elif playback_type == "1": # for direct stream add any streamable subtitles
externalSubs(selected_media_source, list_item, id)
# add playurl and data to the monitor
data = {}
data["item_id"] = id
data["playback_type"] = playback_type_string
data["play_session_id"] = play_session_id
data["currently_playing"] = True
monitor.played_information[playurl] = data
log.debug("Add to played_information: {0}", monitor.played_information)
list_item.setPath(playurl)
list_item = setListItemProps(id, list_item, result, server, listitem_props, item_title)
@@ -440,6 +445,7 @@ def sendProgress(monitor):
play_time = xbmc.Player().getTime()
play_data["currentPossition"] = play_time
play_data["currently_playing"] = True
item_id = play_data.get("item_id")
if item_id is None:
@@ -539,11 +545,7 @@ def promptForStopActions(item_id, current_possition):
play_info["item_id"] = next_item_id
play_info["auto_resume"] = "-1"
play_info["force_transcode"] = False
play_data = json.dumps(play_info)
home_window = HomeWindow()
home_window.setProperty("item_id", next_item_id)
home_window.setProperty("play_item_message", play_data)
send_event_notification("embycon_play_action", play_info)
@catch_except()
@@ -555,7 +557,7 @@ def stopAll(played_information):
for item_url in played_information:
data = played_information.get(item_url)
if data is not None:
if data.get("currently_playing", False):
log.debug("item_url: {0}", item_url)
log.debug("item_data: {0}", data)
@@ -572,14 +574,12 @@ def stopAll(played_information):
'PositionTicks': int(current_possition * 10000000)
}
download_utils.downloadUrl(url, postBody=postdata, method="POST")
data["currently_playing"] = False
promptForStopActions(emby_item_id, current_possition)
played_information.clear()
class Service(xbmc.Player):
played_information = {}
def __init__(self, *args):
log.debug("Starting monitor service: {0}", args)
@@ -592,10 +592,14 @@ class Service(xbmc.Player):
current_playing_file = xbmc.Player().getPlayingFile()
log.debug("onPlayBackStarted: {0}", current_playing_file)
home_window = HomeWindow()
emby_item_id = home_window.getProperty("item_id")
playback_type = home_window.getProperty("PlaybackType_" + emby_item_id)
play_session_id = home_window.getProperty("PlaySessionId_" + emby_item_id)
log.debug("played_information: {0}", self.played_information)
data = self.played_information[current_playing_file]
data["paused"] = False
data["currently_playing"] = True
emby_item_id = data["item_id"]
playback_type = data["playback_type"]
play_session_id = data["play_session_id"]
# if we could not find the ID of the current item then return
if emby_item_id is None or len(emby_item_id) == 0:
@@ -616,28 +620,14 @@ class Service(xbmc.Player):
url = "{server}/emby/Sessions/Playing"
download_utils.downloadUrl(url, postBody=postdata, method="POST")
data = {}
data["item_id"] = emby_item_id
data["paused"] = False
data["playback_type"] = playback_type
data["play_session_id"] = play_session_id
self.played_information[current_playing_file] = data
log.debug("ADDING_FILE: {0}", current_playing_file)
log.debug("ADDING_FILE: {0}", self.played_information)
def onPlayBackEnded(self):
# Will be called when kodi stops playing a file
log.debug("EmbyCon Service -> onPlayBackEnded")
home_window = HomeWindow()
home_window.clearProperty("item_id")
stopAll(self.played_information)
def onPlayBackStopped(self):
# Will be called when user stops kodi playing a file
log.debug("onPlayBackStopped")
home_window = HomeWindow()
home_window.clearProperty("item_id")
stopAll(self.played_information)
def onPlayBackPaused(self):
@@ -668,6 +658,9 @@ class Service(xbmc.Player):
class PlaybackService(xbmc.Monitor):
def __init__(self, monitor):
self.monitor = monitor
def onNotification(self, sender, method, data):
log.debug("PlaybackService:onNotification:{0}:{1}:{2}", sender, method, data)
if sender[-7:] != '.SIGNAL':
@@ -682,4 +675,4 @@ class PlaybackService(xbmc.Monitor):
log.debug("PlaybackService:onNotification:{0}", hex_data)
decoded_data = binascii.unhexlify(hex_data)
play_info = json.loads(decoded_data)
playFile(play_info)
playFile(play_info, self.monitor)

2
service.py
View File

@@ -37,7 +37,7 @@ except Exception as error:
# set up all the services
monitor = Service()
playback_service = PlaybackService()
playback_service = PlaybackService(monitor)
home_window = HomeWindow()
last_progress_update = time.time()