diff --git a/VERSION b/VERSION index 5af9daf0..3201e4e4 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.18.3-develop114 +1.18.3-develop115 diff --git a/defaults/chart/flixpatrol.yml b/defaults/chart/flixpatrol.yml index cbf5a4c3..49613193 100644 --- a/defaults/chart/flixpatrol.yml +++ b/defaults/chart/flixpatrol.yml @@ -23,9 +23,15 @@ templates: time_window_<>: <> limit: 10 limit_<>: <> + conditionals: + actual_location: + default: <>>> + conditions: + - key: apple + value: world flixpatrol_top: platform: <> - location: <>>> + location: <> time_window: <>>> limit: <>>> @@ -39,6 +45,7 @@ dynamic_collections: hulu: Hulu paramount: Paramount+ prime: Prime Video + apple: Apple+ title_format: <> Top <> template: - flixpatrol @@ -53,6 +60,7 @@ dynamic_collections: default: <> paramount: paramount_plus prime: amazon_prime + apple: apple_plus image: default: chart/<>_top translation_key: diff --git a/defaults/overlays/flixpatrol.yml b/defaults/overlays/flixpatrol.yml index 5e199f29..abec6a6b 100644 --- a/defaults/overlays/flixpatrol.yml +++ b/defaults/overlays/flixpatrol.yml @@ -56,10 +56,16 @@ templates: location_<>: <> limit: 10 limit_<>: <> + conditionals: + actual_location: + default: <>>> + conditions: + - key: apple + value: world ignore_blank_results: true flixpatrol_top: platform: <> - location: <>>> + location: <> time_window: <>>> limit: <>>> @@ -88,3 +94,7 @@ overlays: Prime: variables: {key: prime, weight: 10, slug: amazon_prime} template: [name: standard, name: flixpatrol] + + Apple: + variables: {key: apple, weight: 9, slug: apple_plus} + template: [name: standard, name: flixpatrol] diff --git a/defaults/overlays/images/logo/round/apple.png b/defaults/overlays/images/logo/round/apple.png new file mode 100644 index 00000000..0d889782 Binary files /dev/null and b/defaults/overlays/images/logo/round/apple.png differ diff --git a/defaults/overlays/images/logo/square/apple.png b/defaults/overlays/images/logo/square/apple.png new file mode 100644 index 00000000..973a4ed0 Binary files /dev/null and b/defaults/overlays/images/logo/square/apple.png differ diff --git a/docs/defaults/chart/flixpatrol.md b/docs/defaults/chart/flixpatrol.md index 7fc41638..abdcd7bc 100644 --- a/docs/defaults/chart/flixpatrol.md +++ b/docs/defaults/chart/flixpatrol.md @@ -10,14 +10,15 @@ Supported Library Types: Movie, Show ## Collections Section 020 -| Collection | Key | Description | -|:---------------------------------|:------------|:---------------------------------------------------------------------------| +| Collection | Key | Description | +|:--------------------------------- |:------------|:---------------------------------------------------------------------------| | `Netflix Top 10 Movies/Shows` | `netflix` | Collection of the Top Movies/Shows on Netflix according to FlixPatrol. | | `Disney+ Top 10 Movies/Shows` | `disney` | Collection of the Top Movies/Shows on Disney+ according to FlixPatrol. | | `HBO Top 10 Movies/Shows` | `hbo` | Collection of the Top Movies/Shows on HBO according to FlixPatrol. | | `Hulu Top 10 Movies/Shows` | `hulu` | Collection of the Top Movies/Shows on Hulu according to FlixPatrol. | | `Paramount+ Top 10 Movies/Shows` | `paramount` | Collection of the Top Movies/Shows on Paramount+ according to FlixPatrol. | | `Prime Video Top 10 Movies/Shows` | `prime` | Collection of the Top Movies/Shows on Prime Video according to FlixPatrol. | +| `Apple+ Top 10 Movies/Shows` | `apple` | Collection of the Top Movies/Shows on Apple+ according to FlixPatrol. | ## Config diff --git a/docs/defaults/overlays/flixpatrol.md b/docs/defaults/overlays/flixpatrol.md index ed4460d1..b8a4a6f5 100644 --- a/docs/defaults/overlays/flixpatrol.md +++ b/docs/defaults/overlays/flixpatrol.md @@ -18,6 +18,7 @@ Supported Overlay Level: Movie, Show | Hulu | `hulu` | `30` | | Paramount+ | `paramount` | `20` | | Prime Video | `prime` | `10` | +| Apple+ | `apple` | `9` | ## Config diff --git a/docs/metadata/builders/flixpatrol.md b/docs/metadata/builders/flixpatrol.md index 15a09315..81b38c50 100644 --- a/docs/metadata/builders/flixpatrol.md +++ b/docs/metadata/builders/flixpatrol.md @@ -23,7 +23,7 @@ The `sync_mode: sync` and `collection_order: custom` Details are recommended sin | Attribute | Description & Values | |:--------------|:-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| -| `platform` | **Description:** Streaming Platform to filter on.
**Values:** `netflix`, `hbo`, `disney`, `amazon`, `itunes`, `google`, `paramount_plus`, `hulu`, `vudu`, `imdb`, `amazon_prime`, `star_plus` | +| `platform` | **Description:** Streaming Platform to filter on.
**Values:** `netflix`, `hbo`, `disney`, `amazon`, `itunes`, `google`, `paramount_plus`, `hulu`, `vudu`, `imdb`, `amazon_prime`, `star_plus, apple_plus` | | `location` | **Description:** Location to filter on.
**Default:** `world`
**Values:** `world`, `albania`, `argentina`, `armenia`, `australia`, `austria`, `azerbaijan`, `bahamas`, `bahrain`, `bangladesh`, `belarus`, `belgium`, `belize`, `benin`, `bolivia`, `bosnia_and_herzegovina`, `botswana`, `brazil`, `bulgaria`, `burkina_faso`, `cambodia`, `canada`, `chile`, `colombia`, `costa_rica`, `croatia`, `cyprus`, `czech_republic`, `denmark`, `dominican_republic`, `ecuador`, `egypt`, `estonia`, `finland`, `france`, `gabon`, `germany`, `ghana`, `greece`, `guatemala`, `guinea_bissau`, `haiti`, `honduras`, `hong_kong`, `hungary`, `iceland`, `india`, `indonesia`, `ireland`, `israel`, `italy`, `ivory_coast`, `jamaica`, `japan`, `jordan`, `kazakhstan`, `kenya`, `kuwait`, `kyrgyzstan`, `laos`, `latvia`, `lebanon`, `lithuania`, `luxembourg`, `malaysia`, `maldives`, `mali`, `malta`, `mexico`, `moldova`, `mongolia`, `montenegro`, `morocco`, `mozambique`, `namibia`, `netherlands`, `new_zealand`, `nicaragua`, `niger`, `nigeria`, `north_macedonia`, `norway`, `oman`, `pakistan`, `panama`, `papua_new_guinea`, `paraguay`, `peru`, `philippines`, `poland`, `portugal`, `qatar`, `romania`, `russia`, `rwanda`, `salvador`, `saudi_arabia`, `senegal`, `serbia`, `singapore`, `slovakia`, `slovenia`, `south_africa`, `south_korea`, `spain`, `sri_lanka`, `sweden`, `switzerland`, `taiwan`, `tajikistan`, `tanzania`, `thailand`, `togo`, `trinidad_and_tobago`, `turkey`, `turkmenistan`, `uganda`, `ukraine`, `united_arab_emirates`, `united_kingdom`, `united_states`, `uruguay`, `uzbekistan`, `venezuela`, `vietnam`, `zambia`, `zimbabwe` | | `time_window` | **Description:** Time window to filter on.
**Default:** `today`
**Values:** `today`, `yesterday`,`this_week`, `last_week`, `this_month`, `last_month`, `this_year`, `last_year` | | `limit` | **Description:** Number of items to return.
**Default:** `10`
**Values:** Integer greater than 0 | diff --git a/modules/flixpatrol.py b/modules/flixpatrol.py index 437903a7..182be0a6 100644 --- a/modules/flixpatrol.py +++ b/modules/flixpatrol.py @@ -26,7 +26,7 @@ locations = [ "united_kingdom", "united_states", "uruguay", "uzbekistan", "venezuela", "vietnam", "zambia", "zimbabwe" ] popular = ["movie_db", "facebook", "google", "twitter", "twitter_trends", "instagram", "instagram_trends", "youtube", "imdb", "letterboxd", "rotten_tomatoes", "tmdb", "trakt"] -platforms = ["netflix", "hbo", "disney", "amazon", "itunes", "google", "paramount_plus", "hulu", "vudu", "imdb", "amazon_prime", "star_plus"] +platforms = ["netflix", "hbo", "disney", "amazon", "itunes", "google", "paramount_plus", "hulu", "vudu", "imdb", "amazon_prime", "star_plus", "apple_plus"] base_url = "https://flixpatrol.com" urls = { "top10": f"{base_url}/top10/",