Plex
/
Plex-Meta-Manager
mirror of https://github.com/meisnate12/Plex-Meta-Manager.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

[106] update images remaining open

Browse Source
pull/1329/head
meisnate12 2 years ago
parent 368221176b
commit ae266cc11d
4 changed files with 152 additions and 151 deletions
Show Stats Download Patch File Download Diff File

2
VERSION
Unescape View File

@ -1 +1 @@
1.18.3-develop105 1.18.3-develop106

6
modules/config.py
Unescape View File

@ -774,9 +774,9 @@ class ConfigFile:
else: else:
logger.error("Config Error: operations must be a dictionary") logger.error("Config Error: operations must be a dictionary")
def error_check(attr, service): def error_check(err_attr, service):
logger.error(f"Config Error: Operation {attr} cannot be {params[attr]} without a successful {service} Connection") logger.error(f"Config Error: Operation {err_attr} cannot be {params[err_attr]} without a successful {service} Connection")
params[attr] = None params[err_attr] = None
for mass_key in operations.meta_operations: for mass_key in operations.meta_operations:
if params[mass_key] == "omdb" and self.OMDb is None: if params[mass_key] == "omdb" and self.OMDb is None:

290
modules/overlays.py
Unescape View File

@ -189,159 +189,158 @@ class Overlays:
elif self.library.reapply_overlays or changed_image or overlay_change: elif self.library.reapply_overlays or changed_image or overlay_change:
try: try:
canvas_width, canvas_height = overlay.get_canvas_size(item) canvas_width, canvas_height = overlay.get_canvas_size(item)
with Image.open(poster.location if poster else has_original) as new_poster:
new_poster = Image.open(poster.location if poster else has_original) exif_tags = new_poster.getexif()
exif_tags = new_poster.getexif() exif_tags[0x04bc] = "overlay"
exif_tags[0x04bc] = "overlay" new_poster = new_poster.convert("RGB").resize((canvas_width, canvas_height), Image.LANCZOS)
new_poster = new_poster.convert("RGB").resize((canvas_width, canvas_height), Image.LANCZOS)
if blur_num > 0:
if blur_num > 0: new_poster = new_poster.filter(ImageFilter.GaussianBlur(blur_num))
new_poster = new_poster.filter(ImageFilter.GaussianBlur(blur_num))
def get_text(text_overlay):
def get_text(text_overlay): full_text = text_overlay.name[5:-1]
full_text = text_overlay.name[5:-1] for format_var in overlay.vars_by_type[text_overlay.level]:
for format_var in overlay.vars_by_type[text_overlay.level]: if f"<<{format_var}" in full_text and format_var == "originally_available[":
if f"<<{format_var}" in full_text and format_var == "originally_available[": mod = re.search("<<originally_available\\[(.+)]>>", full_text).group(1)
mod = re.search("<<originally_available\\[(.+)]>>", full_text).group(1) format_var = "originally_available"
format_var = "originally_available" elif f"<<{format_var}>>" in full_text and format_var.endswith(tuple(m for m in overlay.double_mods)):
elif f"<<{format_var}>>" in full_text and format_var.endswith(tuple(m for m in overlay.double_mods)): mod = format_var[-2:]
mod = format_var[-2:] format_var = format_var[:-2]
format_var = format_var[:-2] elif f"<<{format_var}>>" in full_text and format_var.endswith(tuple(m for m in overlay.single_mods)):
elif f"<<{format_var}>>" in full_text and format_var.endswith(tuple(m for m in overlay.single_mods)): mod = format_var[-1]
mod = format_var[-1] format_var = format_var[:-1]
format_var = format_var[:-1] elif f"<<{format_var}>>" in full_text:
elif f"<<{format_var}>>" in full_text: mod = ""
mod = ""
else:
continue
if format_var == "show_title":
actual_attr = "parentTitle" if text_overlay.level == "season" else "grandparentTitle"
elif format_var in plex.attribute_translation:
actual_attr = plex.attribute_translation[format_var]
else:
actual_attr = format_var
if format_var == "bitrate":
actual_value = None
for media in item.media:
current = int(media.bitrate)
if actual_value is None:
actual_value = current
if mod == "":
break
elif mod == "H" and current > actual_value:
actual_value = current
elif mod == "L" and current < actual_value:
actual_value = current
else:
if not hasattr(item, actual_attr) or getattr(item, actual_attr) is None:
raise Failed(f"Overlay Warning: No {full_text} found")
actual_value = getattr(item, actual_attr)
if format_var == "versions":
actual_value = len(actual_value)
if self.config.Cache:
cache_store = actual_value.strftime("%Y-%m-%d") if format_var in overlay.date_vars else actual_value
self.config.Cache.update_overlay_special_text(item.ratingKey, format_var, cache_store)
sub_value = None
if format_var == "originally_available":
if mod:
sub_value = "<<originally_available\\[(.+)]>>"
final_value = actual_value.strftime(mod)
else:
final_value = actual_value.strftime("%Y-%m-%d")
elif format_var == "runtime":
if mod == "H":
final_value = int((actual_value / 60000) // 60)
elif mod == "M":
final_value = int((actual_value / 60000) % 60)
else: else:
final_value = int(actual_value / 60000)
elif mod == "%":
final_value = int(actual_value * 10)
elif mod == "#":
final_value = str(actual_value)[:-2] if str(actual_value).endswith(".0") else actual_value
elif mod == "W":
final_value = num2words(int(actual_value))
elif mod == "0":
final_value = f"{int(actual_value):02}"
elif mod == "00":
final_value = f"{int(actual_value):03}"
elif mod == "/":
final_value = f"{float(actual_value) / 2:.1f}"
elif mod == "U":
final_value = str(actual_value).upper()
elif mod == "L":
final_value = str(actual_value).lower()
elif mod == "P":
final_value = str(actual_value).title()
else:
final_value = actual_value
if sub_value:
full_text = re.sub(sub_value, str(final_value), full_text)
else:
full_text = full_text.replace(f"<<{format_var}{mod}>>", str(final_value))
return str(full_text)
for over_name in applied_names:
current_overlay = properties[over_name]
if current_overlay.name.startswith("text"):
if "<<" in current_overlay.name:
image_box = current_overlay.image.size if current_overlay.image else None
try:
overlay_image, addon_box = current_overlay.get_backdrop((canvas_width, canvas_height), box=image_box, text=get_text(current_overlay))
except Failed as e:
logger.warning(e)
continue continue
new_poster.paste(overlay_image, (0, 0), overlay_image) if format_var == "show_title":
else: actual_attr = "parentTitle" if text_overlay.level == "season" else "grandparentTitle"
overlay_image, addon_box = current_overlay.get_canvas(item) elif format_var in plex.attribute_translation:
new_poster.paste(overlay_image, (0, 0), overlay_image) actual_attr = plex.attribute_translation[format_var]
if current_overlay.image: else:
new_poster.paste(current_overlay.image, addon_box, current_overlay.image) actual_attr = format_var
elif current_overlay.name == "backdrop": if format_var == "bitrate":
overlay_image, _ = current_overlay.get_canvas(item) actual_value = None
new_poster.paste(overlay_image, (0, 0), overlay_image) for media in item.media:
else: current = int(media.bitrate)
if current_overlay.has_coordinates(): if actual_value is None:
overlay_image, overlay_box = current_overlay.get_canvas(item) actual_value = current
if current_overlay.portrait is not None: if mod == "":
new_poster.paste(overlay_image, (0, 0), overlay_image) break
new_poster.paste(current_overlay.image, overlay_box, current_overlay.image) elif mod == "H" and current > actual_value:
else: actual_value = current
new_poster = new_poster.resize(current_overlay.image.size, Image.LANCZOS) elif mod == "L" and current < actual_value:
new_poster.paste(current_overlay.image, (0, 0), current_overlay.image) actual_value = current
new_poster = new_poster.resize((canvas_width, canvas_height), Image.LANCZOS) else:
if not hasattr(item, actual_attr) or getattr(item, actual_attr) is None:
for queue, weights in queue_overlays.items(): raise Failed(f"Overlay Warning: No {full_text} found")
cords = self.library.queues[queue] actual_value = getattr(item, actual_attr)
sorted_weights = sorted(weights.items(), reverse=True) if format_var == "versions":
for o, cord in enumerate(cords): actual_value = len(actual_value)
if len(sorted_weights) <= o: if self.config.Cache:
break cache_store = actual_value.strftime("%Y-%m-%d") if format_var in overlay.date_vars else actual_value
over_name = sorted_weights[o][1] self.config.Cache.update_overlay_special_text(item.ratingKey, format_var, cache_store)
sub_value = None
if format_var == "originally_available":
if mod:
sub_value = "<<originally_available\\[(.+)]>>"
final_value = actual_value.strftime(mod)
else:
final_value = actual_value.strftime("%Y-%m-%d")
elif format_var == "runtime":
if mod == "H":
final_value = int((actual_value / 60000) // 60)
elif mod == "M":
final_value = int((actual_value / 60000) % 60)
else:
final_value = int(actual_value / 60000)
elif mod == "%":
final_value = int(actual_value * 10)
elif mod == "#":
final_value = str(actual_value)[:-2] if str(actual_value).endswith(".0") else actual_value
elif mod == "W":
final_value = num2words(int(actual_value))
elif mod == "0":
final_value = f"{int(actual_value):02}"
elif mod == "00":
final_value = f"{int(actual_value):03}"
elif mod == "/":
final_value = f"{float(actual_value) / 2:.1f}"
elif mod == "U":
final_value = str(actual_value).upper()
elif mod == "L":
final_value = str(actual_value).lower()
elif mod == "P":
final_value = str(actual_value).title()
else:
final_value = actual_value
if sub_value:
full_text = re.sub(sub_value, str(final_value), full_text)
else:
full_text = full_text.replace(f"<<{format_var}{mod}>>", str(final_value))
return str(full_text)
for over_name in applied_names:
current_overlay = properties[over_name] current_overlay = properties[over_name]
if current_overlay.name.startswith("text"): if current_overlay.name.startswith("text"):
image_box = current_overlay.image.size if current_overlay.image else None if "<<" in current_overlay.name:
try: image_box = current_overlay.image.size if current_overlay.image else None
overlay_image, addon_box = current_overlay.get_backdrop((canvas_width, canvas_height), box=image_box, text=get_text(current_overlay), new_cords=cord) try:
except Failed as e: overlay_image, addon_box = current_overlay.get_backdrop((canvas_width, canvas_height), box=image_box, text=get_text(current_overlay))
logger.warning(e) except Failed as e:
continue logger.warning(e)
new_poster.paste(overlay_image, (0, 0), overlay_image) continue
new_poster.paste(overlay_image, (0, 0), overlay_image)
else:
overlay_image, addon_box = current_overlay.get_canvas(item)
new_poster.paste(overlay_image, (0, 0), overlay_image)
if current_overlay.image: if current_overlay.image:
new_poster.paste(current_overlay.image, addon_box, current_overlay.image) new_poster.paste(current_overlay.image, addon_box, current_overlay.image)
elif current_overlay.name == "backdrop":
overlay_image, _ = current_overlay.get_canvas(item)
new_poster.paste(overlay_image, (0, 0), overlay_image)
else: else:
if current_overlay.has_back: if current_overlay.has_coordinates():
overlay_image, overlay_box = current_overlay.get_backdrop((canvas_width, canvas_height), box=current_overlay.image.size, new_cords=cord) overlay_image, overlay_box = current_overlay.get_canvas(item)
if current_overlay.portrait is not None:
new_poster.paste(overlay_image, (0, 0), overlay_image)
new_poster.paste(current_overlay.image, overlay_box, current_overlay.image)
else:
new_poster = new_poster.resize(current_overlay.image.size, Image.LANCZOS)
new_poster.paste(current_overlay.image, (0, 0), current_overlay.image)
new_poster = new_poster.resize((canvas_width, canvas_height), Image.LANCZOS)
for queue, weights in queue_overlays.items():
cords = self.library.queues[queue]
sorted_weights = sorted(weights.items(), reverse=True)
for o, cord in enumerate(cords):
if len(sorted_weights) <= o:
break
over_name = sorted_weights[o][1]
current_overlay = properties[over_name]
if current_overlay.name.startswith("text"):
image_box = current_overlay.image.size if current_overlay.image else None
try:
overlay_image, addon_box = current_overlay.get_backdrop((canvas_width, canvas_height), box=image_box, text=get_text(current_overlay), new_cords=cord)
except Failed as e:
logger.warning(e)
continue
new_poster.paste(overlay_image, (0, 0), overlay_image) new_poster.paste(overlay_image, (0, 0), overlay_image)
if current_overlay.image:
new_poster.paste(current_overlay.image, addon_box, current_overlay.image)
else: else:
overlay_box = current_overlay.get_coordinates((canvas_width, canvas_height), box=current_overlay.image.size, new_cords=cord) if current_overlay.has_back:
new_poster.paste(current_overlay.image, overlay_box, current_overlay.image) overlay_image, overlay_box = current_overlay.get_backdrop((canvas_width, canvas_height), box=current_overlay.image.size, new_cords=cord)
temp = os.path.join(self.library.overlay_folder, "temp.jpg") new_poster.paste(overlay_image, (0, 0), overlay_image)
new_poster.save(temp, exif=exif_tags) else:
self.library.upload_poster(item, temp) overlay_box = current_overlay.get_coordinates((canvas_width, canvas_height), box=current_overlay.image.size, new_cords=cord)
self.library.edit_tags("label", item, add_tags=["Overlay"], do_print=False) new_poster.paste(current_overlay.image, overlay_box, current_overlay.image)
poster_compare = poster.compare if poster else item.thumb temp = os.path.join(self.library.overlay_folder, "temp.jpg")
logger.info(f"{item_title[:60]:<60} | Overlays Applied: {', '.join(over_names)}") new_poster.save(temp, exif=exif_tags)
self.library.upload_poster(item, temp)
self.library.edit_tags("label", item, add_tags=["Overlay"], do_print=False)
poster_compare = poster.compare if poster else item.thumb
logger.info(f"{item_title[:60]:<60} | Overlays Applied: {', '.join(over_names)}")
except (OSError, BadRequest, SyntaxError) as e: except (OSError, BadRequest, SyntaxError) as e:
logger.stacktrace() logger.stacktrace()
raise Failed(f"{item_title[:60]:<60} | Overlay Error: {e}") raise Failed(f"{item_title[:60]:<60} | Overlay Error: {e}")
@ -359,6 +358,9 @@ class Overlays:
logger.error("") logger.error("")
logger.error(f"Overlays Attempted on {item_title}: {', '.join(over_names)}") logger.error(f"Overlays Attempted on {item_title}: {', '.join(over_names)}")
logger.exorcise() logger.exorcise()
for _, over in properties.items():
if over.image:
over.image.close()
overlay_run_time = str(datetime.now() - overlay_start).split('.')[0] overlay_run_time = str(datetime.now() - overlay_start).split('.')[0]
logger.info("") logger.info("")
logger.separator(f"Finished {self.library.name} Library Overlays\nOverlays Run Time: {overlay_run_time}") logger.separator(f"Finished {self.library.name} Library Overlays\nOverlays Run Time: {overlay_run_time}")

5
modules/plex.py
Unescape View File

@ -1367,9 +1367,8 @@ class Plex(Library):
for file in util.glob_filter(os.path.join(item_asset_directory, "*.*")): for file in util.glob_filter(os.path.join(item_asset_directory, "*.*")):
if file.lower().endswith((".png", ".jpg", ".jpeg", "webp")) and not re.match(r"s\d+e\d+|season\d+", file.lower()): if file.lower().endswith((".png", ".jpg", ".jpeg", "webp")) and not re.match(r"s\d+e\d+|season\d+", file.lower()):
try: try:
image = Image.open(file) with Image.open(file) as image:
_w, _h = image.size _w, _h = image.size
image.close()
if not poster and _h >= _w: if not poster and _h >= _w:
new_path = os.path.join(os.path.dirname(file), f"poster{os.path.splitext(file)[1].lower()}") new_path = os.path.join(os.path.dirname(file), f"poster{os.path.splitext(file)[1].lower()}")
os.rename(file, new_path) os.rename(file, new_path)

Write Preview
Loading…
Cancel
Save