use util.get_json() in masterani's search() and fix "expected str, got int" for anime watch -l (#103)

* changed masterani search() to use util.get_json()

* fix util import

* fix "expected str, got int" for list_anime()

* remove debugging print statement
master
Jonas A. Walther 2018-10-31 14:30:59 +01:00 committed by Vishnunarayan K I
parent 721cb3ea1b
commit b566542588
2 changed files with 5 additions and 6 deletions

View File

@ -264,7 +264,7 @@ def list_animes(watcher, quality, download_dir):
meta = ''
for k, v in anime.meta.items():
meta += '{}: {}\n'.format(k, click.style(v, bold=True))
meta += '{}: {}\n'.format(k, click.style(str(v), bold=True))
click.echo(meta)
click.echo('Available Commands: set, remove, update, watch,'

View File

@ -5,6 +5,7 @@ import logging
import requests
from bs4 import BeautifulSoup
from anime_downloader import util
from anime_downloader.sites.anime import BaseAnime, BaseEpisode, SearchResult
from anime_downloader.const import desktop_headers
@ -57,12 +58,10 @@ class Masterani(BaseAnime):
@classmethod
def search(cls, query):
r = requests.get('https://masterani.me/api/anime/filter?',
params={'search': query, 'order': 'relevance_desc'})
r = util.get_json('https://masterani.me/api/anime/filter?',
{'search': query, 'order': 'relevance_desc'})
logging.debug(r.url)
search_result = r.json()['data']
search_result = r['data']
ret = []