Merge branch 'master' of https://github.com/MediaBrowser/Emby.Kodi
This commit is contained in:
commit
eb636def38
3 changed files with 26 additions and 1 deletions
|
@ -311,7 +311,7 @@ class PlayUtils():
|
||||||
|
|
||||||
path = result[u'Path']
|
path = result[u'Path']
|
||||||
# Verify the device has access to the direct path
|
# Verify the device has access to the direct path
|
||||||
if os.path.exists(path):
|
if os.path.exists(path.encode('utf-8')):
|
||||||
return True
|
return True
|
||||||
elif ":\\" not in path:
|
elif ":\\" not in path:
|
||||||
# Give benefit of the doubt for nfs protocol
|
# Give benefit of the doubt for nfs protocol
|
||||||
|
|
|
@ -48,6 +48,18 @@ class PlaybackUtils():
|
||||||
except:
|
except:
|
||||||
return
|
return
|
||||||
|
|
||||||
|
# For split movies
|
||||||
|
if u'PartCount' in result:
|
||||||
|
partcount = result[u'PartCount']
|
||||||
|
# Get additional parts/playurl
|
||||||
|
url = "{server}/mediabrowser/Videos/%s/AdditionalParts" % id
|
||||||
|
parts = self.downloadUtils.downloadUrl(url)
|
||||||
|
partsId = [id]
|
||||||
|
for part in parts[u'Items']:
|
||||||
|
partId = part[u'Id']
|
||||||
|
partsId.append(partId)
|
||||||
|
self.PLAYAllItems(partsId, startPositionTicks=None)
|
||||||
|
|
||||||
userData = result['UserData']
|
userData = result['UserData']
|
||||||
resume_result = 0
|
resume_result = 0
|
||||||
seekTime = 0
|
seekTime = 0
|
||||||
|
|
|
@ -179,6 +179,19 @@ class WebSocketThread(threading.Thread):
|
||||||
self.remove_items(itemsRemoved)
|
self.remove_items(itemsRemoved)
|
||||||
self.update_items(itemsToUpdate)
|
self.update_items(itemsToUpdate)
|
||||||
|
|
||||||
|
elif messageType == "GeneralCommand":
|
||||||
|
|
||||||
|
if data.get("Name") == "DisplayMessage":
|
||||||
|
message = data.get("Arguments")
|
||||||
|
header = message[u'Header']
|
||||||
|
text = message[u'Text']
|
||||||
|
xbmcgui.Dialog().notification(header, text)
|
||||||
|
|
||||||
|
elif data.get("Name") == "SendString":
|
||||||
|
message = data.get("Arguments")
|
||||||
|
string = message[u'String']
|
||||||
|
xbmcgui.Dialog().notification("Emby server", string)
|
||||||
|
|
||||||
def remove_items(self, itemsRemoved):
|
def remove_items(self, itemsRemoved):
|
||||||
|
|
||||||
#Process video library
|
#Process video library
|
||||||
|
|
Loading…
Reference in a new issue