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

[40] fix overlay caching

Browse Source
pull/858/head
meisnate12 3 years ago
parent 34f2415477
commit f053b7d326
6 changed files with 41 additions and 35 deletions
Show Stats Download Patch File Download Diff File

2
VERSION
Unescape View File

@ -1 +1 @@
1.16.5-develop39 1.16.5-develop40

2
docs/config/paths.md
Unescape View File

@ -110,7 +110,7 @@ In this example, multiple overlay file path types are defined for the `"TV Shows
```yaml ```yaml
libraries: libraries:
TV Shows: TV Shows:
overlay_apth: overlay_path:
- file: config/overlays.yml - file: config/overlays.yml
- folder: config/overlay configs/ - folder: config/overlay configs/
- git: PMM/overlays/imdb - git: PMM/overlays/imdb

8
docs/metadata/details/schedule.md
Unescape View File

@ -23,14 +23,18 @@ libraries:
Movies: Movies:
metadata_path: metadata_path:
- file: config/Movies.yml - file: config/Movies.yml
schedule: weekly(friday) schedule: weekly(monday)
- git: meisnate12/MovieCharts - git: meisnate12/MovieCharts
schedule: weekly(tuesday)
- git: meisnate12/Studios - git: meisnate12/Studios
schedule: weekly(wednesday)
- git: meisnate12/IMDBGenres - git: meisnate12/IMDBGenres
schedule: weekly(thursday)
- git: meisnate12/People - git: meisnate12/People
schedule: weekly(friday)
overlay_path: overlay_path:
- git: PMM/overlays/imdb - git: PMM/overlays/imdb
schedule: weekly(saturday) schedule: weekly(saturday)
operations: operations:
mass_critic_rating_update: tmdb mass_critic_rating_update: tmdb
playlist_files: playlist_files:

4
modules/library.py
Unescape View File

@ -1,11 +1,9 @@
import os, shutil, time import os
from abc import ABC, abstractmethod from abc import ABC, abstractmethod
from modules import util from modules import util
from modules.meta import MetadataFile, OverlayFile from modules.meta import MetadataFile, OverlayFile
from modules.operations import Operations from modules.operations import Operations
from modules.util import Failed, ImageData from modules.util import Failed, ImageData
from PIL import Image
from plexapi.exceptions import BadRequest
from ruamel import yaml from ruamel import yaml
logger = util.logger logger = util.logger

2
modules/meta.py
Unescape View File

@ -241,7 +241,7 @@ class DataFile:
return new_attributes return new_attributes
def external_templates(self, data): def external_templates(self, data):
if "external_templates" in data and data["external_templates"]: if data and "external_templates" in data and data["external_templates"]:
files = util.load_files(data["external_templates"], "external_templates") files = util.load_files(data["external_templates"], "external_templates")
if not files: if not files:
logger.error("Config Error: No Paths Found for external_templates") logger.error("Config Error: No Paths Found for external_templates")

58
modules/overlays.py
Unescape View File

@ -33,8 +33,9 @@ class Overlays:
logger.separator(f"Removing {old_overlay.title}") logger.separator(f"Removing {old_overlay.title}")
logger.info("") logger.info("")
for i, item in enumerate(label_items, 1): for i, item in enumerate(label_items, 1):
logger.ghost(f"Restoring {old_overlay.title}: {i}/{len(label_items)} {item.title}") item_title = self.get_item_sort_title(item, atr="title")
self.remove_overlay(item, old_overlay.title, [ logger.ghost(f"Restoring {old_overlay.title}: {i}/{len(label_items)} {item_title}")
self.remove_overlay(item, item_title, old_overlay.title, [
os.path.join(self.library.overlay_folder, old_overlay.title[:-8], f"{item.ratingKey}.png") os.path.join(self.library.overlay_folder, old_overlay.title[:-8], f"{item.ratingKey}.png")
]) ])
@ -50,8 +51,9 @@ class Overlays:
if remove_overlays: if remove_overlays:
logger.separator(f"Removing Overlays for the {self.library.name} Library") logger.separator(f"Removing Overlays for the {self.library.name} Library")
for i, item in enumerate(remove_overlays, 1): for i, item in enumerate(remove_overlays, 1):
logger.ghost(f"Restoring: {i}/{len(remove_overlays)} {item.title}") item_title = self.get_item_sort_title(item, atr="title")
self.remove_overlay(item, "Overlay", [ logger.ghost(f"Restoring: {i}/{len(remove_overlays)} {item_title}")
self.remove_overlay(item, item_title, "Overlay", [
os.path.join(self.library.overlay_backup, f"{item.ratingKey}.png"), os.path.join(self.library.overlay_backup, f"{item.ratingKey}.png"),
os.path.join(self.library.overlay_backup, f"{item.ratingKey}.jpg") os.path.join(self.library.overlay_backup, f"{item.ratingKey}.jpg")
]) ])
@ -64,18 +66,10 @@ class Overlays:
logger.info("") logger.info("")
logger.separator(f"Applying Overlays for the {self.library.name} Library") logger.separator(f"Applying Overlays for the {self.library.name} Library")
logger.info("") logger.info("")
def get_item_sort_title(item_to_sort): for i, (over_key, (item, over_names)) in enumerate(sorted(key_to_overlays.items(), key=lambda io: self.get_item_sort_title(io[1][0])), 1):
if isinstance(item_to_sort, Album):
return f"{item_to_sort.titleSort} Album {item_to_sort.title}"
elif isinstance(item_to_sort, Season):
return f"{item_to_sort.titleSort} Season {item_to_sort.seasonNumber}"
elif isinstance(item_to_sort, Episode):
return f"{item_to_sort.titleSort} {item_to_sort.seasonEpisode.upper()}"
else:
return item_to_sort.titleSort
for i, (over_key, (item, over_names)) in enumerate(sorted(key_to_overlays.items(), key=lambda io: get_item_sort_title(io[1][0])), 1):
try: try:
logger.ghost(f"Overlaying: {i}/{len(key_to_overlays)} {item.title}") item_title = self.get_item_sort_title(item, atr="title")
logger.ghost(f"Overlaying: {i}/{len(key_to_overlays)} {item_title}")
image_compare = None image_compare = None
overlay_compare = None overlay_compare = None
poster = None poster = None
@ -123,7 +117,7 @@ class Overlays:
changed_image = True changed_image = True
image_response = self.config.get(new_backup) image_response = self.config.get(new_backup)
if image_response.status_code >= 400: if image_response.status_code >= 400:
raise Failed(f"Overlay Error: Poster Download Failed for {item.title}") raise Failed(f"{item_title[:60]:<60} | Overlay Error: Poster Download Failed")
i_ext = "jpg" if image_response.headers["Content-Type"] == "image/jpeg" else "png" i_ext = "jpg" if image_response.headers["Content-Type"] == "image/jpeg" else "png"
backup_image_path = os.path.join(self.library.overlay_backup, f"{item.ratingKey}.{i_ext}") backup_image_path = os.path.join(self.library.overlay_backup, f"{item.ratingKey}.{i_ext}")
with open(backup_image_path, "wb") as handler: with open(backup_image_path, "wb") as handler:
@ -134,7 +128,7 @@ class Overlays:
poster_compare = None poster_compare = None
if poster is None and has_original is None: if poster is None and has_original is None:
logger.error(f"Overlay Error: No poster found for {item.title}") logger.error(f"{item_title[:60]:<60} | Overlay Error: No poster found")
elif changed_image or overlay_change: elif changed_image or overlay_change:
try: try:
new_poster = Image.open(poster.location if poster else has_original).convert("RGBA") new_poster = Image.open(poster.location if poster else has_original).convert("RGBA")
@ -156,20 +150,30 @@ class Overlays:
self.library.edit_tags("label", item, add_tags=["Overlay"], do_print=False) self.library.edit_tags("label", item, add_tags=["Overlay"], do_print=False)
self.library.reload(item, force=True) self.library.reload(item, force=True)
poster_compare = poster.compare if poster else item.thumb poster_compare = poster.compare if poster else item.thumb
logger.info(f"Detail: Overlays: {', '.join(over_names)} applied to {item.title}") logger.info(f"{item_title[:60]:<60} | Overlays Applied: {', '.join(over_names)}")
except (OSError, BadRequest) as e: except (OSError, BadRequest) as e:
logger.stacktrace() logger.stacktrace()
raise Failed(f"Overlay Error: {e}") raise Failed(f"{item_title[:60]:<60} | Overlay Error: {e}")
else: elif self.library.show_asset_not_needed:
logger.error(f"Overlay Update Not Needed for {item.title}") logger.error(f"{item_title[:60]:<60} | Overlay Update Not Needed")
if self.config.Cache and poster_compare: if self.config.Cache and poster_compare:
self.config.Cache.update_image_map(item.ratingKey, self.library.image_table_name, item.thumb, self.config.Cache.update_image_map(item.ratingKey, f"{self.library.image_table_name}_overlays",
poster_compare, overlay=','.join(over_names)) item.thumb, poster_compare, overlay=','.join(over_names))
except Failed as e: except Failed as e:
logger.error(e) logger.error(e)
logger.exorcise() logger.exorcise()
def get_item_sort_title(self, item_to_sort, atr="titleSort"):
if isinstance(item_to_sort, Album):
return f"{getattr(item_to_sort.artist(), atr)} Album {getattr(item_to_sort, atr)}"
elif isinstance(item_to_sort, Season):
return f"{getattr(item_to_sort.show(), atr)} Season {item_to_sort.seasonNumber}"
elif isinstance(item_to_sort, Episode):
return f"{getattr(item_to_sort.show(), atr)} {item_to_sort.seasonEpisode.upper()}"
else:
return getattr(item_to_sort, atr)
def compile_overlays(self): def compile_overlays(self):
key_to_item = {} key_to_item = {}
properties = {} properties = {}
@ -208,11 +212,11 @@ class Overlays:
if builder.added_items: if builder.added_items:
for item in builder.added_items: for item in builder.added_items:
key_to_item[item.ratingKey] = item key_to_item[item.ratingKey] = item
added_titles.append(item.title) added_titles.append(item)
if item.ratingKey not in properties[builder.overlay]["keys"]: if item.ratingKey not in properties[builder.overlay]["keys"]:
properties[builder.overlay]["keys"].append(item.ratingKey) properties[builder.overlay]["keys"].append(item.ratingKey)
if added_titles: if added_titles:
logger.debug(f"{len(added_titles)} Titles Found: {added_titles}") logger.debug(f"{len(added_titles)} Titles Found: {[self.get_item_sort_title(a, atr='title') for a in added_titles]}")
logger.info(f"{len(added_titles) if added_titles else 'No'} Items found for {builder.overlay}") logger.info(f"{len(added_titles) if added_titles else 'No'} Items found for {builder.overlay}")
except Failed as e: except Failed as e:
logger.error(e) logger.error(e)
@ -286,7 +290,7 @@ class Overlays:
items = self.library.search(label=label, libtype=libtype) items = self.library.search(label=label, libtype=libtype)
return items if not ignore else [o for o in items if o.ratingKey not in ignore] return items if not ignore else [o for o in items if o.ratingKey not in ignore]
def remove_overlay(self, item, label, locations): def remove_overlay(self, item, item_title, label, locations):
try: try:
poster, _, _, _ = self.library.find_item_assets(item) poster, _, _, _ = self.library.find_item_assets(item)
except Failed: except Failed:
@ -307,4 +311,4 @@ class Overlays:
if original: if original:
os.remove(original) os.remove(original)
else: else:
logger.error(f"No Poster found to restore for {item.title}") logger.error(f"No Poster found to restore for {item_title}")
Write Preview
Loading…
Cancel
Save