Troplo/PlexKodiConnect
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'hotfixes' of https://github.com/croneter/PlexKodiConnect into hotfixes

Browse source
This commit is contained in:
tomkat83 2017-11-05 12:53:05 +01:00
commit 3e9e572e3c
10 changed files with 2203 additions and 135 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
README.md
View file

@ -1,5 +1,5 @@
[![stable version](https://img.shields.io/badge/stable_version-1.8.16-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.8.16-red.svg?maxAge=60&style=flat) ](https://dl.bintray.com/croneter/PlexKodiConnect_BETA/bin-BETA/repository.plexkodiconnectbeta/repository.plexkodiconnectbeta-1.0.0.zip)
[![stable version](https://img.shields.io/badge/stable_version-1.8.18-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.8.18-red.svg?maxAge=60&style=flat) ](https://dl.bintray.com/croneter/PlexKodiConnect_BETA/bin-BETA/repository.plexkodiconnectbeta/repository.plexkodiconnectbeta-1.0.0.zip)
[![Installation](https://img.shields.io/badge/wiki-installation-brightgreen.svg?maxAge=60&style=flat)](https://github.com/croneter/PlexKodiConnect/wiki/Installation)
[![FAQ](https://img.shields.io/badge/wiki-FAQ-brightgreen.svg?maxAge=60&style=flat)](https://github.com/croneter/PlexKodiConnect/wiki/faq)

18
addon.xml
View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<addon id="plugin.video.plexkodiconnect" name="PlexKodiConnect" version="1.8.16" provider-name="croneter">
<addon id="plugin.video.plexkodiconnect" name="PlexKodiConnect" version="1.8.18" provider-name="croneter">
<requires>
<import addon="xbmc.python" version="2.1.0"/>
<import addon="script.module.requests" version="2.3.0" />
@ -13,7 +13,7 @@
<item>
<label>30401</label>
<description>30416</description>
<visible>[!IsEmpty(ListItem.DBID) + !StringCompare(ListItem.DBID,-1) | !IsEmpty(ListItem.Property(plexid))] + !IsEmpty(Window(10000).Property(plex_context))</visible>
<visible>[!IsEmpty(ListItem.DBID) + !StringCompare(ListItem.DBID,-1) | !IsEmpty(ListItem.Property(plexid))]</visible>
</item>
</extension>
<extension point="xbmc.addon.metadata">
@ -59,7 +59,19 @@
<summary lang="da_DK">Indbygget Integration af Plex i Kodi</summary>
<description lang="da_DK">Tilslut Kodi til din Plex Media Server. Dette plugin forudsætter, at du administrere alle dine videoer med Plex (og ikke med Kodi). Du kan miste data som allerede er gemt i Kodi video og musik-databaser (dette plugin ændrer direkte i dem). Brug på eget ansvar!</description>
<disclaimer lang="da_DK">Brug på eget ansvar</disclaimer>
<news>version 1.8.16:
<news>version 1.8.18:
- Russian translation, thanks @UncleStark, @xom2000, @AlexFreit
- Fix Plex context menu not showing up
- Deal better with missing stream info (e.g. channels)
- Fix AttributeError if Plex key is missing
version 1.8.17:
- Hopefully fix stable repo
- Fix subtitles not working or showing up as Unknown
- Enable channels for Plex home users
- Remove obsolete PKC settings show contextmenu
version 1.8.16:
- Add premiere dates for movies, thanks @dazedcrazy
- Fix items not getting marked as fully watched

12
changelog.txt
View file

@ -1,3 +1,15 @@
version 1.8.18:
- Russian translation, thanks @UncleStark, @xom2000, @AlexFreit
- Fix Plex context menu not showing up
- Deal better with missing stream info (e.g. channels)
- Fix AttributeError if Plex key is missing
version 1.8.17:
- Hopefully fix stable repo
- Fix subtitles not working or showing up as Unknown
- Enable channels for Plex home users
- Remove obsolete PKC settings show contextmenu
version 1.8.16:
- Add premiere dates for movies, thanks @dazedcrazy
- Fix items not getting marked as fully watched

2128
resources/language/resource.language.ru_RU/strings.po Normal file
View file

File diff suppressed because it is too large Load diff

110
resources/lib/PlexAPI.py
View file

@ -57,7 +57,7 @@ import state
###############################################################################
log = logging.getLogger("PLEX."+__name__)
log = logging.getLogger("PLEX." + __name__)
REGEX_IMDB = re_compile(r'''/(tt\d+)''')
REGEX_TVDB = re_compile(r'''thetvdb:\/\/(.+?)\?''')
@ -1177,9 +1177,9 @@ class API():
def getKey(self):
"""
Returns the Plex key such as '/library/metadata/246922'
Returns the Plex key such as '/library/metadata/246922' or empty string
"""
return self.item.attrib.get('key')
return self.item.attrib.get('key', '')
def getFilePath(self, forceFirstMediaStream=False):
"""
@ -1756,61 +1756,56 @@ class API():
subtitlelanguages = []
try:
# Sometimes, aspectratio is on the "toplevel"
aspectratio = self.item[0].attrib.get('aspectRatio', None)
aspect = self.item[0].attrib.get('aspectRatio')
except IndexError:
# There is no stream info at all, returning empty
return {
'video': videotracks,
'audio': audiotracks,
'subtitle': subtitlelanguages
}
# TODO: what if several Media tags exist?!?
'video': videotracks,
'audio': audiotracks,
'subtitle': subtitlelanguages
}
# Loop over parts
for child in self.item[0]:
container = child.attrib.get('container', None)
container = child.attrib.get('container')
# Loop over Streams
for grandchild in child:
mediaStream = grandchild.attrib
mediaType = int(mediaStream.get('streamType', 999))
if mediaType == 1: # Video streams
videotrack = {}
videotrack['codec'] = mediaStream['codec'].lower()
if "msmpeg4" in videotrack['codec']:
videotrack['codec'] = "divx"
elif "mpeg4" in videotrack['codec']:
# if "simple profile" in profile or profile == "":
# videotrack['codec'] = "xvid"
pass
elif "h264" in videotrack['codec']:
if container in ("mp4", "mov", "m4v"):
videotrack['codec'] = "avc1"
videotrack['height'] = mediaStream.get('height', None)
videotrack['width'] = mediaStream.get('width', None)
# TODO: 3d Movies?!?
# videotrack['Video3DFormat'] = item.get('Video3DFormat')
aspectratio = mediaStream.get('aspectRatio', aspectratio)
videotrack['aspect'] = aspectratio
# TODO: Video 3d format
videotrack['video3DFormat'] = None
videotracks.append(videotrack)
elif mediaType == 2: # Audio streams
audiotrack = {}
audiotrack['codec'] = mediaStream['codec'].lower()
if ("dca" in audiotrack['codec'] and
"ma" in mediaStream.get('profile', '').lower()):
audiotrack['codec'] = "dtshd_ma"
audiotrack['channels'] = mediaStream.get('channels')
stream = grandchild.attrib
media_type = int(stream.get('streamType', 999))
track = {}
if media_type == 1: # Video streams
if 'codec' in stream:
track['codec'] = stream['codec'].lower()
if "msmpeg4" in track['codec']:
track['codec'] = "divx"
elif "mpeg4" in track['codec']:
# if "simple profile" in profile or profile == "":
# track['codec'] = "xvid"
pass
elif "h264" in track['codec']:
if container in ("mp4", "mov", "m4v"):
track['codec'] = "avc1"
track['height'] = stream.get('height')
track['width'] = stream.get('width')
# track['Video3DFormat'] = item.get('Video3DFormat')
track['aspect'] = stream.get('aspectRatio', aspect)
track['duration'] = self.getRuntime()[1]
track['video3DFormat'] = None
videotracks.append(track)
elif media_type == 2: # Audio streams
if 'codec' in stream:
track['codec'] = stream['codec'].lower()
if ("dca" in track['codec'] and
"ma" in stream.get('profile', '').lower()):
track['codec'] = "dtshd_ma"
track['channels'] = stream.get('channels')
# 'unknown' if we cannot get language
audiotrack['language'] = mediaStream.get(
track['language'] = stream.get(
'languageCode', lang(39310)).lower()
audiotracks.append(audiotrack)
elif mediaType == 3: # Subtitle streams
audiotracks.append(track)
elif media_type == 3: # Subtitle streams
# 'unknown' if we cannot get language
subtitlelanguages.append(
mediaStream.get('languageCode',
lang(39310)).lower())
stream.get('languageCode', lang(39310)).lower())
return {
'video': videotracks,
'audio': audiotracks,
@ -2370,14 +2365,10 @@ class API():
if key:
# We do know the language - temporarily download
if stream.attrib.get('languageCode') is not None:
try:
language = v.LANGUAGECODE_TO_LANGUAGE[stream.attrib['languageCode']]
except KeyError:
language = stream.attrib['languageCode']
path = self.download_external_subtitles(
"{server}%s" % key,
"subtitle%02d.%s.%s" % (fileindex,
language,
stream.attrib['languageCode'],
stream.attrib['codec']))
fileindex += 1
# We don't know the language - no need to download
@ -2567,18 +2558,9 @@ class API():
"""
Add media stream information to xbmcgui.ListItem
"""
mediastreams = self.getMediaStreams()
videostreamFound = False
if mediastreams:
for key, value in mediastreams.iteritems():
if key == "video" and value:
videostreamFound = True
if value:
listItem.addStreamInfo(key, value)
if not videostreamFound:
# just set empty streamdetails to prevent errors in the logs
listItem.addStreamInfo(
"video", {'duration': self.getRuntime()[1]})
for key, value in self.getMediaStreams().iteritems():
if value:
listItem.addStreamInfo(key, value)
def validatePlayurl(self, path, typus, forceCheck=False, folder=False,
omitCheck=False):

4
resources/lib/entrypoint.py
View file

@ -752,10 +752,6 @@ def channels():
"""
Listing for Plex Channels
"""
if window('plex_restricteduser') == 'true':
log.error('No Plex Channels - restricted user')
return xbmcplugin.endOfDirectory(HANDLE, False)
xml = downloadutils.DownloadUtils().downloadUrl('{server}/channels/all')
try:
xml[0].attrib

1
resources/lib/kodimonitor.py
View file

@ -22,7 +22,6 @@ log = getLogger("PLEX."+__name__)
# settings: window-variable
WINDOW_SETTINGS = {
'enableContext': 'plex_context',
'plex_restricteduser': 'plex_restricteduser',
'force_transcode_pix': 'plex_force_transcode_pix',
'fetch_pms_item_number': 'fetch_pms_item_number'

58
resources/lib/variables.py
View file

@ -21,66 +21,8 @@ def tryDecode(string, encoding='utf-8'):
string = string.decode()
return string
# When does Plex mark a video as completely played?
MARK_PLAYED_AT = 0.9
# Matching table for using Plex XML's stream 'languageCode'
LANGUAGECODE_TO_LANGUAGE = {
'afr': 'Afrikaans',
'ara': 'Arabic',
'hye': 'Armenian',
'bul': 'Bulgarian',
'cat': 'Catala',
'chi': 'Mandarin',
'hrv': 'Hrvatski',
'cze': 'Cesky',
'dan': 'Dansk',
'dut': 'Nederlands',
'eng': 'English',
'epo': 'Esperanto',
'fin': 'Suomi',
'fre': 'Francais',
'ger': 'Deutsch',
'geo': 'Georgian',
'gre': 'Greek',
'heb': 'Hebrew',
'hin': 'Hindi',
'hun': 'Magyar',
'ind': 'Bahasa Indonesia',
'gle': 'Gaeilge',
'ice': 'Islenska',
'ita': 'Italiano',
'jpn': 'Japanese',
'kor': 'Korean',
'kur': 'Kurdi',
'lat': 'Latin',
'mac': 'Macedonian',
'may': 'Malay',
'mlt': 'Malti',
'nep': 'Nepali',
'nor': 'Norsk',
'per': 'Persian',
'pol': 'Polszczyzna',
'por': 'Portugues',
'rum': 'Romana',
'rus': 'Russian',
'srp': 'Serbian',
'gla': 'Gaidhlig',
'slo': 'Slovencina',
'slv': 'Slovenski Jezik',
'spa': 'Espanol',
'swe': 'Svenska',
'tam': 'Tamil',
'tha': 'Thai',
'tur': 'Turkish',
'tah': 'Tahitian',
'ukr': 'Ukrainian',
'uzb': 'Ozbek',
'vie': 'Tieng Viet',
'wel': 'Cymraeg',
'yid': 'Yiddish',
}
_ADDON = Addon()
ADDON_NAME = 'PlexKodiConnect'
ADDON_ID = 'plugin.video.plexkodiconnect'

1
resources/settings.xml
View file

@ -38,7 +38,6 @@
<setting type="lsep" label="39700" />
<setting id="enable_alexa" label="39701" type="bool" default="true"/>
<setting type="lsep" label="" />
<setting id="enableContext" type="bool" label="30413" default="true" />
<setting id="skipContextMenu" type="bool" label="30520" default="false" visible="eq(-1,true)" subsetting="true" />
<setting id="plex_restricteduser" type="bool" default="false" visible="false"/>
<setting id="plex_allows_mediaDeletion" type="bool" default="true" visible="false"/>

2
service.py
View file

@ -85,8 +85,6 @@ class Service():
window('plex_kodiProfile',
value=tryDecode(translatePath("special://profile")))
window('plex_context',
value='true' if settings('enableContext') == "true" else "")
window('fetch_pms_item_number',
value=settings('fetch_pms_item_number'))