From b6c1548a061ba5e028b0e85c910780865fa2cdb3 Mon Sep 17 00:00:00 2001 From: meisnate12 Date: Sat, 4 Mar 2023 20:01:11 -0500 Subject: [PATCH] [119] fix flixpatrol and images --- VERSION | 2 +- docs/metadata/builders/flixpatrol.md | 2 +- modules/flixpatrol.py | 2 +- modules/meta.py | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/VERSION b/VERSION index c145087c..750f4480 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.18.3-develop118 +1.18.3-develop119 diff --git a/docs/metadata/builders/flixpatrol.md b/docs/metadata/builders/flixpatrol.md index 81b38c50..a855fac6 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, apple_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_tv` | | `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 182be0a6..315549c9 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", "apple_plus"] +platforms = ["netflix", "hbo", "disney", "amazon", "itunes", "google", "paramount_plus", "hulu", "vudu", "imdb", "amazon_prime", "star_plus", "apple_tv"] base_url = "https://flixpatrol.com" urls = { "top10": f"{base_url}/top10/", diff --git a/modules/meta.py b/modules/meta.py index 1005883a..996d6917 100644 --- a/modules/meta.py +++ b/modules/meta.py @@ -649,7 +649,7 @@ class MetadataFile(DataFile): if "collections" in set_data and set_data["collections"]: self.set_collections[set_key] = set_data["collections"] image_set = self.temp_vars[methods[f"set_file_{set_key}"]] if f"set_file_{set_key}" in methods else styles[style] - for item_name, item_data in set_data: + for item_name, item_data in set_data.items(): if item_name in ["styles", "collections"]: continue if isinstance(item_data, dict): @@ -1538,7 +1538,7 @@ class MetadataFile(DataFile): self.library.image_sets[set_name] = temp_data["set"] set_key = meta[methods["set"]] if "set" in methods else None if set_key and set_key in self.set_collections and "collections" in temp_data and temp_data["collections"]: - for k, alts in self.set_collections.items(): + for k, alts in self.set_collections[set_key].items(): if k in temp_data["collections"]: self.library.collection_images[k] = temp_data["collections"][k] for alt in alts: