mirror of
https://github.com/Tautulli/Tautulli.git
synced 2025-07-16 02:02:58 -07:00
Overwrite image provider export field for uploaded assets
This commit is contained in:
parent
ee0b4c0602
commit
68bf1c70f7
1 changed files with 23 additions and 21 deletions
|
@ -148,7 +148,7 @@ class Export(object):
|
||||||
'art': None,
|
'art': None,
|
||||||
'artBlurHash': None,
|
'artBlurHash': None,
|
||||||
'artFile': lambda o: self.get_image(o, 'art'),
|
'artFile': lambda o: self.get_image(o, 'art'),
|
||||||
'artProvider': lambda o: self.get_image_attr(o, 'art', 'provider'),
|
'artProvider': lambda o: self.get_image_provider(o, 'art'),
|
||||||
'audienceRating': None,
|
'audienceRating': None,
|
||||||
'audienceRatingImage': None,
|
'audienceRatingImage': None,
|
||||||
'chapters': {
|
'chapters': {
|
||||||
|
@ -385,7 +385,7 @@ class Export(object):
|
||||||
'thumb': None,
|
'thumb': None,
|
||||||
'thumbBlurHash': None,
|
'thumbBlurHash': None,
|
||||||
'thumbFile': lambda o: self.get_image(o, 'thumb'),
|
'thumbFile': lambda o: self.get_image(o, 'thumb'),
|
||||||
'thumbProvider': lambda o: self.get_image_attr(o, 'thumb', 'provider'),
|
'thumbProvider': lambda o: self.get_image_provider(o, 'thumb'),
|
||||||
'title': None,
|
'title': None,
|
||||||
'titleSort': None,
|
'titleSort': None,
|
||||||
'type': None,
|
'type': None,
|
||||||
|
@ -408,7 +408,7 @@ class Export(object):
|
||||||
'art': None,
|
'art': None,
|
||||||
'artBlurHash': None,
|
'artBlurHash': None,
|
||||||
'artFile': lambda o: self.get_image(o, 'art'),
|
'artFile': lambda o: self.get_image(o, 'art'),
|
||||||
'artProvider': lambda o: self.get_image_attr(o, 'art', 'provider'),
|
'artProvider': lambda o: self.get_image_provider(o, 'art'),
|
||||||
'audienceRating': None,
|
'audienceRating': None,
|
||||||
'audienceRatingImage': None,
|
'audienceRatingImage': None,
|
||||||
'audioLanguage': None,
|
'audioLanguage': None,
|
||||||
|
@ -475,7 +475,7 @@ class Export(object):
|
||||||
'thumb': None,
|
'thumb': None,
|
||||||
'thumbBlurHash': None,
|
'thumbBlurHash': None,
|
||||||
'thumbFile': lambda o: self.get_image(o, 'thumb'),
|
'thumbFile': lambda o: self.get_image(o, 'thumb'),
|
||||||
'thumbProvider': lambda o: self.get_image_attr(o, 'thumb', 'provider'),
|
'thumbProvider': lambda o: self.get_image_provider(o, 'thumb'),
|
||||||
'title': None,
|
'title': None,
|
||||||
'titleSort': None,
|
'titleSort': None,
|
||||||
'type': None,
|
'type': None,
|
||||||
|
@ -495,7 +495,7 @@ class Export(object):
|
||||||
'art': None,
|
'art': None,
|
||||||
'artBlurHash': None,
|
'artBlurHash': None,
|
||||||
'artFile': lambda o: self.get_image(o, 'art'),
|
'artFile': lambda o: self.get_image(o, 'art'),
|
||||||
'artProvider': lambda o: self.get_image_attr(o, 'art', 'provider'),
|
'artProvider': lambda o: self.get_image_provider(o, 'art'),
|
||||||
'audioLanguage': None,
|
'audioLanguage': None,
|
||||||
'collections': {
|
'collections': {
|
||||||
'id': None,
|
'id': None,
|
||||||
|
@ -539,7 +539,7 @@ class Export(object):
|
||||||
'thumb': None,
|
'thumb': None,
|
||||||
'thumbBlurHash': None,
|
'thumbBlurHash': None,
|
||||||
'thumbFile': lambda o: self.get_image(o, 'thumb'),
|
'thumbFile': lambda o: self.get_image(o, 'thumb'),
|
||||||
'thumbProvider': lambda o: self.get_image_attr(o, 'thumb', 'provider'),
|
'thumbProvider': lambda o: self.get_image_provider(o, 'thumb'),
|
||||||
'title': None,
|
'title': None,
|
||||||
'titleSort': None,
|
'titleSort': None,
|
||||||
'type': None,
|
'type': None,
|
||||||
|
@ -558,7 +558,7 @@ class Export(object):
|
||||||
'art': None,
|
'art': None,
|
||||||
'artBlurHash': None,
|
'artBlurHash': None,
|
||||||
'artFile': lambda o: self.get_image(o, 'art'),
|
'artFile': lambda o: self.get_image(o, 'art'),
|
||||||
'artProvider': lambda o: self.get_image_attr(o, 'art', 'provider'),
|
'artProvider': lambda o: self.get_image_provider(o, 'art'),
|
||||||
'audienceRating': None,
|
'audienceRating': None,
|
||||||
'audienceRatingImage': None,
|
'audienceRatingImage': None,
|
||||||
'chapters': {
|
'chapters': {
|
||||||
|
@ -799,7 +799,7 @@ class Export(object):
|
||||||
'thumb': None,
|
'thumb': None,
|
||||||
'thumbBlurHash': None,
|
'thumbBlurHash': None,
|
||||||
'thumbFile': lambda o: self.get_image(o, 'thumb'),
|
'thumbFile': lambda o: self.get_image(o, 'thumb'),
|
||||||
'thumbProvider': lambda o: self.get_image_attr(o, 'thumb', 'provider'),
|
'thumbProvider': lambda o: self.get_image_provider(o, 'thumb'),
|
||||||
'title': None,
|
'title': None,
|
||||||
'titleSort': None,
|
'titleSort': None,
|
||||||
'type': None,
|
'type': None,
|
||||||
|
@ -822,7 +822,7 @@ class Export(object):
|
||||||
'art': None,
|
'art': None,
|
||||||
'artBlurHash': None,
|
'artBlurHash': None,
|
||||||
'artFile': lambda o: self.get_image(o, 'art'),
|
'artFile': lambda o: self.get_image(o, 'art'),
|
||||||
'artProvider': lambda o: self.get_image_attr(o, 'art', 'provider'),
|
'artProvider': lambda o: self.get_image_provider(o, 'art'),
|
||||||
'collections': {
|
'collections': {
|
||||||
'id': None,
|
'id': None,
|
||||||
'tag': None
|
'tag': None
|
||||||
|
@ -875,7 +875,7 @@ class Export(object):
|
||||||
'thumb': None,
|
'thumb': None,
|
||||||
'thumbBlurHash': None,
|
'thumbBlurHash': None,
|
||||||
'thumbFile': lambda o: self.get_image(o, 'thumb'),
|
'thumbFile': lambda o: self.get_image(o, 'thumb'),
|
||||||
'thumbProvider': lambda o: self.get_image_attr(o, 'thumb', 'provider'),
|
'thumbProvider': lambda o: self.get_image_provider(o, 'thumb'),
|
||||||
'title': None,
|
'title': None,
|
||||||
'titleSort': None,
|
'titleSort': None,
|
||||||
'type': None,
|
'type': None,
|
||||||
|
@ -892,7 +892,7 @@ class Export(object):
|
||||||
'art': None,
|
'art': None,
|
||||||
'artBlurHash': None,
|
'artBlurHash': None,
|
||||||
'artFile': lambda o: self.get_image(o, 'art'),
|
'artFile': lambda o: self.get_image(o, 'art'),
|
||||||
'artProvider': lambda o: self.get_image_attr(o, 'art', 'provider'),
|
'artProvider': lambda o: self.get_image_provider(o, 'art'),
|
||||||
'collections': {
|
'collections': {
|
||||||
'id': None,
|
'id': None,
|
||||||
'tag': None
|
'tag': None
|
||||||
|
@ -955,7 +955,7 @@ class Export(object):
|
||||||
'thumb': None,
|
'thumb': None,
|
||||||
'thumbBlurHash': None,
|
'thumbBlurHash': None,
|
||||||
'thumbFile': lambda o: self.get_image(o, 'thumb'),
|
'thumbFile': lambda o: self.get_image(o, 'thumb'),
|
||||||
'thumbProvider': lambda o: self.get_image_attr(o, 'thumb', 'provider'),
|
'thumbProvider': lambda o: self.get_image_provider(o, 'thumb'),
|
||||||
'title': None,
|
'title': None,
|
||||||
'titleSort': None,
|
'titleSort': None,
|
||||||
'type': None,
|
'type': None,
|
||||||
|
@ -1235,7 +1235,7 @@ class Export(object):
|
||||||
'art': None,
|
'art': None,
|
||||||
'artBlurHash': None,
|
'artBlurHash': None,
|
||||||
'artFile': lambda o: self.get_image(o, 'art'),
|
'artFile': lambda o: self.get_image(o, 'art'),
|
||||||
'artProvider': lambda o: self.get_image_attr(o, 'art', 'provider'),
|
'artProvider': lambda o: self.get_image_provider(o, 'art'),
|
||||||
'childCount': None,
|
'childCount': None,
|
||||||
'collectionFilterBasedOnUser': None,
|
'collectionFilterBasedOnUser': None,
|
||||||
'collectionMode': None,
|
'collectionMode': None,
|
||||||
|
@ -1266,7 +1266,7 @@ class Export(object):
|
||||||
'thumb': None,
|
'thumb': None,
|
||||||
'thumbBlurHash': None,
|
'thumbBlurHash': None,
|
||||||
'thumbFile': lambda o: self.get_image(o, 'thumb'),
|
'thumbFile': lambda o: self.get_image(o, 'thumb'),
|
||||||
'thumbProvider': lambda o: self.get_image_attr(o, 'thumb', 'provider'),
|
'thumbProvider': lambda o: self.get_image_provider(o, 'poster'),
|
||||||
'title': None,
|
'title': None,
|
||||||
'titleSort': None,
|
'titleSort': None,
|
||||||
'type': None,
|
'type': None,
|
||||||
|
@ -2263,15 +2263,18 @@ class Export(object):
|
||||||
item._posters = item.posters()
|
item._posters = item.posters()
|
||||||
return getattr(item, '_posters', [])
|
return getattr(item, '_posters', [])
|
||||||
|
|
||||||
|
def _get_selected_image(self, item, image):
|
||||||
|
images = self._get_cached_images(item, image)
|
||||||
|
return next((im for im in images if im.selected), None)
|
||||||
|
|
||||||
def get_image(self, item, image):
|
def get_image(self, item, image):
|
||||||
media_type = item.type
|
media_type = item.type
|
||||||
rating_key = item.ratingKey
|
rating_key = item.ratingKey
|
||||||
|
|
||||||
export_image = True
|
export_image = True
|
||||||
if self.thumb_level == 1 or self.art_level == 1:
|
if self.thumb_level == 1 or self.art_level == 1:
|
||||||
images = self._get_cached_images(item, image)
|
selected = self._get_selected_image(item, image)
|
||||||
export_image = any(im.selected and im.ratingKey.startswith('upload://')
|
export_image = selected and selected.ratingKey.startswith('upload://')
|
||||||
for im in images)
|
|
||||||
elif self.thumb_level == 2 or self.art_level == 2:
|
elif self.thumb_level == 2 or self.art_level == 2:
|
||||||
export_image = any(field.locked and field.name == image
|
export_image = any(field.locked and field.name == image
|
||||||
for field in item.fields)
|
for field in item.fields)
|
||||||
|
@ -2317,11 +2320,10 @@ class Export(object):
|
||||||
|
|
||||||
return os.path.join(os.path.basename(dirpath), filename)
|
return os.path.join(os.path.basename(dirpath), filename)
|
||||||
|
|
||||||
def get_image_attr(self, item, image, attr):
|
def get_image_provider(self, item, image):
|
||||||
images = self._get_cached_images(item, image)
|
selected = self._get_selected_image(item, image)
|
||||||
selected = next((im for im in images if im.selected), None)
|
|
||||||
if selected:
|
if selected:
|
||||||
return getattr(selected, attr)
|
return 'upload' if selected.ratingKey.startswith('upload://') else selected.provider
|
||||||
|
|
||||||
|
|
||||||
class ExportObject(Export):
|
class ExportObject(Export):
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue