diff --git a/CHANGELOG b/CHANGELOG index 9473a405..0dd25324 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -17,6 +17,7 @@ Mass Update operations now can be given a list of sources to fall back on when o `mass_content_rating_update` has a new source `mdb_age_rating` `mass_originally_available_update` has a new source `mdb_digital` `plex` attributes `clean_bundles`, `empty_trash`, and `optimize` can now take any schedule options to be run only when desired. +Allows users to use the Admin username when specifying playlist users. Thanks @benbou8231! # Defaults @@ -26,5 +27,8 @@ Fixed collection fields being locked during batch edits when they shouldn't be Fixed awards dynamic collections where `latest` wasn't pulling the correct values Fixed `imdb_watchlist` Fixed `trakt_userlist` +Fixed an issue where sometimes the resolution default overlay would be off center +Fixed multiple issues with playlist deletion. Thanks @benbou8231! +Fixed an issue where dynamic collection errors would sometimes appear before the title of the Dynamic Collection. Various other Minor Fixes diff --git a/VERSION b/VERSION index e993f93d..3cd4cc07 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.20.0-develop33 +1.20.0-develop34 diff --git a/modules/meta.py b/modules/meta.py index 7a184f04..9dde420c 100644 --- a/modules/meta.py +++ b/modules/meta.py @@ -64,7 +64,11 @@ def get_dict(attribute, attr_data, check_list=None, make_str=False): class DataFile: - def __init__(self, config, file_type, path, temp_vars, asset_directory): + def __init__(self, config, file_type, path, temp_vars, asset_directory, data_type): + if file_type != "Data": + logger.info("") + logger.info(f"Loading {data_type} {file_type}: {path}") + logger.info("") self.config = config self.library = None self.type = file_type @@ -589,9 +593,9 @@ class DataFile: class MetadataFile(DataFile): def __init__(self, config, library, file_type, path, temp_vars, asset_directory, file_style): - super().__init__(config, file_type, path, temp_vars, asset_directory) self.file_style = file_style self.type_str = f"{file_style.capitalize()} File" + super().__init__(config, file_type, path, temp_vars, asset_directory, self.type_str) self.data_type = "Collection" self.library = library self.metadata = None @@ -604,9 +608,6 @@ class MetadataFile(DataFile): self.set_collections = {} self.style_priority = [] if self.file_style == "image": - logger.info("") - logger.separator(f"Loading Image File {file_type}: {path}") - logger.info("") self.metadata = {} if self.type == "PMM Default": if self.path.endswith(".yml"): @@ -2173,11 +2174,8 @@ class MetadataFile(DataFile): class PlaylistFile(DataFile): def __init__(self, config, file_type, path, temp_vars, asset_directory): - super().__init__(config, file_type, path, temp_vars, asset_directory) + super().__init__(config, file_type, path, temp_vars, asset_directory, "Playlist File") self.data_type = "Playlist" - logger.info("") - logger.info(f"Loading Playlist {file_type}: {path}") - logger.info("") data = self.load_file(self.type, self.path) self.playlists = get_dict("playlists", data, self.config.playlist_names) self.templates = get_dict("templates", data) @@ -2188,13 +2186,10 @@ class PlaylistFile(DataFile): class OverlayFile(DataFile): def __init__(self, config, library, file_type, path, temp_vars, asset_directory, queue_current): - super().__init__(config, file_type, path, temp_vars, asset_directory) + self.file_num = len(library.overlay_files) + super().__init__(config, file_type, path, temp_vars, asset_directory, f"Overlay File {self.file_num}") self.library = library self.data_type = "Overlay" - self.file_num = len(library.overlay_files) - logger.info("") - logger.info(f"Loading Overlay {self.file_num} {file_type}: {path}") - logger.info("") data = self.load_file(self.type, self.path, overlay=True) self.overlays = get_dict("overlays", data) self.templates = get_dict("templates", data)