Mirrors/Plex-Meta-Manager
2
0
Fork 0
mirror of https://github.com/meisnate12/Plex-Meta-Manager synced 2024-11-22 20:43:07 +00:00
Code Issues Projects Releases Packages Wiki Activity

fix anilist_search and anidb_tag

Browse source
This commit is contained in:
meisnate12 2021-08-28 01:17:14 -04:00
parent 19a50abd55
commit 27db9462f1
2 changed files with 5 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
modules/anilist.py
View file

@ -20,12 +20,6 @@ mod_searches = [
no_mod_searches = ["search", "season", "year", "adult", "min_tag_percent", "limit", "sort_by", "source", "country"] no_mod_searches = ["search", "season", "year", "adult", "min_tag_percent", "limit", "sort_by", "source", "country"]
searches = mod_searches + no_mod_searches searches = mod_searches + no_mod_searches
sort_options = {"score": "SCORE_DESC", "popular": "POPULARITY_DESC", "trending": "TRENDING_DESC"} sort_options = {"score": "SCORE_DESC", "popular": "POPULARITY_DESC", "trending": "TRENDING_DESC"}
search_types = {
"search": "String", "season": "MediaSeason", "seasonYear": "Int", "isAdult": "Boolean", "minimumTagRank": "Int",
"startDate": "FuzzyDateInt", "endDate": "FuzzyDateInt", "format": "[MediaFormat]", "status": "[MediaStatus]",
"genre": "[String]", "tag": "[String]", "tagCategory": "[String]", "source": "MediaSource",
"countryOfOrigin": "CountryCode", "episodes": "Int", "duration": "Int", "averageScore": "Int", "popularity": "Int"
}
media_season = {"winter": "WINTER", "spring": "SPRING", "summer": "SUMMER", "fall": "FALL"} media_season = {"winter": "WINTER", "spring": "SPRING", "summer": "SUMMER", "fall": "FALL"}
media_format = {"tv": "TV", "short": "TV_SHORT", "movie": "MOVIE", "special": "SPECIAL", "ova": "OVA", "ona": "ONA", "music": "MUSIC"} media_format = {"tv": "TV", "short": "TV_SHORT", "movie": "MOVIE", "special": "SPECIAL", "ova": "OVA", "ona": "ONA", "music": "MUSIC"}
media_status = {"finished": "FINISHED", "airing": "RELEASING", "not_yet_aired": "NOT_YET_RELEASED", "cancelled": "CANCELLED", "hiatus": "HIATUS"} media_status = {"finished": "FINISHED", "airing": "RELEASING", "not_yet_aired": "NOT_YET_RELEASED", "cancelled": "CANCELLED", "hiatus": "HIATUS"}
@ -112,8 +106,7 @@ class AniList:
return anilist_ids return anilist_ids
def _search(self, **kwargs): def _search(self, **kwargs):
query_vars = "$page: Int, $sort: [MediaSort]" media_vars = f"sort: {sort_options[kwargs['sort_by']]}, type: ANIME"
media_vars = "sort: $sort, type: ANIME"
variables = {"sort": sort_options[kwargs['sort_by']]} variables = {"sort": sort_options[kwargs['sort_by']]}
for key, value in kwargs.items(): for key, value in kwargs.items():
if key not in ["sort_by", "limit"]: if key not in ["sort_by", "limit"]:
@ -127,17 +120,15 @@ class AniList:
if attr in ["start", "end"]: if attr in ["start", "end"]:
value = int(util.validate_date(value, f"anilist_search {key}", return_as="%Y%m%d")) value = int(util.validate_date(value, f"anilist_search {key}", return_as="%Y%m%d"))
elif attr in ["format", "status", "genre", "tag", "tag_category"]: elif attr in ["format", "status", "genre", "tag", "tag_category"]:
value = [self.options[attr.replace("_", " ").title()][v.lower().replace(" / ", "-").replace(" ", "-")] for v in value] value = f"[{', '.join([self.options[attr.replace('_', ' ').title()][v.lower().replace(' / ', '-').replace(' ', '-')] for v in value])}]"
elif attr in ["season", "source", "country"]: elif attr in ["season", "source", "country"]:
value = self.options[attr.replace("_", " ").title()][value] value = self.options[attr.replace("_", " ").title()][value]
if mod == "gte": if mod == "gte":
value -= 1 value -= 1
elif mod == "lte": elif mod == "lte":
value += 1 value += 1
query_vars += f", ${final}: {search_types[ani_attr]}" media_vars += f", {final}: {value}"
media_vars += f", {final}: ${final}" query = f"query ($page: Int) {{Page(page: $page){{pageInfo {{hasNextPage}}media({media_vars}){{id}}}}}}"
variables[key] = value
query = f"query ({query_vars}) {{Page(page: $page){{pageInfo {{hasNextPage}}media({media_vars}){{id}}}}}}"
logger.debug(query) logger.debug(query)
return self._pagenation(query, limit=kwargs["limit"], variables=variables) return self._pagenation(query, limit=kwargs["limit"], variables=variables)

2
modules/builder.py
View file

@ -774,7 +774,7 @@ class CollectionBuilder:
elif not dict_data[dict_methods["tag"]]: elif not dict_data[dict_methods["tag"]]:
raise Failed("Collection Error: anidb_tag tag attribute is blank") raise Failed("Collection Error: anidb_tag tag attribute is blank")
else: else:
new_dictionary["tag"] = util.regex_first_int(dict_data[dict_methods["username"]], "AniDB Tag ID") new_dictionary["tag"] = util.regex_first_int(dict_data[dict_methods["tag"]], "AniDB Tag ID")
new_dictionary["limit"] = util.parse("limit", dict_data, datatype="int", methods=dict_methods, default=0, parent=method_name, minimum=0) new_dictionary["limit"] = util.parse("limit", dict_data, datatype="int", methods=dict_methods, default=0, parent=method_name, minimum=0)
self.builders.append((method_name, new_dictionary)) self.builders.append((method_name, new_dictionary))