From 48a6083eb2739e4c2bdbb48c04fca8e58c9db616 Mon Sep 17 00:00:00 2001 From: meisnate12 Date: Wed, 7 Dec 2022 14:44:15 -0500 Subject: [PATCH] [45] update old mal builders --- VERSION | 2 +- defaults/README.md | 620 ---------------------------------- defaults/chart/flixpatrol.yml | 1 - modules/builder.py | 16 +- modules/mal.py | 22 +- modules/meta.py | 20 +- plex_meta_manager.py | 3 +- 7 files changed, 27 insertions(+), 657 deletions(-) delete mode 100644 defaults/README.md diff --git a/VERSION b/VERSION index 3edaa90d..74e91b48 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.18.0-develop44 +1.18.0-develop45 diff --git a/defaults/README.md b/defaults/README.md deleted file mode 100644 index 27475f66..00000000 --- a/defaults/README.md +++ /dev/null @@ -1,620 +0,0 @@ -# Default Collections & Overlays - -Plex Meta Manager includes a pre-created set of Metadata Files and Overlay Files which can be found in the "defaults" folder in the root of your Plex Meta Manager installation directory. - -These files offer an easy-to-use and customizable set of Collections and Overlays that the user can achieve without having to worry about creating the files that makes the collections and overlays possible. - -All Collections come with a matching poster to make a clean, consistent set of collections in your library. These files are stored in the [Plex Meta Manager Images](https://github.com/meisnate12/Plex-Meta-Manager-Images) Repository and each poster is downloaded straight to your Plex Collection when you run Plex Meta Manager. - -It should be noted that users running the on [nightly branch](https://metamanager.wiki/en/nightly/home/kb.html#how-do-i-switch-to-the-nightly-branch) of Plex Meta Manager will receive all updates to the PMM Defaults as soon as they are published via [GitHub](https://github.com/meisnate12/Plex-Meta-Manager-Configs/tree/master/PMM), which may at times involve bugs or implementations that need to be further addressed. Users of the [develop](https://metamanager.wiki/en/nightly/home/kb.html#how-do-i-switch-to-the-develop-branch) and [master](https://metamanager.wiki/en/nightly/home/kb.html#how-do-i-switch-back-to-the-master-branch) branches will only receive updated Defaults files when an update to Plex Meta Manager is released - this helps to protect to keep these branches stable and prevent bugs from reaching the wider user-base. - -Credits to Bullmoose20 and Yozora for helping drive this entire Default Set of Configs through the concept, design and implementation. - -Special thanks to Magic815 for the overlay image inspiration and base template. - -Please consider [donating](https://github.com/sponsors/meisnate12) towards the project. - - -## Example Collection Configuration - -To run a defaults metadata file, you can simply add it to your `metadata_path` using `pmm:` like so: - -```yaml -libraries: - Movies: - metadata_path: - - pmm: tmdb - - pmm: bafta -``` - -A full list of the available metadata files can be found [HERE](LINK NEEDED) - -## Example Overlay Configurations - -To run a defaults OVERLAY file, you can simply add it to your `overlay_path` using `pmm:` like so: - -```yaml -libraries: - Movies: - overlay_path: - - remove_overlays: false - - pmm: ribbon - - pmm: ratings -``` -A full list of the available overlay files can be found [HERE](LINK NEEDED) - -### Example Poster Overlays - -![](movie-overlays1-annotated.png) -![](movie-overlays2-annotated.png) -
- Click to expand sample config.yml Movies overlays section: - -```yaml -libraries: - Movies: - overlay_path: - - remove_overlays: false - - reapply_overlay: true - - pmm: resolution # 1 - - pmm: audio_codec # 2 - - pmm: mediastinger # 3 - - pmm: special_release # 4 - - pmm: ratings # 5, 6, 7 - template_variables: - rating1: user # 5 as this is user and mass_user_rating_update: mdb_tomatoes - rating1_image: rt_tomato # 5 as this is user and mass_user_rating_update: mdb_tomatoes - rating1_font: config/metadata/overlays/fonts/Adlib.ttf # 5 local font accessible to PMM - rating1_font_size: 63 # 5 adjusted font size to fit rating - - rating2: critic # 6 as this is critic and mass_critic_rating_update: imdb - rating2_image: imdb # 6 as this is critic and mass_critic_rating_update: imdb - rating2_font: config/metadata/overlays/fonts/Impact.ttf # 6 local font accessible to PMM - rating2_font_size: 70 # 6 adjusted font size to fit rating - - rating3: audience # 7 as this is audience and mass_audience_rating_update: tmdb - rating3_image: tmdb # 7 as this is audience and mass_audience_rating_update: tmdb - rating3_font: config/metadata/overlays/fonts/Avenir_95_Black.ttf # 7 local font accessible to PMM - rating3_font_size: 70 # 7 adjusted font size to fit rating - - horizontal_position: right # the set of ratings is on the right of the poster - - pmm: streaming # 8 - - pmm: video_format # 9 - - pmm: audio_language # 10 - - pmm: ribbon # 11, 12 Bottom right sash is used by more than one overlay so a weight for priority can be applied - - operations: - mass_user_rating_update: mdb_tomatoes # 5 This operation will update the user rating in plex with Rotten Tomatoes ratings information - mass_critic_rating_update: imdb # 6 This operation will update the critic rating in plex with IMDb ratings information - mass_audience_rating_update: tmdb # 7 This operation will update the audience rating in plex with TMDb ratings information -``` -
- -### Example TV Shows - Show Overlays - -![](tvshow-poster-annotated.png) -
- Click to expand sample config.yml TV Shows overlays section for the Show Poster: - -```yaml -libraries: - TV Shows: - overlay_path: - - remove_overlays: false - - reapply_overlay: true - - pmm: resolution # 1 - - pmm: audio_codec # 2 - - pmm: mediastinger # 3 - - pmm: ratings # 4, 5, 6 - template_variables: - rating1: user # 4 as this is user and mass_user_rating_update: mdb_tomatoes - rating1_image: rt_tomato # 4 as this is user and mass_user_rating_update: mdb_tomatoes - rating1_font: config/metadata/overlays/fonts/Adlib.ttf # 4 local font accessible to PMM - rating1_font_size: 63 # 4 adjusted font size to fit rating - - rating2: critic # 5 as this is critic and mass_critic_rating_update: imdb - rating2_image: imdb # 5 as this is critic and mass_critic_rating_update: imdb - rating2_font: config/metadata/overlays/fonts/Impact.ttf # 5 local font accessible to PMM - rating2_font_size: 70 # 5 adjusted font size to fit rating - - rating3: audience # 6 as this is audience and mass_audience_rating_update: tmdb - rating3_image: tmdb # 6 as this is audience and mass_audience_rating_update: tmdb - rating3_font: config/metadata/overlays/fonts/Avenir_95_Black.ttf # 6 local font accessible to PMM - rating3_font_size: 70 # 6 adjusted font size to fit rating - - horizontal_position: right # the set of ratings is on the right of the poster - - pmm: overlays/streaming # 7 - - pmm: overlays/video_format # 8 - - pmm: ribbon # 10, 11 Bottom right sash is used by more than one overlay so a weight for priority can be applied - - operations: - mass_user_rating_update: mdb_tomatoes # 4 This operation will update the user rating in plex with Rotten Tomatoes ratings information - mass_critic_rating_update: imdb # 5 This operation will update the critic rating in plex with IMDb ratings information - mass_audience_rating_update: tmdb # 6 This operation will update the audience rating in plex with TMDb ratings information -``` -
- -### Example TV Shows - Season Overlays - -![](tvshow-poster-season-annotated.png) -
- Click to expand sample config.yml TV Shows overlays section for the Season Poster: - -```yaml -libraries: - TV Shows: - overlay_path: - - remove_overlays: false - - reapply_overlay: true - - pmm: resolution # 1 - template_variables: - overlay_level: season - - pmm: audio_codec # 2 - template_variables: - overlay_level: season - - pmm: video_format # 3 - template_variables: - overlay_level: season -``` -
- -### Example TV Shows - Episode Overlays - -![](tvshow-poster-episode-annotated.png) -
- Click to expand sample config.yml TV Shows overlays section for the Episode Poster: - -```yaml -libraries: - TV Shows: - overlay_path: - - remove_overlays: false - - reapply_overlay: true - - pmm: overlays/resolution # 1 - template_variables: - overlay_level: episode - - pmm: overlays/audio_codec # 2 - template_variables: - overlay_level: episode - - pmm: overlays/ratings # 3, 4 - template_variables: - - rating1: critic # 3 as this is critic and mass_critic_rating_update: imdb - rating1_image: imdb # 3 as this is critic and mass_critic_rating_update: imdb - rating1_font: config/metadata/overlays/fonts/Impact.ttf # 3 local font accessible to PMM - rating1_font_size: 70 # 3 adjusted font size to fit rating - - rating2: audience # 4 as this is audience and mass_audience_rating_update: tmdb - rating2_image: tmdb # 4 as this is audience and mass_audience_rating_update: tmdb - rating2_font: config/metadata/overlays/fonts/Avenir_95_Black.ttf # 4 local font accessible to PMM - rating2_font_size: 70 # 4 adjusted font size to fit rating - - horizontal_position: right # the set of ratings is on the right of the poster - overlay_level: episode - - pmm: overlays/video_format # 5 - template_variables: - overlay_level: episode - - pmm: overlays/episode_info # 6 - template_variables: - overlay_level: episode - - pmm: overlays/runtimes # 7 - template_variables: - overlay_level: episode - - operations: - mass_episode_critic_rating_update: imdb # 3 This operation will update the episodes critic rating in plex with IMDb ratings information - mass_episode_audience_rating_update: tmdb # 4 This operation will update the episodes audience rating in plex with TMDb ratings information -``` -
- -## Separators - -By default, most metadata files use separators to denote different sections of collection like actor collections vs studio collections. - -
- Click to expand to see an example of Separators. - - ![](separators.jpg) - -
- -* Can be turned off by [customizing your config](#customizing-configs) - -## Collection Section Order - -Almost every default metadata file has a `collection_section` attribute. These attributes determine the order of the various sections and can be set by [customizing your config](#customizing-configs). - -For example: `collection_section:01` translates to `sort_title: "!<><
><>>><>"` and so for `genre.yml` if you have a `Fantasy` collection, plex is going to show `!06_Fantasy`
-
-This is the default PMM collection ordering:
-
-
-| Collection	                       | Order                  |
-|:-------------------------------------|------------------------|
-| `PMM/movie/seasonal.yml`             | collection_section: 00 |
-| `PMM/chart/anilist.yml`              | collection_section: 01 |
-| `PMM/chart/basic.yml`                | collection_section: 01 |
-| `PMM/chart/imdb.yml`                 | collection_section: 01 |
-| `PMM/chart/myanimelist.yml`          | collection_section: 01 |
-| `PMM/chart/other.yml`                | collection_section: 01 |
-| `PMM/chart/tautulli.yml`             | collection_section: 01 |
-| `PMM/chart/tmdb.yml`                 | collection_section: 01 |
-| `PMM/chart/trakt.yml`                | collection_section: 01 |
-| `PMM/movie/universe.yml`             | collection_section: 02 |
-| `PMM/streaming.yml`                  | collection_section: 03 |
-| `PMM/show/network.yml`               | collection_section: 04 |
-| `PMM/genre.yml`                      | collection_section: 06 |
-| `PMM/studio.yml`                     | collection_section: 07 |
-| `PMM/movie/country.yml`              | collection_section: 09 |
-| `PMM/show/country.yml`               | collection_section: 09 |
-| `PMM/audio_language.yml`             | collection_section: 10 |
-| `PMM/subtitle_language.yml`          | collection_section: 11 |
-| `PMM/movie/decade.yml`               | collection_section: 12 |
-| `PMM/show/decade.yml`                | collection_section: 12 |
-| `PMM/year.yml`                       | collection_section: 13 |
-| `PMM/content_rating_uk.yml`          | collection_section: 14 |
-| `PMM/movie/content_rating_us.yml`    | collection_section: 14 |
-| `PMM/show/content_rating_us.yml`     | collection_section: 14 |
-| `PMM/resolution.yml`                 | collection_section: 15 |
-| `PMM/resolution_standards.yml`       | collection_section: 15 |
-| `PMM/award/bafta.yml`                | collection_section: 16 |
-| `PMM/award/cannes.yml`               | collection_section: 16 |
-| `PMM/award/choice.yml`               | collection_section: 16 |
-| `PMM/award/emmy.yml`                 | collection_section: 16 |
-| `PMM/award/golden.yml`               | collection_section: 16 |
-| `PMM/award/oscars.yml`               | collection_section: 16 |
-| `PMM/award/other.yml`                | collection_section: 16 |
-| `PMM/award/separator.yml`            | collection_section: 16 |
-| `PMM/award/spirit.yml`               | collection_section: 16 |
-| `PMM/award/sundance.yml`             | collection_section: 16 |
-| `PMM/actor.yml`                      | collection_section: 17 |
-| `PMM/movie/director.yml`             | collection_section: 18 |
-| `PMM/movie/producer.yml`             | collection_section: 19 |
-| `PMM/movie/writer.yml`               | collection_section: 20 |
-
-## Ratings Overlays
-
-By default for Movies in Plex, the `Ratings Source` dropdown (`#3`) below, can come from Rotten Tomatoes (and includes Critic Ratings and Audience Ratings) or IMDb (Audience Ratings). This only changes the tiny icons displayed and where Plex will retrieve the ratings from upon initial scan and import of the media metadata.
-
-**Plex Meta Manager can insert up to three ratings of your choice into the three spots regardless of what you choose in the `Advanced` tab of that Plex library**
-
-![](ratings_source.png)
-
-Plex has three available spots in the Plex DB to store ratings and thus Plex Meta Manager can be used to insert ratings sources of your choice into those spots. They are known as the User Rating (`#1`), Critic Rating (`#2`), and Audience Rating (`#3`). 
-
-**Note that the little icons cannot be changed and that the numbers next to the little icons are reflected in the poster ratings overlay**
-
-![](ratings_spot.png)
-
-To be able to insert the ratings you want, Plex Meta Manager operations need to be defined. In this example below, User ratings (`#1`) are being filled with Rotten Tomatoes Critics Ratings. Critic ratings (`#2`) are filled with IMDb, and Audience ratings (`#3`) are filled with TMDb.
-
-**mass_*_rating_update** sources can be found here: [operations](../../config/operations)
-
-![](ratings_operations.png)
-
-Finally, to show the ratings on the poster, the following was added to the `overlay_path` section in the `config.yml` file to post Rotten Tomatoes Critics Ratings in (`#1`), IMDb ratings in (`#2`), and TMDb ratings in (`#3`)
-
-![](ratings_overlay_path.png)
-
-
-
-
-
-## Customizing Configs
-
-Configs can be customized using the `template_variables` attribute when calling the file. These `template_variables` will be given to every template call in the file which allows them to affect how that file runs.
-
-This example changes the ratings overlay to work on episodes.
-
-```yaml
-libraries:
-  TV Shows:
-    overlay_path:
-    - pmm: overlays/ratings
-      template_variables:
-        overlay_level: episode
-```
-
-Each file has a comment block at the top showing the available `template_variables` for each file. For example the [`PMM/genre`](https://github.com/meisnate12/Plex-Meta-Manager-Configs/blob/master/PMM/genre.yml) has this:
-
-```yaml
-#############################################################
-#                 Dynamic Genre Collections                 #
-#         Created by Yozora, Bullmoose20, & Sohjiro         #
-#############################################################
-#  Call this from your config.yml (Movie or Show)           #
-#  If nothing is specified these are the defaults           #
-#                                                           #
-#    metadata_path:                                         #
-#      - pmm: genre                                     #
-#        template_variables:                                #
-#          # Turn the separator collection on/off           #
-#          use_separator: true                              #
-#          # Sets how the collection is sorted              #
-#          sort_by: release.desc                            #
-#          # Sets the collection mode of the collection     #
-#          collection_mode:                                 #
-#          # Sets the value at the start of the sort title  #
-#          collection_section: "06"                         #
-#############################################################
-```
- 
-Each of these when passed will change how the collection runs slightly. 
-* `use_separator` Turn the separator collection on/off
-* `sort_by` Sets how the collection is sorted
-* `collection_mode` Sets the collection mode of the collection 
-* `collection_section` Sets the value at the start of the sort title
-
-**In addition to the defined `template_variables` each file in the PMM Folder has access to the `radarr_add_missing` and `sonarr_add_missing` template variables and for dynamic collections most attributes can be passed as template variables**
-
-For example if you want yearly oscar collections that go back 10 years instead of 5 all of which gets sent to radarr use the `data` and `radarr_add_missing` template variables.
-
-```yaml
-libraries:
-  Movies:
-    metadata_path:
-    - pmm: award/oscars
-      template_variables:
-        radarr_add_missing: true
-        data:
-          starting: current_year-10
-          ending: current_year
-```
-
-Or maybe you want to change the number of actor collections made using PMM/actor.
-
-```yaml
-libraries:
-  Movies:
-    overlay_path:
-    - pmm: actor
-      template_variables:
-        collection_mode: hide
-        data:
-          depth: 5
-          limit: 50
-```
-
-Or maybe you want to change the collection sort order of the genre collections using PMM/genre.
-
-```yaml
-libraries:
-  Movies:
-    metadata_path:
-    - pmm: genre
-      template_variables:
-        collection_section: 11
-```
-
-Or maybe you want to disable separators globally per library.
-
-```yaml
-libraries:
-  LIBRARYNAME:
-    template_variables:
-      use_separator: false
-    metadata_path:
-```
-
-Alternatively it can be turned off individually per git file:
-
-```yaml
-libraries:
-  LIBRARYNAME:
-    metadata_path:
-      - pmm:     # separator is disabled
-        template_variables:
-          use_separator: false
-      - pmm:     # separator is enabled by default
-      - pmm:     # separator is disabled
-        template_variables:
-          use_separator: false
-```
-
-## Errors
-
-If there are collections being made that have configuration errors or missing posters please either bring it up in our Discord or raise an Issue on the [Configs Repo](https://github.com/meisnate12/Plex-Meta-Manager-Configs/issues/new/choose). 
-
-## Example Configuration File
-
-
- Click to expand sample config.yml file: - -```yaml -libraries: - Movies: - metadata_path: - - pmm: award/bafta - - pmm: award/cannes - - pmm: award/choice - - pmm: award/golden - - pmm: award/oscars - - pmm: award/other - - pmm: award/spirit - - pmm: award/sundance - - pmm: chart/anilist - - pmm: chart/basic - - pmm: chart/imdb - - pmm: chart/myanimelist - - pmm: chart/other - - pmm: chart/tautulli - - pmm: chart/tmdb - - pmm: chart/trakt - - pmm: actor - - pmm: audio_language - - pmm: movie/content_rating_us # Choose content_rating_uk or content_rating_us - - pmm: genre - - pmm: resolution_standards # Choose resolution_standards or resolution - - pmm: streaming - - pmm: studio - - pmm: subtitle_language - - pmm: year - - pmm: movie/country - - pmm: movie/decade - - pmm: movie/director - - pmm: movie/franchise - - pmm: movie/universe - - pmm: movie/producer - - pmm: movie/seasonal - - pmm: movie/writer - overlay_path: - - remove_overlays: false - - pmm: overlays/audio_codec - - pmm: overlays/audio_language - - pmm: overlays/commonsense - - pmm: overlays/direct_play - - pmm: overlays/mediastinger - - pmm: overlays/imdb_top_250 - - pmm: overlays/mc_must_see - - pmm: overlays/rt_cert_fresh - - pmm: overlays/commonsense_selection - - pmm: overlays/ratings - template_variables: - rating1: critic - rating1_image: rt_tomato - - pmm: overlays/resolution - - pmm: overlays/special_release - - pmm: overlays/streaming - - pmm: overlays/versions - - pmm: overlays/video_format - TV Shows: - metadata_path: - - pmm: award/choice - - pmm: award/golden - - pmm: award/emmy - - pmm: chart/anilist - - pmm: chart/basic - - pmm: chart/imdb - - pmm: chart/myanimelist - - pmm: chart/other - - pmm: chart/tautulli - - pmm: chart/tmdb - - pmm: chart/trakt - - pmm: actor - - pmm: audio_language - - pmm: show/content_rating_us # Choose content_rating_uk or content_rating_us - - pmm: genre - - pmm: resolution_standards # Choose resolution_standards or resolution - - pmm: streaming - - pmm: studio - - pmm: subtitle_language - - pmm: year - - pmm: show/country - - pmm: show/decade - - pmm: show/network - overlay_path: - - remove_overlays: false - - pmm: overlays/audio_codec - - pmm: overlays/audio_codec - template_variables: - overlay_level: episode - - pmm: overlays/audio_codec - template_variables: - overlay_level: season - - pmm: overlays/audio_language - - pmm: overlays/audio_language - template_variables: - overlay_level: episode - - pmm: overlays/audio_language - template_variables: - overlay_level: season - - pmm: overlays/commonsense - - pmm: overlays/commonsense - template_variables: - overlay_level: episode - - pmm: overlays/commonsense - template_variables: - overlay_level: season - - pmm: overlays/direct_play - - pmm: overlays/direct_play - template_variables: - overlay_level: episode - - pmm: overlays/direct_play - template_variables: - overlay_level: season - - pmm: overlays/episode_info - template_variables: - overlay_level: episode - - pmm: overlays/mediastinger - - pmm: overlays/mediastinger - template_variables: - overlay_level: episode - - pmm: overlays/mediastinger - template_variables: - overlay_level: season - - pmm: overlays/imdb_top_250 - - pmm: overlays/imdb_top_250 - template_variables: - overlay_level: episode - - pmm: overlays/imdb_top_250 - template_variables: - overlay_level: season - - pmm: overlays/mc_must_see - - pmm: overlays/mc_must_see - template_variables: - overlay_level: episode - - pmm: overlays/mc_must_see - template_variables: - overlay_level: season - - pmm: overlays/rt_cert_fresh - - pmm: overlays/rt_cert_fresh - template_variables: - overlay_level: episode - - pmm: overlays/rt_cert_fresh - template_variables: - overlay_level: season - - pmm: overlays/commonsense_selection - - pmm: overlays/commonsense_selection - template_variables: - overlay_level: episode - - pmm: overlays/commonsense_selection - template_variables: - overlay_level: season - - pmm: overlays/ratings - template_variables: - rating2: audience - rating2_image: imdb - - pmm: overlays/ratings - template_variables: - rating2: audience - rating2_image: imdb - overlay_level: episode - - pmm: overlays/resolution - - pmm: overlays/resolution - template_variables: - overlay_level: episode - - pmm: overlays/resolution - template_variables: - overlay_level: season - - pmm: overlays/runtimes - template_variables: - overlay_level: episode - - pmm: overlays/special_release - - pmm: overlays/special_release - template_variables: - overlay_level: episode - - pmm: overlays/special_release - template_variables: - overlay_level: season - - pmm: overlays/streaming - - pmm: overlays/versions - - pmm: overlays/versions - template_variables: - overlay_level: episode - - pmm: overlays/versions - template_variables: - overlay_level: season - - pmm: overlays/versions - template_variables: - overlay_level: show - - pmm: overlays/video_format - - pmm: overlays/video_format - template_variables: - overlay_level: episode - - pmm: overlays/video_format - template_variables: - overlay_level: season -playlist_files: -- pmm: playlist -``` -
diff --git a/defaults/chart/flixpatrol.yml b/defaults/chart/flixpatrol.yml index 37539a5c..ce52df55 100644 --- a/defaults/chart/flixpatrol.yml +++ b/defaults/chart/flixpatrol.yml @@ -10,7 +10,6 @@ external_templates: template_variables: collection_section: "01" pre: "_#" - image: chart/<> translations: pmm: translations diff --git a/modules/builder.py b/modules/builder.py index 0b02f493..01a0abbb 100644 --- a/modules/builder.py +++ b/modules/builder.py @@ -1318,16 +1318,12 @@ class CollectionBuilder: raise Failed(f"{self.Type} Error: no mal_search attributes found") self.builders.append((method_name, (final_attributes, final_text, limit))) elif method_name in ["mal_genre", "mal_studio"]: - id_name = f"{method_name[4:]}_id" - final_data = [] - for data in util.get_list(method_data): - final_data.append(data if isinstance(data, dict) else {id_name: data, "limit": 0}) - for dict_data in final_data: - dict_methods = {dm.lower(): dm for dm in dict_data} - self.builders.append((method_name, { - id_name: util.parse(self.Type, id_name, dict_data, datatype="int", methods=dict_methods, parent=method_name, maximum=999999), - "limit": util.parse(self.Type, "limit", dict_data, datatype="int", methods=dict_methods, default=0, parent=method_name) - })) + logger.warning(f"Config Warning: {method_name} will run as a mal_search") + item_list = util.parse(self.Type, method_name[4:], method_data, datatype="commalist") + all_items = self.config.MyAnimeList.genres if method_name == "mal_genre" else self.config.MyAnimeList.studios + final_items = [str(all_items[i]) for i in item_list if i in all_items] + final_text = f"MyAnimeList Search\n{method_name[4:].capitalize()}: {' or '.join([str(all_items[i]) for i in final_items])}" + self.builders.append(("mal_search", ({"genres" if method_name == "mal_genre" else "producers": ",".join(final_items)}, final_text, 0))) def _plex(self, method_name, method_data): if method_name in ["plex_all", "plex_pilots"]: diff --git a/modules/mal.py b/modules/mal.py index 6db15431..5554f469 100644 --- a/modules/mal.py +++ b/modules/mal.py @@ -41,7 +41,7 @@ search_ratings = ["g", "pg", "pg13", "r17", "r", "rx"] search_sorts = ["mal_id", "title", "type", "rating", "start_date", "end_date", "episodes", "score", "scored_by", "rank", "popularity", "members", "favorites"] search_combos = [f"{s}.{d}" for s in search_sorts for d in ["desc", "asc"]] base_url = "https://api.myanimelist.net/v2/" -jiken_base_url = "https://api.jikan.moe/v4/" +jikan_base_url = "https://api.jikan.moe/v4/" uni_code_verifier = "k_UHwN_eHAPQVXiceC-rYGkozKqrJmKxPUIUOBIKo1noq_4XGRVCViP_dGcwB-fkPql8f56mmWj5aWCa2HDeugf6sRvnc9Rjhbb1vKGYLY0IwWsDNXRqXdksaVGJthux" urls = { "oauth_token": "https://myanimelist.net/v1/oauth2/token", @@ -97,7 +97,7 @@ class MyAnimeList: @property def genres(self): if not self._genres: - for data in self._jiken_request("genres/anime")["data"]: + for data in self._jikan_request("genres/anime")["data"]: self._genres[data["name"]] = int(data["mal_id"]) self._genres[data["name"].lower()] = int(data["mal_id"]) self._genres[str(data["mal_id"])] = int(data["mal_id"]) @@ -107,7 +107,7 @@ class MyAnimeList: @property def studios(self): if not self._studios: - for data in self._jiken_request("producers")["data"]: + for data in self._jikan_request("producers")["data"]: self._studios[data["name"]] = int(data["mal_id"]) self._studios[data["name"].lower()] = int(data["mal_id"]) self._studios[str(data["mal_id"])] = int(data["mal_id"]) @@ -199,12 +199,12 @@ class MyAnimeList: except JSONDecodeError: raise Failed(f"MyAnimeList Error: Connection Failed") - def _jiken_request(self, url, params=None): + def _jikan_request(self, url, params=None): time_check = time.time() if self._delay is not None: while time_check - self._delay < 1: time_check = time.time() - data = self.config.get_json(f"{jiken_base_url}{url}", params=params) + data = self.config.get_json(f"{jikan_base_url}{url}", params=params) self._delay = time.time() return data @@ -233,7 +233,7 @@ class MyAnimeList: return self._parse_request(url) def _pagination(self, endpoint, params=None, limit=None): - data = self._jiken_request(endpoint, params) + data = self._jikan_request(endpoint, params) last_visible_page = data["pagination"]["last_visible_page"] if limit is not None: total_items = data["pagination"]["items"]["total"] @@ -256,7 +256,7 @@ class MyAnimeList: if params is None: params = {} params["page"] = current_page - data = self._jiken_request(endpoint, params) + data = self._jikan_request(endpoint, params) if "data" in data: chances = 0 mal_ids.extend(data["data"]) @@ -275,7 +275,7 @@ class MyAnimeList: if mal_dict and expired is False: return MyAnimeListObj(self, mal_id, mal_dict, cache=True) try: - response = self._jiken_request(f"anime/{mal_id}") + response = self._jikan_request(f"anime/{mal_id}") except JSONDecodeError: raise Failed("MyAnimeList Error: JSON Decoding Failed") if "data" not in response: @@ -295,12 +295,6 @@ class MyAnimeList: elif method == "mal_search": logger.info(f"Processing {data[1]}") mal_ids = [mal_data["mal_id"] for mal_data in self._pagination("anime", params=data[0], limit=data[2])] - elif method == "mal_genre": - logger.info(f"Processing {mal_ranked_pretty[method]} ID: {data['genre_id']}") - mal_ids = [mal_data["mal_id"] for mal_data in self._pagination("anime", params={"genres": data["genre_id"]}, limit=data["limit"])] - elif method == "mal_studio": - logger.info(f"Processing {mal_ranked_pretty[method]} ID: {data['studio_id']}") - mal_ids = [mal_data["mal_id"] for mal_data in self._pagination("anime", params={"producers": data["studio_id"]}, limit=data["limit"])] elif method == "mal_season": logger.info(f"Processing MyAnimeList Season: {data['limit']} Anime from {data['season'].title()} {data['year']} sorted by {pretty_names[data['sort_by']]}") mal_ids = self._season(data["season"], data["year"], data["sort_by"], data["limit"]) diff --git a/modules/meta.py b/modules/meta.py index 2e29d297..d0f41006 100644 --- a/modules/meta.py +++ b/modules/meta.py @@ -598,21 +598,21 @@ class MetadataFile(DataFile): auto_type = dynamic[methods["type"]].lower() og_exclude = [] if "exclude" in self.temp_vars: - og_exclude = util.parse("Config", "exclude", self.temp_vars["exclude"], parent="template_variable", datatype="strlist") + og_exclude = util.parse("Config", "exclude", self.temp_vars["exclude"], parent="template_variables", datatype="strlist") elif "exclude" in methods: og_exclude = util.parse("Config", "exclude", dynamic, parent=map_name, methods=methods, datatype="strlist") if "append_exclude" in self.temp_vars: - og_exclude.extend(util.parse("Config", "append_exclude", self.temp_vars["append_exclude"], parent="template_variable", datatype="strlist")) + og_exclude.extend(util.parse("Config", "append_exclude", self.temp_vars["append_exclude"], parent="template_variables", datatype="strlist")) include = [] if "include" in self.temp_vars: - include = util.parse("Config", "include", self.temp_vars["include"], parent="template_variable", datatype="strlist") + include = util.parse("Config", "include", self.temp_vars["include"], parent="template_variables", datatype="strlist") elif "include" in methods: include = [i for i in util.parse("Config", "include", dynamic, parent=map_name, methods=methods, datatype="strlist") if i not in og_exclude] if "append_include" in self.temp_vars: - include.extend(util.parse("Config", "append_include", self.temp_vars["append_include"], parent="template_variable", datatype="strlist")) + include.extend(util.parse("Config", "append_include", self.temp_vars["append_include"], parent="template_variables", datatype="strlist")) addons = {} if "addons" in self.temp_vars: - addons = util.parse("Config", "addons", self.temp_vars["addons"], parent="template_variable", datatype="dictliststr") + addons = util.parse("Config", "addons", self.temp_vars["addons"], parent="template_variables", datatype="dictliststr") elif "addons" in methods: addons = util.parse("Config", "addons", dynamic, parent=map_name, methods=methods, datatype="dictliststr") if "append_addons" in self.temp_vars: @@ -829,7 +829,7 @@ class MetadataFile(DataFile): auto_list[k] = v custom_keys = True if "custom_keys" in self.temp_vars: - custom_keys = util.parse("Config", "custom_keys", self.temp_vars["custom_keys"], parent="template_variable", default=custom_keys) + custom_keys = util.parse("Config", "custom_keys", self.temp_vars["custom_keys"], parent="template_variables", default=custom_keys) elif "custom_keys" in methods: custom_keys = util.parse("Config", "custom_keys", dynamic, parent=map_name, methods=methods, default=custom_keys) for add_key, combined_keys in addons.items(): @@ -845,7 +845,7 @@ class MetadataFile(DataFile): auto_list[final_key] = all_keys[final_key] title_format = default_title_format if "title_format" in self.temp_vars: - title_format = util.parse("Config", "title_format", self.temp_vars["title_format"], parent="template_variable", default=default_title_format) + title_format = util.parse("Config", "title_format", self.temp_vars["title_format"], parent="template_variables", default=default_title_format) elif "title_format" in methods: title_format = util.parse("Config", "title_format", dynamic, parent=map_name, methods=methods, default=default_title_format) if "<>" not in title_format and "<>" not in title_format: @@ -890,18 +890,18 @@ class MetadataFile(DataFile): template_names = [map_name] remove_prefix = [] if "remove_prefix" in self.temp_vars: - remove_prefix = util.parse("Config", "remove_prefix", self.temp_vars["remove_prefix"], parent="template_variable", datatype="commalist") + remove_prefix = util.parse("Config", "remove_prefix", self.temp_vars["remove_prefix"], parent="template_variables", datatype="commalist") elif "remove_prefix" in methods: remove_prefix = util.parse("Config", "remove_prefix", dynamic, parent=map_name, methods=methods, datatype="commalist") remove_suffix = [] if "remove_suffix" in self.temp_vars: - remove_suffix = util.parse("Config", "remove_suffix", self.temp_vars["remove_suffix"], parent="template_variable", datatype="commalist") + remove_suffix = util.parse("Config", "remove_suffix", self.temp_vars["remove_suffix"], parent="template_variables", datatype="commalist") elif "remove_suffix" in methods: remove_suffix = util.parse("Config", "remove_suffix", dynamic, parent=map_name, methods=methods, datatype="commalist") sync = {i.title: i for i in self.library.get_all_collections(label=str(map_name))} if sync else {} other_name = None if "other_name" in self.temp_vars and include: - other_name = util.parse("Config", "other_name", self.temp_vars["remove_suffix"], parent="template_variable") + other_name = util.parse("Config", "other_name", self.temp_vars["remove_suffix"], parent="template_variables") elif "other_name" in methods and include: other_name = util.parse("Config", "other_name", dynamic, parent=map_name, methods=methods) other_templates = util.parse("Config", "other_template", dynamic, parent=map_name, methods=methods, datatype="strlist") if "other_template" in methods and include else None diff --git a/plex_meta_manager.py b/plex_meta_manager.py index fb31c68b..183cecbf 100644 --- a/plex_meta_manager.py +++ b/plex_meta_manager.py @@ -71,6 +71,7 @@ def get_arg(env_str, default, arg_bool=False, arg_int=False): return default is_docker = get_arg("PMM_DOCKER", False, arg_bool=True) +is_linuxserver = get_arg("PMM_LINUXSERVER", False, arg_bool=True) run_arg = " ".join([f'"{s}"' if " " in s else s for s in sys.argv[:]]) config_file = get_arg("PMM_CONFIG", args.config) times = get_arg("PMM_TIME", args.times) @@ -181,7 +182,7 @@ def start(attrs): logger.info_center("| __/| | __/> < | | | | __/ || (_| | | | | | (_| | | | | (_| | (_| | __/ | ") logger.info_center("|_| |_|\\___/_/\\_\\ |_| |_|\\___|\\__\\__,_| |_| |_|\\__,_|_| |_|\\__,_|\\__, |\\___|_| ") logger.info_center(" |___/ ") - system_ver = "Docker" if is_docker else f"Python {platform.python_version()}" + system_ver = "Docker" if is_docker else "Linuxserver" if is_linuxserver else f"Python {platform.python_version()}" logger.info(f" Version: {version[0]} ({system_ver})") latest_version = util.current_version(version) new_version = latest_version[0] if latest_version and (version[1] != latest_version[1] or (version[2] and version[2] < latest_version[2])) else None