Merge branch 'master' into develop

This commit is contained in:
tomkat83 2017-07-02 14:18:55 +02:00
commit 051006a1ef
13 changed files with 2248 additions and 48 deletions

View file

@ -1,3 +1,7 @@
# Do NOT Post Your Logs with Tokens!
Be sure to replace all tokens from your log files before posting, otherwise anyone may access your Plex Media Server! Be sure to read [the guideline](https://github.com/croneter/PlexKodiConnect/wiki/How-to-Report-A-Bug)
# How to contribute
Thanks a ton for contributing to PlexKodiConnect!

View file

@ -1,5 +1,5 @@
[![stable version](https://img.shields.io/badge/stable_version-1.8.3-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.3-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.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.8.5-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)
@ -67,6 +67,7 @@ PKC synchronizes your media from your Plex server to the native Kodi database. H
+ French, thanks @lflforce, @ahivert, @Nox71, @CotzaDev, @vinch100, @Polymorph31, @jbnitro
+ Chinese Traditional, thanks @old2tan
+ Chinese Simplified, thanks @everdream
+ Norwegian, thanks @mjorud
+ [Please help translating](https://www.transifex.com/croneter/pkc)
### Download and Installation

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.3" provider-name="croneter">
<addon id="plugin.video.plexkodiconnect" name="PlexKodiConnect" version="1.8.5" provider-name="croneter">
<requires>
<import addon="xbmc.python" version="2.1.0"/>
<import addon="script.module.requests" version="2.3.0" />
@ -54,7 +54,15 @@
<disclaimer lang="es_MX">Usar a su propio riesgo</disclaimer>
<disclaimer lang="fr_FR">A utiliser à vos propres risques</disclaimer>
<disclaimer lang="fr_CA">A utiliser à vos propres risques</disclaimer>
<news>version 1.8.3:
<news>version 1.8.5:
- version 1.8.4 for everyone
version 1.8.4 (beta only):
- Plex cloud should now work: Request pictures with transcoding API
- Fix Plex companion feedback for Android
- Update translations
version 1.8.3:
- Fix Kodi playlists being empty
version 1.8.2:

View file

@ -1,3 +1,11 @@
version 1.8.5:
- version 1.8.4 for everyone
version 1.8.4 (beta only):
- Plex cloud should now work: Request pictures with transcoding API
- Fix Plex companion feedback for Android
- Update translations
version 1.8.3:
- Fix Kodi playlists being empty

View file

@ -2139,8 +2139,8 @@ msgid ""
"Do you want to replace your custom user ratings with an indicator of how "
"many versions of a media item you posses?"
msgstr ""
"Sollen individuelle Benutzerbewertungen (user ratings) durch die verfügbare "
"Anzahl Versionen eines bestimmten Medieneintrags ersetzt werden?"
"Sollen individuelle Benutzerbewertungen durch die verfügbare Anzahl "
"Versionen eines bestimmten Medieneintrags ersetzt werden?"
# In PKC Settings under Sync
msgctxt "#39719"

View file

@ -733,7 +733,7 @@ msgstr "En Curso "
msgctxt "#30222"
msgid "NextUp "
msgstr "NextUp"
msgstr "NextUp "
msgctxt "#30223"
msgid "User Views"
@ -1177,7 +1177,7 @@ msgstr "Obligar transcodificar fotografías"
# service add-on
msgctxt "#33000"
msgid "Welcome"
msgstr "Bienvenido(a)"
msgstr "Bienvenido"
msgctxt "#33001"
msgid "Error connecting"
@ -2125,8 +2125,8 @@ msgid ""
"Kodi cannot parse {0}. PKC will not function correctly. Please visit {1} and"
" correct your file!"
msgstr ""
"Kodi no puede procesar {0}. PKC no funcionara correctamente. Por favor, "
"visite {1} y corrija el fichero."
"Kodi no puede procesar {0}. PKC no funcionara correctamente. ¡Por favor, "
"visite {1} y corrija el fichero!"
# Shown once on first installation to comply with the terms of use of
# themoviedb.org
@ -2140,8 +2140,11 @@ msgid ""
"Do you want to replace your custom user ratings with an indicator of how "
"many versions of a media item you posses?"
msgstr ""
"¿Quiere reemplazar su valoración personalizada con cuántas versione posee de"
" un elemento de medios?"
# In PKC Settings under Sync
msgctxt "#39719"
msgid "Replace user ratings with number of media versions"
msgstr ""
"Reemplazar valoraciones de usuario con cantidad de versiones de medios"

View file

@ -735,7 +735,7 @@ msgstr "En Curso "
msgctxt "#30222"
msgid "NextUp "
msgstr "NextUp"
msgstr "NextUp "
msgctxt "#30223"
msgid "User Views"
@ -1179,7 +1179,7 @@ msgstr "Obligar transcodificar fotografías"
# service add-on
msgctxt "#33000"
msgid "Welcome"
msgstr "Bienvenido(a)"
msgstr "Bienvenido"
msgctxt "#33001"
msgid "Error connecting"
@ -2127,8 +2127,8 @@ msgid ""
"Kodi cannot parse {0}. PKC will not function correctly. Please visit {1} and"
" correct your file!"
msgstr ""
"Kodi no puede procesar {0}. PKC no funcionara correctamente. Por favor, "
"visite {1} y corrija el fichero."
"Kodi no puede procesar {0}. PKC no funcionara correctamente. ¡Por favor, "
"visite {1} y corrija el fichero!"
# Shown once on first installation to comply with the terms of use of
# themoviedb.org
@ -2142,8 +2142,11 @@ msgid ""
"Do you want to replace your custom user ratings with an indicator of how "
"many versions of a media item you posses?"
msgstr ""
"¿Quiere reemplazar su valoración personalizada con cuántas versione posee de"
" un elemento de medios?"
# In PKC Settings under Sync
msgctxt "#39719"
msgid "Replace user ratings with number of media versions"
msgstr ""
"Reemplazar valoraciones de usuario con cantidad de versiones de medios"

View file

@ -733,7 +733,7 @@ msgstr "En Curso "
msgctxt "#30222"
msgid "NextUp "
msgstr "NextUp"
msgstr "NextUp "
msgctxt "#30223"
msgid "User Views"
@ -1177,7 +1177,7 @@ msgstr "Obligar transcodificar fotografías"
# service add-on
msgctxt "#33000"
msgid "Welcome"
msgstr "Bienvenido(a)"
msgstr "Bienvenido"
msgctxt "#33001"
msgid "Error connecting"
@ -2125,8 +2125,8 @@ msgid ""
"Kodi cannot parse {0}. PKC will not function correctly. Please visit {1} and"
" correct your file!"
msgstr ""
"Kodi no puede procesar {0}. PKC no funcionara correctamente. Por favor, "
"visite {1} y corrija el fichero."
"Kodi no puede procesar {0}. PKC no funcionara correctamente. ¡Por favor, "
"visite {1} y corrija el fichero!"
# Shown once on first installation to comply with the terms of use of
# themoviedb.org
@ -2140,8 +2140,11 @@ msgid ""
"Do you want to replace your custom user ratings with an indicator of how "
"many versions of a media item you posses?"
msgstr ""
"¿Quiere reemplazar su valoración personalizada con cuántas versione posee de"
" un elemento de medios?"
# In PKC Settings under Sync
msgctxt "#39719"
msgid "Replace user ratings with number of media versions"
msgstr ""
"Reemplazar valoraciones de usuario con cantidad de versiones de medios"

View file

@ -1459,12 +1459,8 @@ msgid ""
"CAUTION! If you choose \"Native\" mode , you might loose access to certain "
"Plex features such as: Plex trailers and transcoding options. ALL Plex "
"shares need to use direct paths (e.g. smb://myNAS/mymovie.mkv or "
"\\myNAS/mymovie.mkv)!"
"\\\\myNAS/mymovie.mkv)!"
msgstr ""
"ATTENZIONE! Se scegli la modalità \"Nativa\", potresti perdere alcune "
"funzionalità di Plex, come i trailer Plex e le opzioni di transcodifica. "
"TUTTE le condivisioni di Plex devono utilizzare i percorsi diretti (es. "
"smb://mioNAS/mioFilm.mkv o \\mioNAS/mioFilm.mkv)!"
msgctxt "#39029"
msgid "Network credentials"
@ -1496,23 +1492,19 @@ msgstr ""
msgctxt "#39033"
msgid ""
"Transform Plex UNC library paths \\myNas\\mymovie.mkv automatically to smb "
"paths, smb://myNas/mymovie.mkv? (recommended)"
"Transform Plex UNC library paths \\\\myNas\\mymovie.mkv automatically to smb"
" paths, smb://myNas/mymovie.mkv? (recommended)"
msgstr ""
"Trasformare i percorsi UNC della libreria Plex \\NAS\\media in percorsi SMB "
"smb://NAS/media automaticamente? (raccomandato)"
msgctxt "#39034"
msgid "Replace Plex UNC paths \\myNas with smb://myNas"
msgstr "Sostituisci i percorsi UNC di Plex \\NAS con smb://NAS"
msgid "Replace Plex UNC paths \\\\myNas with smb://myNas"
msgstr ""
msgctxt "#39035"
msgid ""
"Replace Plex paths /volume1/media or \\myserver\\media with custom SMB paths"
" smb://NAS/mystuff"
"Replace Plex paths /volume1/media or \\\\myserver\\media with custom SMB "
"paths smb://NAS/mystuff"
msgstr ""
"Sostituisci i percorsi Plex /volume1/media o \\NAS\\media con dei percorsi "
"SMB smb://NAS/media"
msgctxt "#39037"
msgid "Original Plex MOVIE path to replace:"
@ -1829,6 +1821,22 @@ msgctxt "#39225"
msgid "Missing only"
msgstr "Solo mancanti"
# Message in the PKC settings if user has not logged in to plex.tv
msgctxt "#39226"
msgid "Not logged in to plex.tv"
msgstr ""
# Message in the PKC settings if user is logged in to plex.tv
msgctxt "#39227"
msgid "Logged in to plex.tv"
msgstr ""
# Message in the PKC settings to display the plex.tv username. Leave the colon
# :
msgctxt "#39228"
msgid "Plex user:"
msgstr ""
# Plex Artwork.py
msgctxt "#39250"
msgid ""
@ -2036,3 +2044,88 @@ msgstr ""
msgctxt "#39705"
msgid "Use at your own risk"
msgstr ""
# If user gets prompted to choose between several subtitles. Leave the number
# one at the beginning of the string!
msgctxt "#39706"
msgid "1 No subtitles"
msgstr ""
# If user gets prompted to choose between several audio/subtitle tracks and
# language is unknown
msgctxt "#39707"
msgid "unknown"
msgstr ""
# If user gets prompted to choose between several subtitles and Plex adds the
# "default" flag
msgctxt "#39708"
msgid "Default"
msgstr ""
# If user gets prompted to choose between several subtitles and Plex adds the
# "forced" flag
msgctxt "#39709"
msgid "Forced"
msgstr ""
# If user gets prompted to choose between several subtitles the subtitle
# cannot be downloaded (has no 'key' attribute from the PMS), the subtitle
# needs to be burned in
msgctxt "#39710"
msgid "burn-in"
msgstr ""
# Dialog text if PKC detected a new Music library and Kodi needs to be
# restarted
msgctxt "#39711"
msgid ""
"New Plex music library detected. Sorry, but we need to restart Kodi now due "
"to the changes made."
msgstr ""
# Shown during sync process
msgctxt "#39712"
msgid "downloaded"
msgstr ""
# Shown during sync process
msgctxt "#39713"
msgid "processed"
msgstr ""
# Shown during sync process
msgctxt "#39714"
msgid "Sync"
msgstr ""
# Shown during sync process
msgctxt "#39715"
msgid "items"
msgstr ""
# Error message if an xml, e.g. advancedsettings.xml cannot be parsed (xml is
# screwed up; formated the wrong way). Do NOT replace {0} and {1}!
msgctxt "#39716"
msgid ""
"Kodi cannot parse {0}. PKC will not function correctly. Please visit {1} and"
" correct your file!"
msgstr ""
# Shown once on first installation to comply with the terms of use of
# themoviedb.org
msgctxt "#39717"
msgid "PKC uses free additional artwork from www.themoviedb.org. Many thanks!"
msgstr ""
# Shown during very first PKC setup only
msgctxt "#39718"
msgid ""
"Do you want to replace your custom user ratings with an indicator of how "
"many versions of a media item you posses?"
msgstr ""
# In PKC Settings under Sync
msgctxt "#39719"
msgid "Replace user ratings with number of media versions"
msgstr ""

View file

@ -1453,6 +1453,10 @@ msgid ""
"shares need to use direct paths (e.g. smb://myNAS/mymovie.mkv or "
"\\\\myNAS/mymovie.mkv)!"
msgstr ""
"WAARSCHUWING! Als je kiest voor 'Native' mode, zal je bepaalde plex features"
" missen. zoals: trailers en transcoding instellingen. Alle Plex paden moeten"
" directe paden gebruiken (bijvoorbeeld smb://myNAS/mymovie.mkv of "
"\\\\myNAS\\mymovie.mkv)!"
msgctxt "#39029"
msgid "Network credentials"
@ -1485,16 +1489,20 @@ msgid ""
"Transform Plex UNC library paths \\\\myNas\\mymovie.mkv automatically to smb"
" paths, smb://myNas/mymovie.mkv? (recommended)"
msgstr ""
"Vervang Plex UNC bibliotheek paden \\\\myNas\\mymovie.mkv automatisch met "
"smb paden, smb://myNas/mymovie.mkv? (aangeraden)"
msgctxt "#39034"
msgid "Replace Plex UNC paths \\\\myNas with smb://myNas"
msgstr ""
msgstr "Vervang Plex UNC paden \\\\MyNas met smb://myNas"
msgctxt "#39035"
msgid ""
"Replace Plex paths /volume1/media or \\\\myserver\\media with custom SMB "
"paths smb://NAS/mystuff"
msgstr ""
"Vervang plex paden /volume1/media of \\\\myserver\\media met aangepaste SMB "
"paden smb://NAS/mystuff"
msgctxt "#39037"
msgid "Original Plex MOVIE path to replace:"
@ -1805,18 +1813,18 @@ msgstr "Alleen ontbrekende"
# Message in the PKC settings if user has not logged in to plex.tv
msgctxt "#39226"
msgid "Not logged in to plex.tv"
msgstr ""
msgstr "Niet ingelogd op plek.tv"
# Message in the PKC settings if user is logged in to plex.tv
msgctxt "#39227"
msgid "Logged in to plex.tv"
msgstr ""
msgstr "Ingelogd op plek.tv"
# Message in the PKC settings to display the plex.tv username. Leave the colon
# :
msgctxt "#39228"
msgid "Plex user:"
msgstr ""
msgstr "Plex gebruiker:"
# Plex Artwork.py
msgctxt "#39250"
@ -2104,8 +2112,10 @@ msgid ""
"Do you want to replace your custom user ratings with an indicator of how "
"many versions of a media item you posses?"
msgstr ""
"Wil je de custom ratings vervangen met het aantal media versies dat aanwezig"
" is voor een item?"
# In PKC Settings under Sync
msgctxt "#39719"
msgid "Replace user ratings with number of media versions"
msgstr ""
msgstr "Vervang ratings met aantal media versies"

File diff suppressed because it is too large Load diff

View file

@ -740,15 +740,14 @@ class API():
}
def __getOneArtwork(self, entry):
try:
if entry not in self.item.attrib:
return ''
artwork = self.item.attrib[entry]
if artwork.startswith('http'):
pass
else:
artwork = "%s%s" % (self.server, artwork)
artwork = self.addPlexCredentialsToUrl(artwork)
except KeyError:
artwork = ""
artwork = self.addPlexCredentialsToUrl(
"%s/photo/:/transcode?width=4000&height=4000&minSize=1&upscale=0&url=%s" % (self.server, artwork))
return artwork
def getAllArtwork(self, parentInfo=False):

View file

@ -58,7 +58,7 @@ class SubscriptionManager:
def msg(self, players):
msg = getXMLHeader()
msg += '<MediaContainer size="3" commandID="INSERTCOMMANDID"'
msg += ' machineIdentifier="%s">' % window('plex_client_Id')
msg += ' machineIdentifier="%s" location="fullScreenVideo">' % window('plex_client_Id')
msg += self.getTimelineXML(self.js.getAudioPlayerId(players), plex_audio())
msg += self.getTimelineXML(self.js.getPhotoPlayerId(players), plex_photo())
msg += self.getTimelineXML(self.js.getVideoPlayerId(players), plex_video())