From 11415b98cda969b588a4172cfdb5bed00a6558cc Mon Sep 17 00:00:00 2001 From: meisnate12 Date: Tue, 19 Jul 2022 10:54:13 -0400 Subject: [PATCH] [41] fix ignore_blank_results --- VERSION | 2 +- docs/config/notifiarr.md | 7 ++++--- modules/builder.py | 3 ++- modules/overlays.py | 9 +++------ 4 files changed, 10 insertions(+), 11 deletions(-) diff --git a/VERSION b/VERSION index b85d486b..5f921a59 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.17.1-develop40 +1.17.1-develop41 diff --git a/docs/config/notifiarr.md b/docs/config/notifiarr.md index ea00a69d..c56c0001 100644 --- a/docs/config/notifiarr.md +++ b/docs/config/notifiarr.md @@ -10,9 +10,10 @@ notifiarr: apikey: #################################### ``` -| Attribute | Allowed Values | Required | -|:----------|:------------------|:--------:| -| `apikey` | Notifiarr API Key | ✅ | +| Attribute | Allowed Values | Required | +|:----------|:-----------------------------------------|:--------:| +| `apikey` | Notifiarr API Key | ✅ | +| `develop` | Use the Development Version of Notifiarr | ❌ | Once you have added the apikey your config.yml you have to add `notifiarr` to any webhook to send that notification to Notifiarr. diff --git a/modules/builder.py b/modules/builder.py index 176d44bf..0cb10557 100644 --- a/modules/builder.py +++ b/modules/builder.py @@ -157,7 +157,8 @@ custom_sort_builders = [ episode_parts_only = ["plex_pilots"] overlay_only = ["overlay", "suppress_overlays"] overlay_attributes = [ - "filters", "limit", "show_missing", "save_report", "missing_only_released", "minimum_items", "cache_builders", "tmdb_region", "default_percent" + "filters", "limit", "show_missing", "save_report", "missing_only_released", "minimum_items", "cache_builders", + "tmdb_region", "default_percent", "ignore_blank_results" ] + all_builders + overlay_only parts_collection_valid = [ "filters", "plex_all", "plex_search", "trakt_list", "trakt_list_details", "collection_filtering", "collection_mode", "label", "visible_library", "limit", diff --git a/modules/overlays.py b/modules/overlays.py index 84860cb8..54f09951 100644 --- a/modules/overlays.py +++ b/modules/overlays.py @@ -323,9 +323,6 @@ class Overlays: else: raise Failed(e) - if not builder.added_items and builder.ignore_blank_results: - raise NonExisting(f"Overlay Warning: No items found") - if builder.filters or builder.tmdb_filters: logger.info("") for filter_key, filter_value in builder.filters: @@ -342,11 +339,11 @@ class Overlays: properties[builder.overlay.mapping_name].keys.append(item.ratingKey) if added_titles: logger.debug(f"{len(added_titles)} Titles Found: {[self.library.get_item_sort_title(a, atr='title') for a in added_titles]}") - logger.info(f"{len(added_titles) if added_titles else 'No'} Items found for {builder.overlay.mapping_name}") + logger.info(f"{len(added_titles)} Items found for {builder.overlay.mapping_name} Overlay") + else: + logger.warning(f"No Items found for {builder.overlay.mapping_name} Overlay") except NotScheduled as e: logger.info(e) - except NonExisting as e: - logger.warning(e) except Failed as e: logger.stacktrace() logger.error(e)