Merge pull request #368 from meisnate12/develop

v1.12.1

modules/anilist.py

@@ -14,7 +14,7 @@
     "episodes.gt", "episodes.gte", "episodes.lt", "episodes.lte", "duration.gt", "duration.gte", "duration.lt", "duration.lte",
     "score.gt", "score.gte", "score.lt", "score.lte", "popularity.gt", "popularity.gte", "popularity.lt", "popularity.lte"
 ]
-no_mod_searches = ["search", "season", "year", "adult", "min_tag_percent"]
+no_mod_searches = ["search", "season", "year", "adult", "min_tag_percent", "limit", "sort_by"]
 searches = mod_searches + no_mod_searches
 search_types = {
     "search": "String", "season": "MediaSeason", "seasonYear": "Int", "isAdult": "Boolean", "minimumTagRank": "Int",
@@ -101,6 +101,8 @@ def _search(self, **kwargs):
                 final = ani_attr if attr in no_mod_searches else f"{ani_attr}_{mod_translation[mod]}"
                 if attr in ["start", "end"]:
                     value = int(util.validate_date(value, f"anilist_search {key}", return_as="%Y%m%d"))
+                elif attr in ["season", "format", "status", "genre", "tag", "tag_category"]:
+                    value = self.options[attr.replace("_", " ").title()][value.lower().replace(" / ", "-").replace(" ", "-")]
                 if mod == "gte":
                     value -= 1
                 elif mod == "lte":
@@ -178,7 +180,7 @@ def validate(self, name, data):
         for d in util.get_list(data):
             data_check = d.lower().replace(" / ", "-").replace(" ", "-")
             if data_check in self.options[name]:
-                valid.append(self.options[name][data_check])
+                valid.append(d)
         if len(valid) > 0:
             return valid
         raise Failed(f"AniList Error: {name}: {data} does not exist\nOptions: {', '.join([v for k, v in self.options[name].items()])}")

modules/config.py

@@ -47,7 +47,7 @@ def __init__(self, default_dir, config_path=None, is_test=False, time_scheduled=
 
         yaml.YAML().allow_duplicate_keys = True
         try:
-            new_config, ind, bsi = yaml.util.load_yaml_guess_indent(open(self.config_path, encoding="utf-8"))
+            new_config, _, _ = yaml.util.load_yaml_guess_indent(open(self.config_path, encoding="utf-8"))
             def replace_attr(all_data, attr, par):
                 if "settings" not in all_data:
                     all_data["settings"] = {}
@@ -90,7 +90,7 @@ def replace_attr(all_data, attr, par):
             if "trakt" in new_config:                       new_config["trakt"] = new_config.pop("trakt")
             if "mal" in new_config:                         new_config["mal"] = new_config.pop("mal")
             if "anidb" in new_config:                       new_config["anidb"] = new_config.pop("anidb")
-            yaml.round_trip_dump(new_config, open(self.config_path, "w", encoding="utf-8"), indent=ind, block_seq_indent=bsi)
+            yaml.round_trip_dump(new_config, open(self.config_path, "w", encoding="utf-8"), indent=None, block_seq_indent=2)
             self.data = new_config
         except yaml.scanner.ScannerError as e:
             raise Failed(f"YAML Error: {util.tab_new_lines(e)}")
@@ -111,12 +111,12 @@ def check_for_attribute(data, attribute, parent=None, test_list=None, default=No
             if data is None or attribute not in data:
                 message = f"{text} not found"
                 if parent and save is True:
-                    loaded_config, ind_in, bsi_in = yaml.util.load_yaml_guess_indent(open(self.config_path))
+                    loaded_config, _, _ = yaml.util.load_yaml_guess_indent(open(self.config_path))
                     endline = f"\n{parent} sub-attribute {attribute} added to config"
                     if parent not in loaded_config or not loaded_config[parent]:        loaded_config[parent] = {attribute: default}
                     elif attribute not in loaded_config[parent]:                        loaded_config[parent][attribute] = default
                     else:                                                               endline = ""
-                    yaml.round_trip_dump(loaded_config, open(self.config_path, "w"), indent=ind_in, block_seq_indent=bsi_in)
+                    yaml.round_trip_dump(loaded_config, open(self.config_path, "w"), indent=None, block_seq_indent=2)
             elif data[attribute] is None:
                 if default_is_none is True:                                         return None
                 else:                                                               message = f"{text} is blank"

modules/mal.py

@@ -7,7 +7,7 @@
 
 builders = [
     "mal_id", "mal_all", "mal_airing", "mal_upcoming", "mal_tv", "mal_ova", "mal_movie", "mal_special",
-    "mal_popular", "mal_favorite", "mal_season", "mal_suggested", "mal_userlist", "mal_genre", "mal_producer"
+    "mal_popular", "mal_favorite", "mal_season", "mal_suggested", "mal_userlist", "mal_genre", "mal_studio"
 ]
 mal_ranked_name = {
     "mal_all": "all", "mal_airing": "airing", "mal_upcoming": "upcoming", "mal_tv": "tv", "mal_ova": "ova",
@@ -17,7 +17,7 @@
     "mal_all": "MyAnimeList All", "mal_airing": "MyAnimeList Airing",
     "mal_upcoming": "MyAnimeList Upcoming", "mal_tv": "MyAnimeList TV", "mal_ova": "MyAnimeList OVA",
     "mal_movie": "MyAnimeList Movie", "mal_special": "MyAnimeList Special", "mal_popular": "MyAnimeList Popular",
-    "mal_favorite": "MyAnimeList Favorite", "mal_genre": "MyAnimeList Genre", "mal_producer": "MyAnimeList Producer"
+    "mal_favorite": "MyAnimeList Favorite", "mal_genre": "MyAnimeList Genre", "mal_studio": "MyAnimeList Studio"
 }
 season_sort_translation = {"score": "anime_score", "anime_score": "anime_score", "members": "anime_num_list_users", "anime_num_list_users": "anime_num_list_users"}
 season_sort_options = ["score", "members"]
@@ -191,15 +191,15 @@ def _genre(self, genre_id, limit):
         util.print_end()
         return mal_ids
 
-    def _producer(self, producer_id, limit):
-        data = self._jiken_request(f"/producer/{producer_id}")
+    def _studio(self, studio_id, limit):
+        data = self._jiken_request(f"/producer/{studio_id}")
         if "anime" not in data:
-            raise Failed(f"MyAnimeList Error: No MyAnimeList IDs for Producer ID: {producer_id}")
+            raise Failed(f"MyAnimeList Error: No MyAnimeList IDs for Studio ID: {studio_id}")
         mal_ids = []
         count = 1
         while True:
             if count > 1:
-                data = self._jiken_request(f"/producer/{producer_id}/{count}")
+                data = self._jiken_request(f"/producer/{studio_id}/{count}")
             if "anime" not in data:
                 break
             mal_ids.extend([anime["mal_id"] for anime in data["anime"]])
@@ -218,9 +218,9 @@ def get_mal_ids(self, method, data):
         elif method == "mal_genre":
             logger.info(f"Processing {mal_ranked_pretty[method]} ID: {data['genre_id']}")
             mal_ids = self._genre(data["genre_id"], data["limit"])
-        elif method == "mal_producer":
-            logger.info(f"Processing {mal_ranked_pretty[method]} ID: {data['producer_id']}")
-            mal_ids = self._producer(data["producer_id"], data["limit"])
+        elif method == "mal_studio":
+            logger.info(f"Processing {mal_ranked_pretty[method]} ID: {data['studio_id']}")
+            mal_ids = self._studio(data["studio_id"], 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"])