From 76ca50e67e4a3cc38d18625a382a4747ea678140 Mon Sep 17 00:00:00 2001 From: 0x5f3 <104367919+0x5f3@users.noreply.github.com> Date: Mon, 26 Feb 2024 13:21:17 +0000 Subject: [PATCH] added Blaxploitation, LGBTQ+, Nunsploitation, Parody subgenre collections; subgenre collection rename Black Comedy to Dark Comedy; optimise subgenre collection scraping; fix scheduling issue --- 0x5f3/MOVIES.md | 8 +- 0x5f3/README.md | 2 +- 0x5f3/{config.yml => _config.yml} | 20 +-- 0x5f3/_debug.yml | 17 +-- 0x5f3/_movie.yml | 12 +- 0x5f3/_show.yml | 8 +- 0x5f3/collections/movie/130_subgenre_top.yml | 139 ++++++++++++++----- 0x5f3/collections/movie/200_collections.yml | 8 +- 8 files changed, 147 insertions(+), 67 deletions(-) rename 0x5f3/{config.yml => _config.yml} (94%) diff --git a/0x5f3/MOVIES.md b/0x5f3/MOVIES.md index 9d4fc12..f095334 100644 --- a/0x5f3/MOVIES.md +++ b/0x5f3/MOVIES.md @@ -146,10 +146,10 @@ - Top Rated in Animatronic - Top Rated in Anti-Hero - Top Rated in Apocalypse - - Top Rated in Artifical Intelligence + - Top Rated in Artificial Intelligence - Top Rated in Assassins - Top Rated in Betrayal - - Top Rated in Black Comedy + - Top Rated in Blaxploitation - Top Rated in Boxing - Top Rated in Bugs - Top Rated in Cannibals @@ -163,6 +163,7 @@ - Top Rated in Costume Drama - Top Rated in Courtroom - Top Rated in Cyberpunk + - Top Rated in Dark Comedy - Top Rated in Dark Fantasy - Top Rated in Demonic - Top Rated in Detective @@ -187,6 +188,7 @@ - Top Rated in Historical Event - Top Rated in Hostage - Top Rated in Hustle + - Top Rated in LGBTQ+ - Top Rated in Martial-Arts - Top Rated in Medical - Top Rated in Medieval @@ -199,11 +201,13 @@ - Top Rated in Naval - Top Rated in Ninjas - Top Rated in Novel + - Top Rated in Nunsploitation - Top Rated in Occult - Top Rated in Outerspace - Top Rated in Outlaw - Top Rated in Pandemic - Top Rated in Paranormal + - Top Rated in Parody - Top Rated in Period Drama - Top Rated in Petrolhead - Top Rated in Philosophical diff --git a/0x5f3/README.md b/0x5f3/README.md index 10c61ed..2837599 100644 --- a/0x5f3/README.md +++ b/0x5f3/README.md @@ -48,4 +48,4 @@ The parental configuration adds a 'Parental' label to their collections and all # ###### A successful run will result in something similar to this: ![movies](https://raw.githubusercontent.com/0x5f3/pmm.config/main/assets/_/_movies.png) -![shows](https://raw.githubusercontent.com/0x5f3/pmm.config/main/assets/_/_shows.png) +![shows](https://raw.githubusercontent.com/0x5f3/pmm.config/main/assets/_/_shows.png) \ No newline at end of file diff --git a/0x5f3/config.yml b/0x5f3/_config.yml similarity index 94% rename from 0x5f3/config.yml rename to 0x5f3/_config.yml index 02462f0..4cc6a29 100644 --- a/0x5f3/config.yml +++ b/0x5f3/_config.yml @@ -25,19 +25,19 @@ libraries: - file: config/collections/movie/030_watched.yml - file: config/collections/movie/040_seasonal.yml - file: config/collections/movie/080_year_top.yml - - schedule: weekly(monday) + schedule: weekly(monday) - file: config/collections/movie/090_decades_top.yml - - schedule: weekly(tuesday) + schedule: weekly(tuesday) # - file: config/collections/movie/100_awards.yml -# - schedule: weekly(wednesday) +# schedule: weekly(wednesday) - file: config/collections/movie/110_genre_popular.yml - file: config/collections/movie/120_genre_top.yml - - schedule: weekly(thursday) + schedule: weekly(thursday) # - file: config/collections/movie/130_subgenre_top.yml # - file: config/collections/movie/140_studio.yml -# - schedule: weekly(wednesday) +# schedule: weekly(wednesday) # - file: config/collections/movie/200_collections.yml -# - schedule: weekly(sunday) +# schedule: weekly(sunday) # - file: config/collections/movie/050_parental_sync.yml # - file: config/collections/movie/050_parental.yml # - file: config/collections/movie/060_documentary.yml @@ -65,14 +65,14 @@ libraries: # - file: config/collections/show/020_unwatched.yml - file: config/collections/show/030_watched.yml - file: config/collections/show/060_year_top.yml - - schedule: weekly(monday) + schedule: weekly(monday) - file: config/collections/show/070_decades_top.yml - - schedule: weekly(wednesday) + schedule: weekly(wednesday) # - file: config/collections/show/080_awards.yml -# - schedule: weekly(thursday) +# schedule: weekly(thursday) - file: config/collections/show/090_genre_popular.yml - file: config/collections/show/100_genre_top.yml - - schedule: weekly(saturday) + schedule: weekly(saturday) # - file: config/collections/show/110_network.yml # - file: config/collections/show/040_parental_sync.yml # - file: config/collections/show/040_parental.yml diff --git a/0x5f3/_debug.yml b/0x5f3/_debug.yml index 46faf56..b73815a 100644 --- a/0x5f3/_debug.yml +++ b/0x5f3/_debug.yml @@ -14,20 +14,21 @@ settings: asset_depth: 0 asset_directory: asset_folders: false - cache: false + cache: true cache_expiration: 60 check_nightly: false create_asset_folders: false custom_repo: default_collection_order: - delete_below_minimum: true + delete_below_minimum: false delete_not_scheduled: false dimensional_asset_rename: false - download_url_assets: false + download_url_assets: true ignore_ids: ignore_imdb_ids: + item_refresh: false item_refresh_delay: 0 - minimum_items: 0 + minimum_items: 2 missing_only_released: false only_filter_missing: false playlist_exclude_users: @@ -35,11 +36,11 @@ settings: playlist_sync_to_users: all prioritize_assets: false released_missing_only: false - run_again_delay: 2 + run_again_delay: 5 run_order: - - operations - - metadata - collections + - metadata + - operations - overlays save_missing: false show_asset_not_needed: true @@ -103,4 +104,4 @@ mdblist: trakt: client_id: client_secret: - pin: + pin: \ No newline at end of file diff --git a/0x5f3/_movie.yml b/0x5f3/_movie.yml index a1b55ca..697de36 100644 --- a/0x5f3/_movie.yml +++ b/0x5f3/_movie.yml @@ -14,19 +14,19 @@ libraries: - file: config/collections/movie/030_watched.yml - file: config/collections/movie/040_seasonal.yml - file: config/collections/movie/080_year_top.yml - - schedule: weekly(monday) + schedule: weekly(monday) - file: config/collections/movie/090_decades_top.yml - - schedule: weekly(tuesday) + schedule: weekly(tuesday) # - file: config/collections/movie/100_awards.yml -# - schedule: weekly(wednesday) +# schedule: weekly(wednesday) - file: config/collections/movie/110_genre_popular.yml - file: config/collections/movie/120_genre_top.yml - - schedule: weekly(thursday) + schedule: weekly(thursday) # - file: config/collections/movie/130_subgenre_top.yml # - file: config/collections/movie/140_studio.yml -# - schedule: weekly(wednesday) +# schedule: weekly(wednesday) # - file: config/collections/movie/200_collections.yml -# - schedule: weekly(sunday) +# schedule: weekly(sunday) # - file: config/collections/movie/050_parental_sync.yml # - file: config/collections/movie/050_parental.yml # - file: config/collections/movie/060_documentary.yml diff --git a/0x5f3/_show.yml b/0x5f3/_show.yml index 65e2e69..44192cb 100644 --- a/0x5f3/_show.yml +++ b/0x5f3/_show.yml @@ -13,14 +13,14 @@ libraries: # - file: config/collections/show/020_unwatched.yml - file: config/collections/show/030_watched.yml - file: config/collections/show/060_year_top.yml - - schedule: weekly(monday) + schedule: weekly(monday) - file: config/collections/show/070_decades_top.yml - - schedule: weekly(wednesday) + schedule: weekly(wednesday) # - file: config/collections/show/080_awards.yml -# - schedule: weekly(thursday) +# schedule: weekly(thursday) - file: config/collections/show/090_genre_popular.yml - file: config/collections/show/100_genre_top.yml - - schedule: weekly(saturday) + schedule: weekly(saturday) # - file: config/collections/show/110_network.yml # - file: config/collections/show/040_parental_sync.yml # - file: config/collections/show/040_parental.yml diff --git a/0x5f3/collections/movie/130_subgenre_top.yml b/0x5f3/collections/movie/130_subgenre_top.yml index 6655cd9..c821a9c 100644 --- a/0x5f3/collections/movie/130_subgenre_top.yml +++ b/0x5f3/collections/movie/130_subgenre_top.yml @@ -18,7 +18,7 @@ templates: keyword.any: <> keyword: <> language: <> - limit: 500 + limit: 250 rating.gte: <> sort_by: rating.desc type: <> @@ -29,13 +29,19 @@ templates: - <> - <> - <> - letterboxd_list: - - https://letterboxd.com/ediblehedgehog/list/<>/by/rating/ - - <> - - <> - - <> - - <> - - <> + letterboxd_list_details: + - url: https://letterboxd.com/ediblehedgehog/list/<>/by/rating/ + limit: 250 + - url: <> + limit: <> + - url: <> + limit: <> + - url: <> + limit: <> + - url: <> + limit: <> + - url: <> + limit: <> trakt_list: - <> - <> @@ -52,11 +58,16 @@ templates: - imdb_extra_5 - keyword - keyword.any - - letterboxd_extra_1 - - letterboxd_extra_2 - - letterboxd_extra_3 - - letterboxd_extra_4 - - letterboxd_extra_5 + - letterboxd_list_details_url_1 + - letterboxd_list_details_url_2 + - letterboxd_list_details_url_3 + - letterboxd_list_details_url_4 + - letterboxd_list_details_url_5 + - letterboxd_list_details_limit_1 + - letterboxd_list_details_limit_2 + - letterboxd_list_details_limit_3 + - letterboxd_list_details_limit_4 + - letterboxd_list_details_limit_5 - trakt_extra_1 - trakt_extra_2 - trakt_extra_3 @@ -190,19 +201,18 @@ collections: votes.gte: 1000 } - "Top Rated in Black Comedy": - url_poster: https://raw.githubusercontent.com/0x5f3/pmm.config/assets/_subgenre_top/subgenre_top_black-comedy.png + "Top Rated in Blaxploitation": + url_poster: https://raw.githubusercontent.com/0x5f3/pmm.config/assets/_subgenre_top/subgenre_top_blaxploitation.png schedule: weekly(monday) - summary: "Top rated movies in Black Comedy" + summary: "Top rated movies in Blaxploitation" template: { - genre: "comedy", - keyword: "black-comedy", + keyword: "blaxploitation", language: "en", - letterboxd_list: "theme-black-comedy", + letterboxd_list: "theme-blaxploitation", name: sub_genre, - rating.gte: 5, + rating.gte: 2, type: "movie,tv_movie", - votes.gte: 1000 + votes.gte: 100 } "Top Rated in Boxing": @@ -268,8 +278,10 @@ collections: template: { keyword: "chick-flick", language: "en", - letterboxd_extra_1: "https://letterboxd.com/akookieforyou/list/chick-flicks/by/rating/", - letterboxd_extra_2: "https://letterboxd.com/marialuisacctc/list/women-have-superior-taste-that-is-why-these/by/rating/", + letterboxd_list_details_url_1: "https://letterboxd.com/akookieforyou/list/chick-flicks/by/rating/", + letterboxd_list_details_limit_1: 250, + letterboxd_list_details_url_2: "https://letterboxd.com/marialuisacctc/list/women-have-superior-taste-that-is-why-these/by/rating/", + letterboxd_list_details_limit_2: 250, letterboxd_list: "theme-chick-flick", name: sub_genre, rating.gte: 5, @@ -389,6 +401,21 @@ collections: votes.gte: 1000 } + "Top Rated in Dark Comedy": + url_poster: https://raw.githubusercontent.com/0x5f3/pmm.config/assets/_subgenre_top/subgenre_top_dark-comedy.png + schedule: weekly(tuesday) + summary: "Top rated movies in Dark Comedy" + template: { + genre: "comedy", + keyword.any: "black-comedy,dark-comedy", + language: "en", + letterboxd_list: "theme-dark-comedy", + name: sub_genre, + rating.gte: 5, + type: "movie,tv_movie", + votes.gte: 1000 + } + "Top Rated in Dark Fantasy": url_poster: https://raw.githubusercontent.com/0x5f3/pmm.config/assets/_subgenre_top/subgenre_top_dark-fantasy.png schedule: weekly(tuesday) @@ -536,7 +563,8 @@ collections: template: { keyword: "exploitation-film", language: "en", - letterboxd_extra_1: "https://letterboxd.com/axeman/list/exploitation/by/rating/", + letterboxd_list_details_url_1: "https://letterboxd.com/axeman/list/exploitation/by/rating/", + letterboxd_list_details_limit_1: 250, letterboxd_list: "theme-exploitation", name: sub_genre, rating.gte: 3, @@ -653,7 +681,8 @@ collections: template: { keyword: "grindhouse", language: "en", - letterboxd_extra_1: "https://letterboxd.com/narpjay/list/exploitation-films-b-movie-cheese-grindhouse/by/rating/", + letterboxd_list_details_url_1: "https://letterboxd.com/narpjay/list/exploitation-films-b-movie-cheese-grindhouse/by/rating/", + letterboxd_list_details_limit_1: 250, letterboxd_list: "theme-grindhouse", name: sub_genre, rating.gte: 2, @@ -732,6 +761,20 @@ collections: votes.gte: 1000 } + "Top Rated in LGBTQ+": + url_poster: https://raw.githubusercontent.com/0x5f3/pmm.config/assets/_subgenre_top/subgenre_top_lgbtq.png + schedule: weekly(wednesday) + summary: "Top rated movies in LGBTQ+" + template: { + keyword.any: "lgbt,lgbtq,lgbtqi,lgbtqia,gay,lesbianism,homosexuality,gay-interest", + language: "en", + letterboxd_list: "theme-lgbtq", + name: sub_genre, + rating.gte: 5, + type: "movie,tv_movie", + votes.gte: 1000 + } + "Top Rated in Martial-Arts": url_poster: https://raw.githubusercontent.com/0x5f3/pmm.config/assets/_subgenre_top/subgenre_top_martial-arts.png schedule: weekly(wednesday) @@ -908,6 +951,20 @@ collections: votes.gte: 1000 } + "Top Rated in Nunsploitation": + url_poster: https://raw.githubusercontent.com/0x5f3/pmm.config/assets/_subgenre_top/subgenre_top_nunsploitation.png + schedule: weekly(thursday) + summary: "Top rated movies in Nunsploitation" + template: { + keyword: "nunsploitation", + language: "en", + letterboxd_list: "theme-nunsploitation", + name: sub_genre, + rating.gte: 2, + type: "movie,tv_movie", + votes.gte: 100 + } + "Top Rated in Occult": url_poster: https://raw.githubusercontent.com/0x5f3/pmm.config/assets/_subgenre_top/subgenre_top_occult.png schedule: weekly(thursday) @@ -979,6 +1036,20 @@ collections: votes.gte: 1000 } + "Top Rated in Parody": + url_poster: https://raw.githubusercontent.com/0x5f3/pmm.config/assets/_subgenre_top/subgenre_top_parody.png + schedule: weekly(thursday) + summary: "Top rated movies in Parody" + template: { + keyword.any: "parody,parody-comedy", + language: "en", + letterboxd_list: "theme-parody", + name: sub_genre, + rating.gte: 5, + type: "movie,tv_movie", + votes.gte: 1000 + } + "Top Rated in Period Drama": url_poster: https://raw.githubusercontent.com/0x5f3/pmm.config/assets/_subgenre_top/subgenre_top_period-drama.png schedule: weekly(friday) @@ -1057,7 +1128,8 @@ collections: template: { keyword: "prehistoric-times", language: "en", - letterboxd_extra_1: "https://letterboxd.com/mikkelhh/list/before-civilization-prehistoric-films/by/rating/", + letterboxd_list_details_url_1: "https://letterboxd.com/mikkelhh/list/before-civilization-prehistoric-films/by/rating/", + letterboxd_list_details_limit_1: 250, letterboxd_list: "theme-prehistoric", name: sub_genre, rating.gte: 2, @@ -1098,7 +1170,7 @@ collections: schedule: weekly(friday) summary: "Top rated movies in Psychological" template: { - keyword: "psychological", + keyword.any: "psychological,psychological-horror", language: "en", letterboxd_list: "theme-psychological", name: sub_genre, @@ -1128,7 +1200,8 @@ collections: template: { keyword: "remake", language: "en", - letterboxd_extra_1: "https://letterboxd.com/l_shelby/list/remakes/by/rating/", + letterboxd_list_details_url_1: "https://letterboxd.com/l_shelby/list/remakes/by/rating/", + letterboxd_list_details_limit_1: 250, letterboxd_list: "theme-remake", name: sub_genre, rating.gte: 5, @@ -1205,7 +1278,8 @@ collections: template: { keyword: "samurai,sword-fight", language: "en", - letterboxd_extra_1: "https://letterboxd.com/jhcrotinger/list/samurai/by/rating/", + letterboxd_list_details_url_1: "https://letterboxd.com/jhcrotinger/list/samurai/by/rating/", + letterboxd_list_details_limit_1: 250, letterboxd_list: "theme-samurai", name: sub_genre, rating.gte: 2, @@ -1338,7 +1412,8 @@ collections: template: { keyword: "stop-motion", language: "en", - letterboxd_extra_1: "https://letterboxd.com/savage_/list/stop-motion/by/rating/", + letterboxd_list_details_url_1: "https://letterboxd.com/savage_/list/stop-motion/by/rating/", + letterboxd_list_details_limit_1: 250, letterboxd_list: "theme-stop-motion", name: sub_genre, rating.gte: 5, @@ -1383,7 +1458,7 @@ collections: language: "en", letterboxd_list: "theme-surrealism", name: sub_genre, - rating.gte: 5, + rating.gte: 7, type: "movie,tv_movie", votes.gte: 1000 } @@ -1617,4 +1692,4 @@ collections: rating.gte: 5, type: "movie,tv_movie", votes.gte: 1000 - } \ No newline at end of file + } diff --git a/0x5f3/collections/movie/200_collections.yml b/0x5f3/collections/movie/200_collections.yml index 0f35bb9..8080476 100644 --- a/0x5f3/collections/movie/200_collections.yml +++ b/0x5f3/collections/movie/200_collections.yml @@ -1,12 +1,12 @@ ## _collections.yml default_template: - delete_not_scheduled: false - minimum_items: 2 tmdb_collection_details: +200_<> + minimum_items: 2 + delete_not_scheduled: false dynamic_collections: TMDb Collections: - remove_prefix: The + type: tmdb_collection remove_suffix: Collection - type: tmdb_collection \ No newline at end of file + remove_prefix: The \ No newline at end of file