From 68f82eaed0fba200e209df5d347246750044ef0c Mon Sep 17 00:00:00 2001 From: croneter Date: Fri, 31 Mar 2017 12:26:17 +0200 Subject: [PATCH 1/3] Update README.md --- README.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index f75de095..63bb3209 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,6 @@ + +# PlexKodiConnect (PKC) + [![stable version](https://img.shields.io/badge/stable_version-1.7.5-blue.svg?maxAge=60&style=flat) ](https://dl.bintray.com/croneter/PlexKodiConnect/bin/repository.plexkodiconnect/repository.plexkodiconnect-1.0.0.zip) [![beta version](https://img.shields.io/badge/beta_version-1.7.5-red.svg?maxAge=60&style=flat) ](https://dl.bintray.com/croneter/PlexKodiConnect_BETA/bin-BETA/repository.plexkodiconnectbeta/repository.plexkodiconnectbeta-1.0.0.zip) @@ -8,7 +11,6 @@ [![GitHub issues](https://img.shields.io/github/issues/croneter/PlexKodiConnect.svg?maxAge=60&style=flat)](https://github.com/croneter/PlexKodiConnect/issues) [![GitHub pull requests](https://img.shields.io/github/issues-pr/croneter/PlexKodiConnect.svg?maxAge=60&style=flat)](https://github.com/croneter/PlexKodiConnect/pulls) [![Codacy Badge](https://api.codacy.com/project/badge/Grade/a66870f19ced4fb98f94d9fd56e34e87)](https://www.codacy.com/app/croneter/PlexKodiConnect?utm_source=github.com&utm_medium=referral&utm_content=croneter/PlexKodiConnect&utm_campaign=Badge_Grade) -# PlexKodiConnect (PKC) **Combine the best frontend media player Kodi with the best multimedia backend server Plex** PKC combines the best of Kodi - ultra smooth navigation, beautiful and highly customizable user interfaces and playback of any file under the sun - and the Plex Media Server. From 1731204b14bd9f8c7f518011d1c9fd7387196f85 Mon Sep 17 00:00:00 2001 From: tomkat83 Date: Fri, 31 Mar 2017 16:25:24 +0200 Subject: [PATCH 2/3] Revert "Update README.md" This reverts commit 68f82eaed0fba200e209df5d347246750044ef0c. --- README.md | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/README.md b/README.md index 63bb3209..f75de095 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,3 @@ - -# PlexKodiConnect (PKC) - [![stable version](https://img.shields.io/badge/stable_version-1.7.5-blue.svg?maxAge=60&style=flat) ](https://dl.bintray.com/croneter/PlexKodiConnect/bin/repository.plexkodiconnect/repository.plexkodiconnect-1.0.0.zip) [![beta version](https://img.shields.io/badge/beta_version-1.7.5-red.svg?maxAge=60&style=flat) ](https://dl.bintray.com/croneter/PlexKodiConnect_BETA/bin-BETA/repository.plexkodiconnectbeta/repository.plexkodiconnectbeta-1.0.0.zip) @@ -11,6 +8,7 @@ [![GitHub issues](https://img.shields.io/github/issues/croneter/PlexKodiConnect.svg?maxAge=60&style=flat)](https://github.com/croneter/PlexKodiConnect/issues) [![GitHub pull requests](https://img.shields.io/github/issues-pr/croneter/PlexKodiConnect.svg?maxAge=60&style=flat)](https://github.com/croneter/PlexKodiConnect/pulls) [![Codacy Badge](https://api.codacy.com/project/badge/Grade/a66870f19ced4fb98f94d9fd56e34e87)](https://www.codacy.com/app/croneter/PlexKodiConnect?utm_source=github.com&utm_medium=referral&utm_content=croneter/PlexKodiConnect&utm_campaign=Badge_Grade) +# PlexKodiConnect (PKC) **Combine the best frontend media player Kodi with the best multimedia backend server Plex** PKC combines the best of Kodi - ultra smooth navigation, beautiful and highly customizable user interfaces and playback of any file under the sun - and the Plex Media Server. From c049e8d05e95dae321f92a75d9af12cf6a339ac0 Mon Sep 17 00:00:00 2001 From: RickDB Date: Sun, 2 Apr 2017 14:11:13 +0200 Subject: [PATCH 3/3] Included additional info in stream selection dialog --- resources/lib/PlexAPI.py | 30 +++++++++++++++++++++++++----- 1 file changed, 25 insertions(+), 5 deletions(-) diff --git a/resources/lib/PlexAPI.py b/resources/lib/PlexAPI.py index a324f2e2..fec9e228 100644 --- a/resources/lib/PlexAPI.py +++ b/resources/lib/PlexAPI.py @@ -30,6 +30,7 @@ http://stackoverflow.com/questions/111945/is-there-any-way-to-do-http-put-in-pyt (and others...) """ +import os import logging from time import time import urllib2 @@ -2186,12 +2187,31 @@ class API(): # Several streams/files available. dialoglist = [] for entry in self.item.findall('./Media'): + fileName = '' + audioLanguage = '' + + # Get additional info (filename / languages) + mediaPartEntry = self.item.find('./Media/Part') + if mediaPartEntry is not None: + # Filename + if 'file' in mediaPartEntry.attrib: + fileName = os.path.basename(mediaPartEntry.attrib['file']) + + # Languages - subtitle does not seem to be directly included in this stream info + mediaPartStreamEntry = self.item.find('./Media/Part/Stream') + if mediaPartStreamEntry is not None: + # Audio language + if 'language' in mediaPartStreamEntry.attrib: + audioLanguage = mediaPartStreamEntry.attrib['language'] + dialoglist.append( - "%sp %s - %s (%s)" - % (entry.attrib.get('videoResolution', 'unknown'), - entry.attrib.get('videoCodec', 'unknown'), - entry.attrib.get('audioProfile', 'unknown'), - entry.attrib.get('audioCodec', 'unknown')) + "%sp %s - %s (%s) (%s) %s" % + (entry.attrib.get('videoResolution', 'unknown'), + entry.attrib.get('videoCodec', 'unknown'), + entry.attrib.get('audioProfile', 'unknown'), + entry.attrib.get('audioCodec', 'unknown'), + audioLanguage, + fileName) ) media = xbmcgui.Dialog().select('Select stream', dialoglist) else: