diff --git a/VERSION b/VERSION index d5687609..57e4b1fd 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.19.1-develop45 +1.19.1-develop46 diff --git a/docs/builders/imdb.md b/docs/builders/imdb.md index 293cee3c..8312d139 100644 --- a/docs/builders/imdb.md +++ b/docs/builders/imdb.md @@ -2,12 +2,13 @@ You can find items using the features of [IMDb.com](https://www.imdb.com/) (IMDb). -| Attribute | Description | Works with Movies | Works with Shows | Works with Playlists and Custom Sort | -|:------------------------------------|:----------------------------------------------------------------------------------------------------------------------------------------------------------|:-----------------:|:----------------:|:------------------------------------:| -| [`imdb_id`](#imdb-id) | Gets the movie/show specified. | ✅ | ✅ | ❌ | -| [`imdb_chart`](#imdb-chart) | Gets every movie/show in an IMDb Chart like [IMDb Top 250 Movies](https://www.imdb.com/chart/top). | ✅ | ✅ | ✅ | -| [`imdb_list`](#imdb-list) | Gets every movie/show in an IMDb List, [IMDb Keyword Search](https://www.imdb.com/search/keyword/), or [IMDb Search](https://www.imdb.com/search/title/). | ✅ | ✅ | ✅ | -| [`imdb_watchlist`](#imdb-watchlist) | Gets every movie/show in an IMDb User's Watchlist. | ✅ | ✅ | ✅ | +| Attribute | Description | Works with Movies | Works with Shows | Works with Playlists and Custom Sort | +|:------------------------------------|:---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|:-----------------:|:----------------:|:------------------------------------:| +| [`imdb_id`](#imdb-id) | Gets the movie/show specified. | ✅ | ✅ | ❌ | +| [`imdb_chart`](#imdb-chart) | Gets every movie/show in an IMDb Chart like [IMDb Top 250 Movies](https://www.imdb.com/chart/top). | ✅ | ✅ | ✅ | +| [`imdb_list`](#imdb-list) | Gets every movie/show in an IMDb List or [IMDb Keyword Search](https://www.imdb.com/search/keyword/). | ✅ | ✅ | ✅ | +| [`imdb_watchlist`](#imdb-watchlist) | Gets every movie/show in an IMDb User's Watchlist. | ✅ | ✅ | ✅ | +| [`imdb_search`](#imdb-search) | Gets every movie/show in an [IMDb Search](https://www.imdb.com/search/title/). | ✅ | ✅ | ✅ | ## IMDb ID @@ -188,8 +189,7 @@ The `sync_mode: sync` and `collection_order: custom` Details are recommended sin | `keyword` | Item must match with every given keyword. Can be a comma-separated list.
**Options:** Any String | | `keyword.any` | Item must match at least one given keyword. Can be a comma-separated list.
**Options:** Any String | | `keyword.not` | Item must not match any given keyword. Can be a comma-separated list.
**Options:** Any String | -| `series` | Item must match with every given series. Can be a comma-separated list.
**Options:** Any IMDb ID (ex. `tt0096697`) | -| `series.any` | Item must match at least one given series. Can be a comma-separated list.
**Options:** Any IMDb ID (ex. `tt0096697`) | +| `series` | Item must match at least one given series. Can be a comma-separated list.
**Options:** Any IMDb ID (ex. `tt0096697`) | | `series.not` | Item must not match any given series. Can be a comma-separated list.
**Options:** Any IMDb ID (ex. `tt0096697`) | | `list` | Item must be on every given list. Can be a comma-separated list.
**Options:** Any IMDb List ID (ex. `ls000024621`) | | `list.any` | Item must be on at least one given lists. Can be a comma-separated list.
**Options:** Any IMDb List ID (ex. `ls000024621`) | @@ -244,7 +244,7 @@ collections: imdb_search: type: tv_episode series: tt0096697 - sort: rating.desc + sort_by: rating.desc limit: 100 summary: The top 100 Simpsons episodes by IMDb user rating ``` diff --git a/mkdocs.yml b/mkdocs.yml index 0a5af74f..b9703c40 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -107,7 +107,7 @@ nav: - Installing PMM: pmm/install/installation.md - Installation Guides: - Local Walkthrough (Win/Mac/Linux): pmm/install/guides/local.md - - Docker Walkhrough: pmm/install/guides/docker.md + - Docker Walkthrough: pmm/install/guides/docker.md - unRAID Walkthrough: pmm/install/guides/unraid.md - Kubernetes Walkthrough: pmm/install/guides/kubernetes.md - QNAP Walkthrough: pmm/install/guides/qnap.md diff --git a/modules/builder.py b/modules/builder.py index 56d08eaf..a1d7195c 100644 --- a/modules/builder.py +++ b/modules/builder.py @@ -143,13 +143,14 @@ smart_url_invalid = ["filters", "run_again", "sync_mode", "show_filtered", "show custom_sort_builders = [ "plex_search", "plex_watchlist", "plex_pilots", "tmdb_list", "tmdb_popular", "tmdb_now_playing", "tmdb_top_rated", "tmdb_trending_daily", "tmdb_trending_weekly", "tmdb_discover", "reciperr_list", "trakt_chart", "trakt_userlist", - "tvdb_list", "imdb_chart", "imdb_list", "imdb_watchlist", "stevenlu_popular", "anidb_popular", "tmdb_upcoming", "tmdb_airing_today", - "tmdb_on_the_air", "trakt_list", "trakt_watchlist", "trakt_collection", "trakt_trending", "trakt_popular", "trakt_boxoffice", - "trakt_collected_daily", "trakt_collected_weekly", "trakt_collected_monthly", "trakt_collected_yearly", "trakt_collected_all", - "flixpatrol_top", "trakt_recommendations", - "trakt_recommended_personal", "trakt_recommended_daily", "trakt_recommended_weekly", "trakt_recommended_monthly", "trakt_recommended_yearly", "trakt_recommended_all", - "trakt_watched_daily", "trakt_watched_weekly", "trakt_watched_monthly", "trakt_watched_yearly", "trakt_watched_all", - "tautulli_popular", "tautulli_watched", "mdblist_list", "letterboxd_list", "icheckmovies_list", + "tvdb_list", "imdb_chart", "imdb_list", "imdb_search", "imdb_watchlist", "stevenlu_popular", "anidb_popular", + "tmdb_upcoming", "tmdb_airing_today", "tmdb_on_the_air", "trakt_list", "trakt_watchlist", "trakt_collection", + "trakt_trending", "trakt_popular", "trakt_boxoffice", "trakt_collected_daily", "trakt_collected_weekly", + "trakt_collected_monthly", "trakt_collected_yearly", "trakt_collected_all", "trakt_recommendations", + "trakt_recommended_personal", "trakt_recommended_daily", "trakt_recommended_weekly", "trakt_recommended_monthly", + "trakt_recommended_yearly", "trakt_recommended_all", "trakt_watched_daily", "trakt_watched_weekly", + "trakt_watched_monthly", "trakt_watched_yearly", "trakt_watched_all", + "tautulli_popular", "tautulli_watched", "mdblist_list", "letterboxd_list", "icheckmovies_list", "flixpatrol_top", "anilist_top_rated", "anilist_popular", "anilist_trending", "anilist_search", "anilist_userlist", "mal_all", "mal_airing", "mal_upcoming", "mal_tv", "mal_movie", "mal_ova", "mal_special", "mal_search", "mal_popular", "mal_favorite", "mal_suggested", "mal_userlist", "mal_season", "mal_genre", "mal_studio" @@ -162,8 +163,8 @@ overlay_attributes = [ parts_collection_valid = [ "filters", "plex_all", "plex_search", "trakt_list", "trakt_list_details", "collection_filtering", "collection_mode", "label", "visible_library", "limit", "visible_home", "visible_shared", "show_missing", "save_report", "missing_only_released", "server_preroll", "changes_webhooks", - "item_lock_background", "item_lock_poster", "item_lock_title", "item_refresh", "item_refresh_delay", "imdb_list", "cache_builders", - "url_theme", "file_theme", "item_label", "default_percent" + "item_lock_background", "item_lock_poster", "item_lock_title", "item_refresh", "item_refresh_delay", "imdb_list", "imdb_search", + "cache_builders", "url_theme", "file_theme", "item_label", "default_percent" ] + episode_parts_only + summary_details + poster_details + background_details + string_details playlist_attributes = [ "filters", "name_mapping", "show_filtered", "show_missing", "save_report", "allowed_library_types", "run_definition", diff --git a/modules/imdb.py b/modules/imdb.py index 56d74561..4cd0f0de 100644 --- a/modules/imdb.py +++ b/modules/imdb.py @@ -20,7 +20,7 @@ charts = { } imdb_search_attributes = [ "limit", "sort_by", "title", "type", "type.not", "release.after", "release.before", "rating.gte", "rating.lte", - "votes.gte", "votes.lte", "genre", "genre.any", "genre.not", "event", "event.winning", "series", "series.any", "series.not", + "votes.gte", "votes.lte", "genre", "genre.any", "genre.not", "event", "event.winning", "series", "series.not", "imdb_top", "imdb_bottom", "company", "content_rating", "country", "country.any", "country.not", "country.origin", "keyword", "keyword.any", "keyword.not", "language", "language.any", "language.not", "language.primary", "popularity.gte", "popularity.lte", "cast", "cast.any", "cast.not", "runtime.gte", "runtime.lte", "adult", @@ -278,12 +278,10 @@ class IMDb: ranges.append({"rankRange": num_range, "rankedTitleListType": "TITLE_METER"}) out["rankedTitleListConstraint"] = {"allRankedTitleLists": ranges} - if any([a in data for a in ["series", "series.any", "series.not"]]): + if any([a in data for a in ["series", "series.not"]]): out["episodicConstraint"] = {} if "series" in data: - out["episodicConstraint"]["allSeriesIds"] = data["series"] - if "series.any" in data: - out["episodicConstraint"]["anySeriesIds"] = data["series.any"] + out["episodicConstraint"]["anySeriesIds"] = data["series"] if "series.not" in data: out["episodicConstraint"]["excludeSeriesIds"] = data["series.not"]