From 71d234ced7a435627289a52b1353059a91ebfb38 Mon Sep 17 00:00:00 2001 From: angelblue05 Date: Thu, 7 May 2015 19:24:32 -0500 Subject: [PATCH 1/2] Fix playback report It now shows the appropriate info in dashboard - Direct Play, Direct Stream or Transcoding --- resources/lib/PlayUtils.py | 10 ++++++++-- resources/lib/PlaybackUtils.py | 7 ------- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/resources/lib/PlayUtils.py b/resources/lib/PlayUtils.py index f0e7d3bc..48de4c32 100644 --- a/resources/lib/PlayUtils.py +++ b/resources/lib/PlayUtils.py @@ -53,14 +53,17 @@ class PlayUtils(): playurl = self.transcoding(result, server, id) WINDOW.setProperty("transcoding%s" % id, "true") self.logMsg("File is transcoding.", 1) + WINDOW.setProperty("%splaymethod" % playurl, "Transcode") else: self.logMsg("File is direct streaming.", 1) + WINDOW.setProperty("%splaymethod" % playurl, "DirectStream") else: # User decided not to proceed. self.logMsg("Unable to direct play. Verify the following path is accessible by the device: %s. You might also need to add SMB credentials in the addon settings." % result[u'MediaSources'][0][u'Path']) return False else: self.logMsg("File is direct playing.", 1) + WINDOW.setProperty("%splaymethod" % playurl, "DirectPlay") except: return False @@ -73,8 +76,10 @@ class PlayUtils(): playurl = self.transcoding(result, server, id) WINDOW.setProperty("transcoding%s" % id, "true") self.logMsg("File is transcoding.", 1) + WINDOW.setProperty("%splaymethod" % playurl, "Transcode") else: self.logMsg("File is direct streaming.", 1) + WINDOW.setProperty("%splaymethod" % playurl, "DirectStream") except: return False @@ -84,6 +89,7 @@ class PlayUtils(): playurl = self.transcoding(result, server, id) WINDOW.setProperty("transcoding%s" % id, "true") self.logMsg("File is transcoding.", 1) + WINDOW.setProperty("%splaymethod" % playurl, "Transcode") except: return False @@ -93,9 +99,9 @@ class PlayUtils(): def isDirectPlay(self, result): # Requirements for Direct play: # FileSystem, Accessible path - addon = self.addon + self.addon = xbmcaddon.Addon(id=self.addonId) - playhttp = addon.getSetting('playFromStream') + playhttp = self.addon.getSetting('playFromStream') # User forcing to play via HTTP instead of SMB if playhttp == "true": return False diff --git a/resources/lib/PlaybackUtils.py b/resources/lib/PlaybackUtils.py index 65aba89d..59aa8642 100644 --- a/resources/lib/PlaybackUtils.py +++ b/resources/lib/PlaybackUtils.py @@ -109,13 +109,6 @@ class PlaybackUtils(): WINDOW.setProperty(playurl+"runtimeticks", str(result.get("RunTimeTicks"))) WINDOW.setProperty(playurl+"type", result.get("Type")) WINDOW.setProperty(playurl+"item_id", id) - - if PlayUtils().isDirectPlay(result) == True: - playMethod = "DirectPlay" - else: - playMethod = "Transcode" - - WINDOW.setProperty(playurl+"playmethod", playMethod) mediaSources = result.get("MediaSources") if(mediaSources != None): From 68077d5578acec70144f9318d4d2003598898602 Mon Sep 17 00:00:00 2001 From: angelblue05 Date: Thu, 7 May 2015 19:38:27 -0500 Subject: [PATCH 2/2] Minor follow up --- resources/lib/PlayUtils.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/resources/lib/PlayUtils.py b/resources/lib/PlayUtils.py index 48de4c32..b5f102cd 100644 --- a/resources/lib/PlayUtils.py +++ b/resources/lib/PlayUtils.py @@ -117,6 +117,8 @@ class PlayUtils(): # Verify if path is accessible if self.fileExists(result): return True + else: + return False def directPlay(self, result):