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

Merge pull request #1298 from croneter/fix-pix

Browse source 
Fix pictures from Plex picture libraries not working/displaying
This commit is contained in:
croneter 2021-01-24 16:51:03 +01:00 committed by GitHub
commit 43921b1f9b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 109 additions and 73 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
resources/lib/plex_api/media.py
View file

@ -89,6 +89,25 @@ class Media(object):
'gain': cast(float, self._from_stream_or_part('gain'))
}
def picture_codec(self):
"""
Returns the exif metadata of pictures. This does NOT seem to be used
reliably by Kodi skins! (e.g. not at all)
"""
return {
'exif:CameraMake': self.xml[0].get('make'), # e.g. 'Canon'
'exif:CameraModel': self.xml[0].get('model'), # e.g. 'Canon XYZ'
'exif:DateTime': self.xml.get('originallyAvailableAt', '').replace('-', ':') or None, # e.g. '2017-11-05'
'exif:Height': self.xml[0].get('height'), # e.g. '2160'
'exif:Width': self.xml[0].get('width'), # e.g. '3240'
'exif:Orientation': self.xml[0][self.part].get('orientation'), # e.g. '1'
'exif:FocalLength': self.xml[0].get('focalLength'), # TO BE VALIDATED
'exif:ExposureTime': self.xml[0].get('exposure'), # e.g. '1/1000'
'exif:ApertureFNumber': self.xml[0].get('aperture'), # e.g. 'f/5.0'
'exif:ISOequivalent': self.xml[0].get('iso'), # e.g. '1600'
# missing on Kodi side: lens, e.g. "EF50mm f/1.8 II"
}
def mediastreams(self):
"""
Returns the media streams for metadata purposes

45
resources/lib/widgets.py
View file

@ -133,6 +133,17 @@ def _generate_content(api):
# other fields - let's use the PMS answer to be safe
# See https://github.com/croneter/PlexKodiConnect/issues/1129
if not api.kodi_id or 'title' not in item:
if api.plex_type == v.PLEX_TYPE_PHOTO:
item = {
'title': api.title(),
'label': api.title(),
'type': api.kodi_type,
'dateadded': api.date_created(), # e.g '2019-01-03 19:40:59'
'lastplayed': api.lastplayed(), # e.g. '2019-01-04 16:05:03'
'playcount': api.viewcount(),
}
item.update(api.picture_codec())
else:
cast = [{
'name': x[0],
'thumbnail': x[1],
@ -177,13 +188,6 @@ def _generate_content(api):
'writer': api.writers(), # list of [str]
'year': api.year(), # [int]
}
if plex_type in (v.PLEX_TYPE_EPISODE, v.PLEX_TYPE_SEASON, v.PLEX_TYPE_SHOW):
leaves = api.leave_count()
if leaves:
item['extraproperties'] = leaves
# Add all the artwork we can
item['art'] = api.artwork(full_artwork=True)
# Add all info for e.g. video and audio streams
item['streamdetails'] = api.mediastreams()
# Cleanup required due to the way metadatautils works
@ -201,6 +205,12 @@ def _generate_content(api):
'position': resume,
'total': api.runtime()
}
if plex_type in (v.PLEX_TYPE_EPISODE, v.PLEX_TYPE_SEASON, v.PLEX_TYPE_SHOW):
leaves = api.leave_count()
if leaves:
item['extraproperties'] = leaves
# Add all the artwork we can
item['art'] = api.artwork(full_artwork=True)
item['icon'] = v.ICON_FROM_PLEXTYPE[plex_type]
# Some customization
@ -462,16 +472,18 @@ def create_listitem(item, as_tuple=True, offscreen=True,
elif "plugin://script.skin.helper" not in item['file']:
liz.setProperty('IsPlayable', 'true')
nodetype = "Video"
if item["type"] in ["song", "album", "artist"]:
nodetype = "Music"
nodetype = "music"
elif item['type'] == 'photo':
nodetype = 'pictures'
else:
nodetype = 'video'
# extra properties
for key, value in item["extraproperties"].items():
liz.setProperty(key, value)
# video infolabels
if nodetype == "Video":
if nodetype == 'video':
infolabels = {
"title": item.get("title"),
"size": item.get("size"),
@ -522,8 +534,7 @@ def create_listitem(item, as_tuple=True, offscreen=True,
if "date" in item:
infolabels["date"] = item["date"]
# music infolabels
else:
elif nodetype == 'music':
infolabels = {
"title": item.get("title"),
"size": item.get("size"),
@ -543,12 +554,18 @@ def create_listitem(item, as_tuple=True, offscreen=True,
if "lastplayed" in item:
infolabels["lastplayed"] = item["lastplayed"]
else:
# Pictures
infolabels = {
"title": item.get("title"),
'picturepath': item['file']
}
# setting the dbtype and dbid is supported from kodi krypton and up
# PKC hack: ignore empty type
if item["type"] not in ["recording", "channel", "favourite", ""]:
infolabels["mediatype"] = item["type"]
# setting the dbid on music items is not supported ?
if nodetype == "Video" and "DBID" in item["extraproperties"]:
if nodetype == "video" and "DBID" in item["extraproperties"]:
infolabels["dbid"] = item["extraproperties"]["DBID"]
if "lastplayed" in item: