Fix retrying bug and fix kisscartoon
parent
85845d00aa
commit
34653d7095
|
@ -320,7 +320,14 @@ def watch_anime(watcher, anime):
|
|||
logging.info(
|
||||
'Playing episode {}'.format(episode.ep_no)
|
||||
)
|
||||
player = mpv(episode.source().stream_url)
|
||||
try:
|
||||
player = mpv(episode.source().stream_url)
|
||||
except Exception as e:
|
||||
anime.episodes_done -= 1
|
||||
watcher.update(anime)
|
||||
logging.error(str(e))
|
||||
sys.exit(1)
|
||||
|
||||
returncode = player.play()
|
||||
|
||||
if returncode == player.STOP:
|
||||
|
|
|
@ -120,17 +120,19 @@ class BaseEpisode:
|
|||
self.source().stream_url
|
||||
except NotFoundError:
|
||||
# Issue #28
|
||||
# parent.QUALITIES.remove(self.quality)
|
||||
for quality in parent.QUALITIES:
|
||||
qualities = self.QUALITIES
|
||||
qualities.remove(self.quality)
|
||||
for quality in qualities:
|
||||
logging.warning('Quality {} not found. Trying {}.'.format(self.quality, quality))
|
||||
self.quality = quality
|
||||
try:
|
||||
self.get_data()
|
||||
self.source().stream_url
|
||||
# parent.quality = self.quality
|
||||
break
|
||||
except NotFoundError:
|
||||
# Issue #28
|
||||
# parent.QUALITIES.remove(self.quality)
|
||||
qualities.remove(self.quality)
|
||||
pass
|
||||
|
||||
def source(self, index=0):
|
||||
|
|
|
@ -20,6 +20,7 @@ def get_anime_class(url):
|
|||
except ImportError as e:
|
||||
# TODO: This should raise an error instead of logging.
|
||||
# I'm lazy af right now.
|
||||
raise
|
||||
logging.debug("Coudn't import {}, '{}'".format(site[0], e.msg))
|
||||
logging.warning("Provider '{}' not used. Make sure you have "
|
||||
"cfscrape and node-js installed".format(site[0]))
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
from anime_downloader.sites.kissanime import Kissanime
|
||||
from anime_downloader.sites.kissanime import KissAnime
|
||||
from anime_downloader.sites.anime import BaseEpisode
|
||||
from anime_downloader.sites.exceptions import NotFoundError
|
||||
from anime_downloader.const import desktop_headers
|
||||
|
@ -15,7 +15,7 @@ class KisscartoonEpisode(BaseEpisode):
|
|||
def _get_sources(self):
|
||||
params = {
|
||||
'v': '1.1',
|
||||
'epiosde_id': self.url.split('id=')[-1],
|
||||
'episode_id': self.url.split('id=')[-1],
|
||||
}
|
||||
headers = desktop_headers
|
||||
headers['referer'] = self.url
|
||||
|
@ -25,7 +25,7 @@ class KisscartoonEpisode(BaseEpisode):
|
|||
|
||||
headers = desktop_headers
|
||||
headers['referer'] = self.url
|
||||
res = requests.get('https://' + url, headers=headers)
|
||||
res = requests.get('https:' + url, headers=headers)
|
||||
|
||||
return [(
|
||||
'no_extractor',
|
||||
|
@ -33,7 +33,7 @@ class KisscartoonEpisode(BaseEpisode):
|
|||
)]
|
||||
|
||||
|
||||
class KissCarton(Kissanime):
|
||||
class KissCartoon(KissAnime):
|
||||
sitename = 'kisscartoon'
|
||||
_episodeClass = KisscartoonEpisode
|
||||
|
||||
|
|
Loading…
Reference in New Issue