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

fixed plex_search display error

Browse Source
pull/160/head
meisnate12 4 years ago
parent 5ce3f3986a
commit e72979e687
1 changed files with 37 additions and 19 deletions
Show Stats Download Patch File Download Diff File

56
modules/builder.py
Unescape View File

@ -452,13 +452,15 @@ class CollectionBuilder:
self.details[method_name] = method_data self.details[method_name] = method_data
elif method_name in ["title", "title.and", "title.not", "title.begins", "title.ends"]: elif method_name in ["title", "title.and", "title.not", "title.begins", "title.ends"]:
self.methods.append(("plex_search", [{method_name: util.get_list(method_data, split=False)}])) self.methods.append(("plex_search", [{method_name: util.get_list(method_data, split=False)}]))
elif method_name in ["decade", "year.greater", "year.less"]: elif method_name in ["year.greater", "year.less"]:
self.methods.append(("plex_search", [{method_name: [util.check_year(method_data, current_year, method_name)]}])) self.methods.append(("plex_search", [{method_name: util.check_year(method_data, current_year, method_name)}]))
elif method_name in ["added.before", "added.after", "originally_available.before", "originally_available.after"]: elif method_name in ["added.before", "added.after", "originally_available.before", "originally_available.after"]:
self.methods.append(("plex_search", [{method_name: [util.check_date(method_data, method_name, return_string=True, plex_date=True)]}])) self.methods.append(("plex_search", [{method_name: util.check_date(method_data, method_name, return_string=True, plex_date=True)}]))
elif method_name in ["added", "added.not", "originally_available", "originally_available.not"]:
self.methods.append(("plex_search", [{method_name: util.check_number(method_data, method_name, minimum=1)}]))
elif method_name in ["duration.greater", "duration.less", "rating.greater", "rating.less"]: elif method_name in ["duration.greater", "duration.less", "rating.greater", "rating.less"]:
self.methods.append(("plex_search", [{method_name: [util.check_number(method_data, method_name, minimum=0)]}])) self.methods.append(("plex_search", [{method_name: util.check_number(method_data, method_name, minimum=0)}]))
elif method_name in ["year", "year.not"]: elif method_name in ["decade", "year", "year.not"]:
self.methods.append(("plex_search", [{method_name: util.get_year_list(method_data, current_year, method_name)}])) self.methods.append(("plex_search", [{method_name: util.get_year_list(method_data, current_year, method_name)}]))
elif method_name in plex.searches: elif method_name in plex.searches:
if method_name in plex.tmdb_searches: if method_name in plex.tmdb_searches:
@ -641,14 +643,15 @@ class CollectionBuilder:
searches[search_final] = valid_values searches[search_final] = valid_values
else: else:
logger.warning(f"Collection Warning: No valid {search} values found in {final_values}") logger.warning(f"Collection Warning: No valid {search} values found in {final_values}")
elif (search == "decade" and modifier in [""]) \ elif search == "year" and modifier in [".greater", ".less"]:
or (search == "year" and modifier in [".greater", ".less"]): searches[search_final] = util.check_year(search_data, current_year, search_final)
searches[search_final] = [util.check_year(search_data, current_year, search_final)] elif search in ["added", "originally_available"] and modifier in [".before", ".after"]:
elif search in ["added", "originally_available"] and modifier in ["", ".not", ".before", ".after"]: searches[search_final] = util.check_date(search_data, search_final, return_string=True, plex_date=True)
searches[search_final] = [util.check_date(search_data, search_final, return_string=True, plex_date=True)] elif search in ["added", "originally_available"] and modifier in ["", ".not"]:
searches[search_final] = util.check_number(search_data, search_final, minimum=1)
elif search in ["duration", "rating"] and modifier in [".greater", ".less"]: elif search in ["duration", "rating"] and modifier in [".greater", ".less"]:
searches[search_final] = [util.check_number(search_data, search_final, minimum=0)] searches[search_final] = util.check_number(search_data, search_final, minimum=0)
elif search == "year" and modifier in ["", ".not"]: elif (search == "decade" and modifier in [""]) or (search == "year" and modifier in ["", ".not"]):
searches[search_final] = util.get_year_list(search_data, current_year, search_final) searches[search_final] = util.get_year_list(search_data, current_year, search_final)
elif (search in ["title", "studio"] and modifier not in ["", ".and", ".not", ".begins", ".ends"]) \ elif (search in ["title", "studio"] and modifier not in ["", ".and", ".not", ".begins", ".ends"]) \
or (search in ["actor", "audio_language", "collection", "content_rating", "country", "director", "genre", "label", "network", "producer", "subtitle_language", "writer"] and modifier not in ["", ".and", ".not"]) \ or (search in ["actor", "audio_language", "collection", "content_rating", "country", "director", "genre", "label", "network", "producer", "subtitle_language", "writer"] and modifier not in ["", ".and", ".not"]) \
@ -967,14 +970,29 @@ class CollectionBuilder:
else: else:
search, modifier = os.path.splitext(str(search_method).lower()) search, modifier = os.path.splitext(str(search_method).lower())
final_search = plex.search_translation[search] if search in plex.search_translation else search final_search = plex.search_translation[search] if search in plex.search_translation else search
final_mod = plex.modifiers[modifier] if modifier in plex.modifiers else "" if search == "originally_available" and modifier == "":
final_mod = ">>"
elif search == "originally_available" and modifier == ".not":
final_mod = "<<"
else:
final_mod = plex.modifiers[modifier] if modifier in plex.modifiers else ""
final_method = f"{final_search}{final_mod}" final_method = f"{final_search}{final_mod}"
search_terms[final_method] = search_data * 60000 if final_search == "duration" else search_data
ors = "" if search == "duration":
conjunction = " AND " if final_mod == "&" else " OR " search_terms[final_method] = search_data * 60000
for o, param in enumerate(search_data): elif search in ["added", "originally_available"] and modifier in ["", ".not"]:
or_des = conjunction if o > 0 else f"{search_method}(" search_terms[final_method] = f"{search_data}d"
ors += f"{or_des}{param}" else:
search_terms[final_method] = search_data
if search in ["added", "originally_available"] or modifier in [".greater", ".less", ".before", ".after"]:
ors = f"{search_method}({search_data}"
else:
ors = ""
conjunction = " AND " if final_mod == "&" else " OR "
for o, param in enumerate(search_data):
or_des = conjunction if o > 0 else f"{search_method}("
ors += f"{or_des}{param}"
if has_processed: if has_processed:
logger.info(f"\t\t AND {ors})") logger.info(f"\t\t AND {ors})")
else: else:

Write Preview
Loading…
Cancel
Save