diff --git a/VERSION b/VERSION new file mode 100644 index 00000000..125d2e93 --- /dev/null +++ b/VERSION @@ -0,0 +1 @@ +1.12.2-develop1019 \ No newline at end of file diff --git a/modules/builder.py b/modules/builder.py index 9c47f0c7..762f1653 100644 --- a/modules/builder.py +++ b/modules/builder.py @@ -761,7 +761,6 @@ class CollectionBuilder: else: raise Failed(f"Collection Error: {method_name} attribute must be either announced, cinemas, released or db") elif method_name == "radarr_quality": - self.library.Radarr.get_profile_id(method_data) self.radarr_details["quality"] = method_data elif method_name == "radarr_tag": self.radarr_details["tag"] = util.get_list(method_data) @@ -769,19 +768,13 @@ class CollectionBuilder: def _sonarr(self, method_name, method_data): if method_name in ["sonarr_add", "sonarr_add_existing", "sonarr_season", "sonarr_search", "sonarr_cutoff_search"]: self.sonarr_details[method_name[7:]] = util.parse(method_name, method_data, datatype="bool") - elif method_name == "sonarr_folder": - self.sonarr_details["folder"] = method_data + elif method_name in ["sonarr_folder", "sonarr_quality", "sonarr_language"]: + self.sonarr_details[method_name[7:]] = method_data elif method_name == "sonarr_monitor": if str(method_data).lower() in sonarr.monitor_translation: self.sonarr_details["monitor"] = str(method_data).lower() else: raise Failed(f"Collection Error: {method_name} attribute must be either all, future, missing, existing, pilot, first, latest or none") - elif method_name == "sonarr_quality": - self.library.Sonarr.get_profile_id(method_data, "quality_profile") - self.sonarr_details["quality"] = method_data - elif method_name == "sonarr_language": - self.library.Sonarr.get_profile_id(method_data, "language_profile") - self.sonarr_details["language"] = method_data elif method_name == "sonarr_series": if str(method_data).lower() in sonarr.series_type: self.sonarr_details["series"] = str(method_data).lower() diff --git a/plex_meta_manager.py b/plex_meta_manager.py index baefcec5..50fc24db 100644 --- a/plex_meta_manager.py +++ b/plex_meta_manager.py @@ -98,6 +98,14 @@ logger.addHandler(cmd_handler) sys.excepthook = util.my_except_hook +version = "Unknown" +with open("VERSION") as handle: + for line in handle.readlines(): + line = line.strip() + if len(line) > 0: + version = line + break + def start(attrs): file_logger = os.path.join(default_dir, "logs", "meta.log") should_roll_over = os.path.isfile(file_logger) @@ -108,14 +116,14 @@ def start(attrs): file_handler.doRollover() logger.addHandler(file_handler) util.separator() - logger.info(util.centered(" ")) + logger.info("") logger.info(util.centered(" ____ _ __ __ _ __ __ ")) logger.info(util.centered("| _ \\| | _____ __ | \\/ | ___| |_ __ _ | \\/ | __ _ _ __ __ _ __ _ ___ _ __ ")) logger.info(util.centered("| |_) | |/ _ \\ \\/ / | |\\/| |/ _ \\ __/ _` | | |\\/| |/ _` | '_ \\ / _` |/ _` |/ _ \\ '__|")) logger.info(util.centered("| __/| | __/> < | | | | __/ || (_| | | | | | (_| | | | | (_| | (_| | __/ | ")) logger.info(util.centered("|_| |_|\\___/_/\\_\\ |_| |_|\\___|\\__\\__,_| |_| |_|\\__,_|_| |_|\\__,_|\\__, |\\___|_| ")) logger.info(util.centered(" |___/ ")) - logger.info(util.centered(" Version: 1.12.2-develop1004 ")) + logger.info(f" Version: {version}") if "time" in attrs and attrs["time"]: start_type = f"{attrs['time']} " elif "test" in attrs and attrs["test"]: start_type = "Test " elif "collections" in attrs and attrs["collections"]: start_type = "Collections "