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

[59] fix reapply overlays

Browse Source
pull/1309/head
meisnate12 2 years ago
parent 1766bf86e9
commit 9283cbd313
6 changed files with 23 additions and 21 deletions
Show Stats Download Patch File Download Diff File

2
VERSION
Unescape View File

@ -1 +1 @@
1.18.3-develop58 1.18.3-develop59

8
modules/library.py
Unescape View File

@ -167,12 +167,10 @@ class Library(ABC):
if self.config.Cache: if self.config.Cache:
_, image_compare, _ = self.config.Cache.query_image_map(item.ratingKey, self.image_table_name) _, image_compare, _ = self.config.Cache.query_image_map(item.ratingKey, self.image_table_name)
if not image_compare or str(poster.compare) != str(image_compare): if not image_compare or str(poster.compare) != str(image_compare):
if hasattr(item, "labels"): if overlay:
test = [la.tag for la in self.item_labels(item)] self.reload(item, force=True)
if overlay and "Overlay" in test: if overlay and "Overlay" in [la.tag for la in self.item_labels(item)]:
item.removeLabel("Overlay") item.removeLabel("Overlay")
if isinstance(item._edits, dict):
item.saveEdits()
self._upload_image(item, poster) self._upload_image(item, poster)
poster_uploaded = True poster_uploaded = True
logger.info(f"Detail: {poster.attribute} updated {poster.message}") logger.info(f"Detail: {poster.attribute} updated {poster.message}")

8
modules/meta.py
Unescape View File

@ -1210,7 +1210,7 @@ class MetadataFile(DataFile):
nonlocal updated nonlocal updated
if updated: if updated:
try: try:
current_item.saveEdits() #current_item.saveEdits()
logger.info(f"{description} Details Update Successful") logger.info(f"{description} Details Update Successful")
except BadRequest: except BadRequest:
logger.error(f"{description} Details Update Failed") logger.error(f"{description} Details Update Failed")
@ -1256,7 +1256,7 @@ class MetadataFile(DataFile):
summary = tmdb_item.overview summary = tmdb_item.overview
genres = tmdb_item.genres genres = tmdb_item.genres
item.batchEdits() #item.batchEdits()
if title: if title:
add_edit("title", item, meta, methods, value=title) add_edit("title", item, meta, methods, value=title)
add_edit("sort_title", item, meta, methods, key="titleSort") add_edit("sort_title", item, meta, methods, key="titleSort")
@ -1279,7 +1279,7 @@ class MetadataFile(DataFile):
if self.library.type in util.advance_tags_to_edit: if self.library.type in util.advance_tags_to_edit:
advance_edits = {} advance_edits = {}
prefs = [p.id for p in item.preferences()] prefs = None
for advance_edit in util.advance_tags_to_edit[self.library.type]: for advance_edit in util.advance_tags_to_edit[self.library.type]:
if advance_edit in methods: if advance_edit in methods:
if advance_edit in ["metadata_language", "use_original_title"] and self.library.agent not in plex.new_plex_agents: if advance_edit in ["metadata_language", "use_original_title"] and self.library.agent not in plex.new_plex_agents:
@ -1287,6 +1287,8 @@ class MetadataFile(DataFile):
elif meta[methods[advance_edit]]: elif meta[methods[advance_edit]]:
ad_key, options = plex.item_advance_keys[f"item_{advance_edit}"] ad_key, options = plex.item_advance_keys[f"item_{advance_edit}"]
method_data = str(meta[methods[advance_edit]]).lower() method_data = str(meta[methods[advance_edit]]).lower()
if prefs is None:
prefs = [p.id for p in item.preferences()]
if method_data not in options: if method_data not in options:
logger.error(f"Metadata Error: {meta[methods[advance_edit]]} {advance_edit} attribute invalid") logger.error(f"Metadata Error: {meta[methods[advance_edit]]} {advance_edit} attribute invalid")
elif ad_key in prefs and getattr(item, ad_key) != options[method_data]: elif ad_key in prefs and getattr(item, ad_key) != options[method_data]:

2
modules/overlays.py
Unescape View File

@ -79,7 +79,7 @@ class Overlays:
poster = None poster = None
if self.config.Cache: if self.config.Cache:
image, image_compare, overlay_compare = self.config.Cache.query_image_map(item.ratingKey, f"{self.library.image_table_name}_overlays") image, image_compare, overlay_compare = self.config.Cache.query_image_map(item.ratingKey, f"{self.library.image_table_name}_overlays")
self.library.reload(item) self.library.reload(item, force=True)
overlay_compare = [] if overlay_compare is None else util.get_list(overlay_compare, split="|") overlay_compare = [] if overlay_compare is None else util.get_list(overlay_compare, split="|")
has_overlay = any([item_tag.tag.lower() == "overlay" for item_tag in self.library.item_labels(item)]) has_overlay = any([item_tag.tag.lower() == "overlay" for item_tag in self.library.item_labels(item)])

2
modules/plex.py
Unescape View File

@ -611,7 +611,7 @@ class Plex(Library):
return self.config.TMDb.get_episode(tmdb_id, item.seasonNumber, item.episodeNumber).still_url return self.config.TMDb.get_episode(tmdb_id, item.seasonNumber, item.episodeNumber).still_url
def item_posters(self, item, providers=None): def item_posters(self, item, providers=None):
if not providers: if providers is None:
providers = ["plex", "tmdb"] providers = ["plex", "tmdb"]
image_url = None image_url = None
for provider in providers: for provider in providers:

22
modules/trakt.py
Unescape View File

@ -254,7 +254,7 @@ class Trakt:
except Failed: except Failed:
raise Failed(f"Trakt Error: List {data} not found") raise Failed(f"Trakt Error: List {data} not found")
def _parse(self, items, typeless=False, item_type=None, trakt_ids=False): def _parse(self, items, typeless=False, item_type=None, trakt_ids=False, ignore_other=False):
ids = [] ids = []
for item in items: for item in items:
if typeless: if typeless:
@ -268,6 +268,8 @@ class Trakt:
current_type = item["type"] current_type = item["type"]
else: else:
continue continue
if current_type in ["person", "list"] and ignore_other:
continue
id_type, id_display = id_types[current_type] id_type, id_display = id_types[current_type]
if id_type in data["ids"] and data["ids"][id_type]: if id_type in data["ids"] and data["ids"][id_type]:
final_id = data["ids"][id_type] final_id = data["ids"][id_type]
@ -373,7 +375,7 @@ class Trakt:
def build_user_url(self, user, name): def build_user_url(self, user, name):
return f"{base_url.replace('api.', '')}/users/{user}/lists/{name}" return f"{base_url.replace('api.', '')}/users/{user}/lists/{name}"
def _list(self, data, urlparse=True, trakt_ids=False, fail=True): def _list(self, data, urlparse=True, trakt_ids=False, fail=True, ignore_other=False):
try: try:
url = requests.utils.urlparse(data).path if urlparse else f"/users/me/lists/{data}" url = requests.utils.urlparse(data).path if urlparse else f"/users/me/lists/{data}"
items = self._request(f"{url}/items") items = self._request(f"{url}/items")
@ -384,9 +386,9 @@ class Trakt:
raise Failed(f"Trakt Error: List {data} is empty") raise Failed(f"Trakt Error: List {data} is empty")
else: else:
return [] return []
return self._parse(items, trakt_ids=trakt_ids) return self._parse(items, trakt_ids=trakt_ids, ignore_other=ignore_other)
def _userlist(self, list_type, user, is_movie, sort_by=None): def _userlist(self, list_type, user, is_movie, sort_by=None, ignore_other=False):
try: try:
url_end = "movies" if is_movie else "shows" url_end = "movies" if is_movie else "shows"
if sort_by: if sort_by:
@ -396,7 +398,7 @@ class Trakt:
raise Failed(f"Trakt Error: User {user} not found") raise Failed(f"Trakt Error: User {user} not found")
if len(items) == 0: if len(items) == 0:
raise Failed(f"Trakt Error: {user}'s {list_type.capitalize()} is empty") raise Failed(f"Trakt Error: {user}'s {list_type.capitalize()} is empty")
return self._parse(items, item_type="movie" if is_movie else "show") return self._parse(items, item_type="movie" if is_movie else "show", ignore_other=ignore_other)
def _recommendations(self, limit, is_movie): def _recommendations(self, limit, is_movie):
media_type = "Movie" if is_movie else "Show" media_type = "Movie" if is_movie else "Show"
@ -408,10 +410,10 @@ class Trakt:
raise Failed(f"Trakt Error: no {media_type} Recommendations were found") raise Failed(f"Trakt Error: no {media_type} Recommendations were found")
return self._parse(items, typeless=True, item_type="movie" if is_movie else "show") return self._parse(items, typeless=True, item_type="movie" if is_movie else "show")
def _charts(self, chart_type, is_movie, params, time_period=None): def _charts(self, chart_type, is_movie, params, time_period=None, ignore_other=False):
chart_url = f"{chart_type}/{time_period}" if time_period else chart_type chart_url = f"{chart_type}/{time_period}" if time_period else chart_type
items = self._request(f"/{'movies' if is_movie else 'shows'}/{chart_url}", params=params) items = self._request(f"/{'movies' if is_movie else 'shows'}/{chart_url}", params=params)
return self._parse(items, typeless=chart_type == "popular", item_type="movie" if is_movie else "show") return self._parse(items, typeless=chart_type == "popular", item_type="movie" if is_movie else "show", ignore_other=ignore_other)
def get_people(self, data): def get_people(self, data):
return {str(i[0][0]): i[0][1] for i in self._list(data) if i[1] == "tmdb_person"} return {str(i[0][0]): i[0][1] for i in self._list(data) if i[1] == "tmdb_person"}
@ -491,7 +493,7 @@ class Trakt:
media_type = "Movie" if is_movie else "Show" media_type = "Movie" if is_movie else "Show"
if method == "trakt_list": if method == "trakt_list":
logger.info(f"Processing {pretty}: {data}") logger.info(f"Processing {pretty}: {data}")
return self._list(data) return self._list(data, ignore_other=True)
elif method == "trakt_recommendations": elif method == "trakt_recommendations":
logger.info(f"Processing {pretty}: {data} {media_type}{'' if data == 1 else 's'}") logger.info(f"Processing {pretty}: {data} {media_type}{'' if data == 1 else 's'}")
return self._recommendations(data, is_movie) return self._recommendations(data, is_movie)
@ -504,10 +506,10 @@ class Trakt:
logger.info(f"{attr:>22}: {','.join(data[attr]) if isinstance(data[attr], list) else data[attr]}") logger.info(f"{attr:>22}: {','.join(data[attr]) if isinstance(data[attr], list) else data[attr]}")
values = [status_translation[v] for v in data[attr]] if attr == "status" else data[attr] values = [status_translation[v] for v in data[attr]] if attr == "status" else data[attr]
params[attr] = ",".join(values) if isinstance(values, list) else values params[attr] = ",".join(values) if isinstance(values, list) else values
return self._charts(data["chart"], is_movie, params, time_period=data["time_period"]) return self._charts(data["chart"], is_movie, params, time_period=data["time_period"], ignore_other=True)
elif method == "trakt_userlist": elif method == "trakt_userlist":
logger.info(f"Processing {pretty} {media_type}s from {data['user']}'s {data['userlist'].capitalize()}") logger.info(f"Processing {pretty} {media_type}s from {data['user']}'s {data['userlist'].capitalize()}")
return self._userlist(data["userlist"], data["user"], is_movie, sort_by=data["sort_by"]) return self._userlist(data["userlist"], data["user"], is_movie, sort_by=data["sort_by"], ignore_other=True)
elif method == "trakt_boxoffice": elif method == "trakt_boxoffice":
logger.info(f"Processing {pretty}: {data} {media_type}{'' if data == 1 else 's'}") logger.info(f"Processing {pretty}: {data} {media_type}{'' if data == 1 else 's'}")
return self._charts("boxoffice", is_movie, {"limit": data}) return self._charts("boxoffice", is_movie, {"limit": data})

Write Preview
Loading…
Cancel
Save