From b4165ac9ada208cceb1f58e6169897fb8f60bbae Mon Sep 17 00:00:00 2001 From: meisnate12 Date: Tue, 22 Mar 2022 16:06:59 -0400 Subject: [PATCH] [20] small fixes --- .github/workflows/nightly.yml | 2 +- VERSION | 2 +- modules/builder.py | 9 ++++++--- modules/util.py | 5 ++++- 4 files changed, 12 insertions(+), 6 deletions(-) diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 095bd9d1..df5e06e2 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -15,7 +15,7 @@ jobs: - name: Send Discord Commit Notification uses: meisnate12/discord-notifications@master with: - webhook_id: ${{ secrets.BUILD_WEBHOOK_TOKEN }} + webhook_id: ${{ secrets.BUILD_WEBHOOK_ID }} webhook_token: ${{ secrets.BUILD_WEBHOOK_TOKEN }} title: Plex Meta Manager Nightly Push commits: "true" diff --git a/VERSION b/VERSION index 4407a08a..d561566a 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.16.2-develop19 +1.16.2-develop20 diff --git a/modules/builder.py b/modules/builder.py index 08992fbc..ac6a69cb 100644 --- a/modules/builder.py +++ b/modules/builder.py @@ -1583,10 +1583,13 @@ class CollectionBuilder: if "limit" in filter_alias: if plex_filter[filter_alias["limit"]] is None: raise Failed(f"{self.Type} Error: limit attribute is blank") - if not isinstance(plex_filter[filter_alias["limit"]], int) or plex_filter[filter_alias["limit"]] < 1: + elif str(plex_filter[filter_alias["limit"]]).lower() == "all": + filter_details += "Limit: all\n" + elif not isinstance(plex_filter[filter_alias["limit"]], int) or plex_filter[filter_alias["limit"]] < 1: raise Failed(f"{self.Type} Error: limit attribute must be an integer greater then 0") - limit = plex_filter[filter_alias["limit"]] - filter_details += f"Limit: {limit}\n" + else: + limit = plex_filter[filter_alias["limit"]] + filter_details += f"Limit: {limit}\n" validate = True if "validate" in filter_alias: diff --git a/modules/util.py b/modules/util.py index cf3442d4..1febd4a4 100644 --- a/modules/util.py +++ b/modules/util.py @@ -464,7 +464,10 @@ def parse(error, attribute, data, datatype=None, methods=None, parent=None, defa final_dict = {} for dict_key, dict_data in value.items(): if isinstance(dict_data, dict) and dict_data: - final_dict[dict_key] = dict_data + new_data = {} + for dict_data_key, dict_data_data in dict_data.items(): + new_data[str(dict_data_key)] = dict_data_data + final_dict[dict_key] = new_data else: raise Failed(f"{error} Warning: {display} {dict_key} is not a dictionary") return final_dict