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

#515 Added IMDB Episode support for collections and playlists

Browse Source
pull/528/head
meisnate12 3 years ago
parent b457dc68ee
commit b18aa534c6
4 changed files with 59 additions and 24 deletions
Show Stats Download Patch File Download Diff File

37
modules/builder.py
Unescape View File

@ -102,7 +102,7 @@ sonarr_details = [
parts_collection_valid = [ parts_collection_valid = [
"plex_search", "trakt_list", "trakt_list_details", "collection_mode", "label", "visible_library", "collection_changes_webhooks" "plex_search", "trakt_list", "trakt_list_details", "collection_mode", "label", "visible_library", "collection_changes_webhooks"
"visible_home", "visible_shared", "show_missing", "save_missing", "missing_only_released", "server_preroll", "visible_home", "visible_shared", "show_missing", "save_missing", "missing_only_released", "server_preroll",
"item_lock_background", "item_lock_poster", "item_lock_title", "item_refresh" "item_lock_background", "item_lock_poster", "item_lock_title", "item_refresh", "imdb_list"
] + summary_details + poster_details + background_details + string_details ] + summary_details + poster_details + background_details + string_details
all_filters = [ all_filters = [
"actor", "actor.not", "actor", "actor.not",
@ -137,6 +137,7 @@ all_filters = [
"tmdb_year", "tmdb_year.gt", "tmdb_year.gte", "tmdb_year.lt", "tmdb_year.lte", "tmdb_year.not" "tmdb_year", "tmdb_year.gt", "tmdb_year.gte", "tmdb_year.lt", "tmdb_year.lte", "tmdb_year.not"
] ]
tmdb_filters = ["original_language", "tmdb_vote_count", "tmdb_year", "first_episode_aired", "last_episode_aired"] tmdb_filters = ["original_language", "tmdb_vote_count", "tmdb_year", "first_episode_aired", "last_episode_aired"]
boolean_filters = ["has_collection", "has_overlay"]
movie_only_filters = [ movie_only_filters = [
"audio_language", "audio_language.not", "audio_language", "audio_language.not",
"audio_track_title", "audio_track_title.not", "audio_track_title.is", "audio_track_title.isnot", "audio_track_title.begins", "audio_track_title.ends", "audio_track_title.regex", "audio_track_title", "audio_track_title.not", "audio_track_title.is", "audio_track_title.isnot", "audio_track_title.begins", "audio_track_title.ends", "audio_track_title.regex",
@ -1294,16 +1295,28 @@ class CollectionBuilder:
self.missing_parts.append(f"{show_item.title} Season: {season_num} Missing") self.missing_parts.append(f"{show_item.title} Season: {season_num} Missing")
elif show_id not in self.missing_shows: elif show_id not in self.missing_shows:
self.missing_shows.append(show_id) self.missing_shows.append(show_id)
elif id_type == "tvdb_episode" and self.collection_level == "episode": elif id_type in ["tvdb_episode", "imdb"] and self.collection_level == "episode":
if id_type == "tvdb_episode":
show_id, season_num, episode_num = input_id.split("_") show_id, season_num, episode_num = input_id.split("_")
elif id_type == "imdb" and input_id not in self.ignore_imdb_ids:
try:
_id, tmdb_type = self.config.Convert.imdb_to_tmdb(input_id, fail=True)
if tmdb_type != "episode":
continue
tmdb_id, season_num, episode_num = _id.split("_")
show_id = self.config.Convert.tmdb_to_tvdb(tmdb_id, fail=True)
except Failed as e:
logger.error(e)
continue
else:
continue
show_id = int(show_id) show_id = int(show_id)
if show_id in self.library.show_map: if show_id in self.library.show_map:
show_item = self.library.fetchItem(self.library.show_map[show_id][0]) show_item = self.library.fetchItem(self.library.show_map[show_id][0])
try: try:
items.append(show_item.episode(season=int(season_num), episode=int(episode_num))) items.append(show_item.episode(season=int(season_num), episode=int(episode_num)))
except NotFound: except NotFound:
self.missing_parts.append( self.missing_parts.append(f"{show_item.title} Season: {season_num} Episode: {episode_num} Missing")
f"{show_item.title} Season: {season_num} Episode: {episode_num} Missing")
elif show_id not in self.missing_shows: elif show_id not in self.missing_shows:
self.missing_shows.append(show_id) self.missing_shows.append(show_id)
else: else:
@ -1338,7 +1351,7 @@ class CollectionBuilder:
if tmdb_type == "movie": if tmdb_type == "movie":
if tmdb_id not in self.missing_movies: if tmdb_id not in self.missing_movies:
self.missing_movies.append(tmdb_id) self.missing_movies.append(tmdb_id)
else: elif tmdb_type == "show":
tvdb_id = self.config.Convert.tmdb_to_tvdb(tmdb_id, fail=True) tvdb_id = self.config.Convert.tmdb_to_tvdb(tmdb_id, fail=True)
if tvdb_id not in self.missing_shows: if tvdb_id not in self.missing_shows:
self.missing_shows.append(tvdb_id) self.missing_shows.append(tvdb_id)
@ -1616,7 +1629,7 @@ class CollectionBuilder:
for value in values: for value in values:
final_years.append(self._parse(final, value, datatype="int", minimum=1800, maximum=self.current_year)) final_years.append(self._parse(final, value, datatype="int", minimum=1800, maximum=self.current_year))
return smart_pair(final_years) return smart_pair(final_years)
elif attribute in plex.boolean_attributes + ["has_collection", "has_overlay"]: elif attribute in plex.boolean_attributes + boolean_filters:
return self._parse(attribute, data, datatype="bool") return self._parse(attribute, data, datatype="bool")
else: else:
raise Failed(f"{self.Type} Error: {final} attribute not supported") raise Failed(f"{self.Type} Error: {final} attribute not supported")
@ -1788,15 +1801,15 @@ class CollectionBuilder:
values = [getattr(current, filter_actual)] values = [getattr(current, filter_actual)]
if util.is_string_filter(values, modifier, filter_data): if util.is_string_filter(values, modifier, filter_data):
return False return False
elif filter_attr == "has_collection": elif filter_attr in boolean_filters:
if util.is_boolean_filter(filter_data, len(current.collections) > 0): filter_check = False
return False if filter_attr == "has_collection":
filter_check = len(current.collections) > 0
elif filter_attr == "has_overlay": elif filter_attr == "has_overlay":
has_overlay = False
for label in current.labels: for label in current.labels:
if label.tag.lower().endswith(" overlay"): if label.tag.lower().endswith(" overlay"):
has_overlay = True filter_check = True
if util.is_boolean_filter(filter_data, has_overlay): if util.is_boolean_filter(filter_data, filter_check):
return False return False
elif filter_attr == "history": elif filter_attr == "history":
item_date = current.originallyAvailableAt item_date = current.originallyAvailableAt

5
modules/cache.py
Unescape View File

@ -202,7 +202,10 @@ class Cache:
if row and row[to_id]: if row and row[to_id]:
datetime_object = datetime.strptime(row["expiration_date"], "%Y-%m-%d") datetime_object = datetime.strptime(row["expiration_date"], "%Y-%m-%d")
time_between_insertion = datetime.now() - datetime_object time_between_insertion = datetime.now() - datetime_object
id_to_return = row[to_id] if to_id == "imdb_id" else int(row[to_id]) try:
id_to_return = int(row[to_id])
except ValueError:
id_to_return = row[to_id]
expired = time_between_insertion.days > self.expiration expired = time_between_insertion.days > self.expiration
out_type = row["media_type"] if return_type else None out_type = row["media_type"] if return_type else None
if return_type: if return_type:

3
modules/tmdb.py
Unescape View File

@ -112,6 +112,9 @@ class TMDb:
return int(search["movie_results"][0]["id"]), "movie" return int(search["movie_results"][0]["id"]), "movie"
elif len(search["tv_results"]) > 0: elif len(search["tv_results"]) > 0:
return int(search["tv_results"][0]["id"]), "show" return int(search["tv_results"][0]["id"]), "show"
elif len(search["tv_episode_results"]) > 0:
item = search['tv_episode_results'][0]
return f"{item['show_id']}_{item['season_number']}_{item['episode_number']}", "episode"
else: else:
raise Failed(f"TMDb Error: No TMDb ID found for IMDb ID {imdb_id}") raise Failed(f"TMDb Error: No TMDb ID found for IMDb ID {imdb_id}")

30
plex_meta_manager.py
Unescape View File

@ -462,14 +462,30 @@ def update_libraries(config):
found = True found = True
rating_keys = pl_library.imdb_map[input_id] rating_keys = pl_library.imdb_map[input_id]
break break
if not found and builder.do_missing: if not found:
try: try:
tmdb_id, tmdb_type = config.Convert.imdb_to_tmdb(input_id, fail=True) _id, tmdb_type = config.Convert.imdb_to_tmdb(input_id, fail=True)
if tmdb_type == "movie": if tmdb_type == "episode":
if tmdb_id not in builder.missing_movies: tmdb_id, season_num, episode_num = _id.split("_")
builder.missing_movies.append(tmdb_id) show_id = config.Convert.tmdb_to_tvdb(tmdb_id, fail=True)
else: show_id = int(show_id)
tvdb_id = config.Convert.tmdb_to_tvdb(tmdb_id, fail=True) found = False
for pl_library in pl_libraries:
if show_id in pl_library.show_map:
found = True
show_item = pl_library.fetchItem(pl_library.show_map[show_id][0])
try:
items.append(show_item.episode(season=int(season_num), episode=int(episode_num)))
except NotFound:
builder.missing_parts.append(f"{show_item.title} Season: {season_num} Episode: {episode_num} Missing")
break
if not found and show_id not in builder.missing_shows:
builder.missing_shows.append(show_id)
elif tmdb_type == "movie" and builder.do_missing:
if _id not in builder.missing_movies:
builder.missing_movies.append(_id)
elif tmdb_type == "show" and builder.do_missing:
tvdb_id = config.Convert.tmdb_to_tvdb(_id, fail=True)
if tvdb_id not in builder.missing_shows: if tvdb_id not in builder.missing_shows:
builder.missing_shows.append(tvdb_id) builder.missing_shows.append(tvdb_id)
except Failed as e: except Failed as e:

Write Preview
Loading…
Cancel
Save