diff --git a/VERSION b/VERSION index cb74a392..3bd285a3 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.14.1-develop1522 \ No newline at end of file +1.14.1-develop1722 \ No newline at end of file diff --git a/modules/builder.py b/modules/builder.py index 4a4d864d..99b6998a 100644 --- a/modules/builder.py +++ b/modules/builder.py @@ -339,29 +339,6 @@ class CollectionBuilder: else: self.sync = self.data[methods["sync_mode"]].lower() == "sync" - test_sort = None - if "collection_order" in methods and not self.playlist: - if self.data[methods["collection_order"]] is None: - raise Failed(f"{self.Type} Warning: collection_order attribute is blank") - else: - test_sort = self.data[methods["collection_order"]] - elif "collection_order" not in methods and not self.playlist and self.library.default_collection_order: - test_sort = self.library.default_collection_order - logger.warning(f"{self.Type} Warning: collection_order not found using library default_collection_order: {self.library.default_collection_order}") - self.custom_sort = self.playlist - if test_sort: - logger.debug("") - logger.debug("Validating Method: collection_order") - logger.debug(f"Value: {test_sort}") - if test_sort.lower() in plex.collection_order_options: - self.details["collection_order"] = test_sort.lower() - if test_sort.lower() == "custom" and self.build_collection: - self.custom_sort = True - elif (self.library.is_movie and test_sort.lower() in plex.movie_sorts) or (self.library.is_show and test_sort.lower() in plex.show_sorts): - self.custom_sort = test_sort.lower() - else: - raise Failed(f"{self.Type} Error: {test_sort} collection_order invalid\n\trelease (Order Collection by release dates)\n\talpha (Order Collection Alphabetically)\n\tcustom (Custom Order Collection)\n\tOther sorting options can be found at https://github.com/meisnate12/Plex-Meta-Manager/wiki/Smart-Builders#sort-options") - self.collection_level = "movie" if self.library.is_movie else "show" if self.playlist: self.collection_level = "item" @@ -459,24 +436,30 @@ class CollectionBuilder: self.smart = self.smart_url or self.smart_label_collection - self.custom_sort = self.playlist + test_sort = None if "collection_order" in methods and not self.playlist: + if self.data[methods["collection_order"]] is None: + raise Failed(f"{self.Type} Warning: collection_order attribute is blank") + else: + test_sort = self.data[methods["collection_order"]] + elif "collection_order" not in methods and not self.playlist and self.library.default_collection_order: + test_sort = self.library.default_collection_order + logger.warning(f"{self.Type} Warning: collection_order not found using library default_collection_order: {self.library.default_collection_order}") + self.custom_sort = self.playlist + if test_sort: if self.smart: raise Failed(f"{self.Type} Error: collection_order does not work with Smart Collections") logger.debug("") logger.debug("Validating Method: collection_order") - if self.data[methods["collection_order"]] is None: - raise Failed(f"{self.Type} Error: collection_order attribute is blank") + logger.debug(f"Value: {test_sort}") + if test_sort.lower() in plex.collection_order_options: + self.details["collection_order"] = test_sort.lower() + if test_sort.lower() == "custom" and self.build_collection: + self.custom_sort = True + elif (self.library.is_movie and test_sort.lower() in plex.movie_sorts) or (self.library.is_show and test_sort.lower() in plex.show_sorts): + self.custom_sort = test_sort.lower() else: - logger.debug(f"Value: {self.data[methods['collection_order']]}") - if self.data[methods["collection_order"]].lower() in plex.collection_order_options: - self.details["collection_order"] = self.data[methods["collection_order"]].lower() - if self.data[methods["collection_order"]].lower() == "custom" and self.build_collection: - self.custom_sort = True - elif (self.library.is_movie and self.data[methods["collection_order"]].lower() in plex.movie_sorts) or (self.library.is_show and self.data[methods["collection_order"]].lower() in plex.show_sorts): - self.custom_sort = self.data[methods["collection_order"]].lower() - else: - raise Failed(f"{self.Type} Error: {self.data[methods['collection_order']]} collection_order invalid\n\trelease (Order Collection by release dates)\n\talpha (Order Collection Alphabetically)\n\tcustom (Custom Order Collection)\n\tOther sorting options can be found at https://github.com/meisnate12/Plex-Meta-Manager/wiki/Smart-Builders#sort-options") + raise Failed(f"{self.Type} Error: {test_sort} collection_order invalid\n\trelease (Order Collection by release dates)\n\talpha (Order Collection Alphabetically)\n\tcustom (Custom Order Collection)\n\tOther sorting options can be found at https://github.com/meisnate12/Plex-Meta-Manager/wiki/Smart-Builders#sort-options") if self.smart_url or self.smart_label_collection or self.parts_collection: self.custom_sort = False diff --git a/modules/config.py b/modules/config.py index 1727a13b..a53e2a79 100644 --- a/modules/config.py +++ b/modules/config.py @@ -256,6 +256,10 @@ class ConfigFile: return default self.session = requests.Session() + self.session.verify = False + if self.session.verify is False: + import urllib3 + urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning) self.general = { "cache": check_for_attribute(self.data, "cache", parent="settings", var_type="bool", default=True), @@ -585,7 +589,7 @@ class ConfigFile: params["split_duplicates"] = check_for_attribute(lib, "split_duplicates", var_type="bool", default=False, save=False, do_print=False) params["radarr_add_all_existing"] = check_for_attribute(lib, "radarr_add_all_existing", var_type="bool", default=False, save=False, do_print=False) params["sonarr_add_all_existing"] = check_for_attribute(lib, "sonarr_add_all_existing", var_type="bool", default=False, save=False, do_print=False) - params["missing_path"] = check_for_attribute(lib, "missing_path", var_type="path", default_is_none=True, save=False, do_print=True) + params["missing_path"] = check_for_attribute(lib, "missing_path", var_type="path", default_is_none=True, save=False) if lib and "operations" in lib and lib["operations"]: if isinstance(lib["operations"], dict):