From 113b6c5551dadd90d5db50ca760c008718bd0f82 Mon Sep 17 00:00:00 2001 From: YozoraXCII <96386153+YozoraXCII@users.noreply.github.com> Date: Tue, 22 Oct 2024 19:41:35 +0100 Subject: [PATCH] [5] [Defaults] Fix Prime Video ID for `watch_region: AU` (#2294) --- .github/workflows/validate-pull.yml | 2 +- CHANGELOG | 8 +++++++- VERSION | 2 +- defaults/both/streaming.yml | 3 ++- defaults/overlays/streaming.yml | 3 ++- modules/imdb.py | 2 ++ modules/operations.py | 2 +- modules/overlays.py | 2 +- requirements.txt | 6 +++--- 9 files changed, 20 insertions(+), 10 deletions(-) diff --git a/.github/workflows/validate-pull.yml b/.github/workflows/validate-pull.yml index f0980f35..63962ab1 100644 --- a/.github/workflows/validate-pull.yml +++ b/.github/workflows/validate-pull.yml @@ -56,7 +56,7 @@ jobs: done - name: Run Spellcheck - uses: rojopolis/spellcheck-github-actions@0.42.0 + uses: rojopolis/spellcheck-github-actions@0.43.1 docker-build-pull: runs-on: ubuntu-latest diff --git a/CHANGELOG b/CHANGELOG index ade3ebfd..8ade124a 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,10 +1,16 @@ +# Requirements Update (requirements will need to be reinstalled) +Update pillow requirement to 11.0.0 +Update psutil requirement to 6.1.0 +Update setuptools requirement to 75.2.0 + # New Features Added the `character` search option to the `imdb_search` builder # Defaults Fixed incorrect content rating mappings in various Default files +Fixes an issue where Prime Video overlays/collections would not be built when the `watch_region` is set to AU # Bug Fixes Fixed the `cast` search option for the `imdb_search` builder Fixes #2258 `imdb_list` sort was not being parsed correctly -Fixes `letterboxd_list` rating filter to use a 1-10 rating vs 1-100 to reflect how letterboxd ratings work on their website \ No newline at end of file +Fixes `letterboxd_list` rating filter to use a 1-10 rating vs 1-100 to reflect how letterboxd ratings work on their website diff --git a/VERSION b/VERSION index 3b9295c2..7958174a 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.1.0-build4 +2.1.0-build5 diff --git a/defaults/both/streaming.yml b/defaults/both/streaming.yml index dd6041f2..d15406d2 100644 --- a/defaults/both/streaming.yml +++ b/defaults/both/streaming.yml @@ -37,9 +37,10 @@ templates: final_tmdb_key: default: <> conditions: - - region: CA + - region: [CA, AU] tmdb_key: [9] value: 119 + discover_with: conditions: - originals_only: false diff --git a/defaults/overlays/streaming.yml b/defaults/overlays/streaming.yml index 44bb1a68..c8f60310 100644 --- a/defaults/overlays/streaming.yml +++ b/defaults/overlays/streaming.yml @@ -57,6 +57,7 @@ templates: - use_<> - use_<> - allowed_libraries + - providers_<> run_definition: - <>>> - <>>> @@ -95,7 +96,7 @@ templates: final_tmdb_key: default: <> conditions: - - region: CA + - region: [CA, AU] tmdb_key: [9] value: 119 allowed_streaming: diff --git a/modules/imdb.py b/modules/imdb.py index 5e070119..dae82bd6 100644 --- a/modules/imdb.py +++ b/modules/imdb.py @@ -449,6 +449,8 @@ class IMDb: return imdb_ids raise Failed("IMDb Error: No IMDb IDs Found") except KeyError: + if 'errors' in response_json.keys() and 'message' in response_json['errors'][0] and response_json['errors'][0]['message'] == 'PersistedQueryNotFound': + raise Failed("Internal IMDB PersistedQuery Error") logger.error(f"Response: {response_json}") raise diff --git a/modules/operations.py b/modules/operations.py index 6e8ef19c..a35a98b5 100644 --- a/modules/operations.py +++ b/modules/operations.py @@ -906,7 +906,7 @@ class Operations: def get_batch_info(placement, total, display_attr, total_count, display_value=None, is_episode=False, out_type=None, tag_type=None): return f"Batch {name_display[display_attr] if display_attr in name_display else display_attr.capitalize()} Update ({placement}/{total}): " \ - f"{f'{out_type.capitalize()}ing ' if out_type else ''}" \ + f"{f'{out_type.capitalize()} ' if out_type else ''}" \ f"{f'Adding {display_value} to ' if tag_type == 'add' else f'Removing {display_value} from ' if tag_type == 'remove' else ''}" \ f"{total_count} {'Episode' if is_episode else 'Movie' if self.library.is_movie else 'Show'}" \ f"{'s' if total_count > 1 else ''}{'' if out_type or tag_type else f' updated to {display_value}'}" diff --git a/modules/overlays.py b/modules/overlays.py index b5bbb59d..a627b620 100644 --- a/modules/overlays.py +++ b/modules/overlays.py @@ -526,7 +526,7 @@ class Overlays: logger.stacktrace() raise Failed(f" Overlay Error: {e}") else: - logger.info(" Overlay Update Not Needed") + logger.info(f" Overlay Update Not Needed (Current Overlays: {', '.join(over_names)})") if self.cache and poster_compare: self.cache.update_image_map(item.ratingKey, f"{self.library.image_table_name}_overlays", item.thumb, poster_compare, overlay='|'.join(compare_names)) diff --git a/requirements.txt b/requirements.txt index 0f89d944..5dabc9b3 100644 --- a/requirements.txt +++ b/requirements.txt @@ -3,14 +3,14 @@ GitPython==3.1.43 lxml==5.3.0 num2words==0.5.13 pathvalidate==3.2.1 -pillow==10.4.0 +pillow==11.0.0 PlexAPI==4.15.16 -psutil==6.0.0 +psutil==6.1.0 python-dotenv==1.0.1 python-dateutil==2.9.0.post0 requests==2.32.3 tenacity==9.0.0 ruamel.yaml==0.18.6 schedule==1.2.2 -setuptools==75.1.0 +setuptools==75.2.0 tmdbapis==1.2.21 \ No newline at end of file