Add rating_key to all uses of pms_image_proxy

This commit is contained in:
JonnyWong16 2020-02-17 10:51:18 -08:00
parent 5c207aeee6
commit 8f19cdccfd
18 changed files with 102 additions and 90 deletions

View file

@ -1251,9 +1251,12 @@ def get_img_info(img=None, rating_key=None, title='', width=1000, height=1500,
else:
img = '/library/metadata/{}/thumb'.format(rating_key)
img_split = img.split('/')
img = '/'.join(img_split[:5])
rating_key = rating_key or img_split[3]
if img.startswith('/library/metadata'):
img_split = img.split('/')
img = '/'.join(img_split[:5])
img_rating_key = img_split[3]
if rating_key != img_rating_key:
rating_key = img_rating_key
service = helpers.get_img_service()
@ -1352,9 +1355,12 @@ def set_hash_image_info(img=None, rating_key=None, width=750, height=1000,
else:
img = '/library/metadata/{}/thumb'.format(rating_key)
img_split = img.split('/')
img = '/'.join(img_split[:5])
rating_key = rating_key or img_split[3]
if img.startswith('/library/metadata'):
img_split = img.split('/')
img = '/'.join(img_split[:5])
img_rating_key = img_split[3]
if rating_key != img_rating_key:
rating_key = img_rating_key
img_string = '{}.{}.{}.{}.{}.{}.{}.{}'.format(
plexpy.CONFIG.PMS_UUID, img, rating_key, width, height, opacity, background, blur, fallback)

View file

@ -4062,12 +4062,12 @@ class WebInterface(object):
else:
img = '/library/metadata/{}/thumb'.format(rating_key)
web_img = img.startswith('http')
if not web_img:
if img.startswith('/library/metadata'):
img_split = img.split('/')
img = '/'.join(img_split[:5])
rating_key = rating_key or img_split[3]
img_rating_key = img_split[3]
if rating_key != img_rating_key:
rating_key = img_rating_key
img_hash = notification_handler.set_hash_image_info(
img=img, rating_key=rating_key, width=width, height=height,