mirror of
https://github.com/ytdl-org/youtube-dl.git
synced 2024-09-08 21:45:05 +00:00
[soulanime] Fix under Python 3
This commit is contained in:
parent
788fa208c8
commit
2ccd1b10e5
|
@ -3,6 +3,10 @@ from __future__ import unicode_literals
|
||||||
import re
|
import re
|
||||||
|
|
||||||
from .common import InfoExtractor
|
from .common import InfoExtractor
|
||||||
|
from ..utils import (
|
||||||
|
HEADRequest,
|
||||||
|
urlhandle_detect_ext,
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
class SoulAnimeWatchingIE(InfoExtractor):
|
class SoulAnimeWatchingIE(InfoExtractor):
|
||||||
|
@ -31,8 +35,10 @@ class SoulAnimeWatchingIE(InfoExtractor):
|
||||||
r'<div id="download">[^<]*<a href="(?P<url>[^"]+)"', page, 'url')
|
r'<div id="download">[^<]*<a href="(?P<url>[^"]+)"', page, 'url')
|
||||||
video_url = "http://www.soul-anime." + domain + video_url_encoded
|
video_url = "http://www.soul-anime." + domain + video_url_encoded
|
||||||
|
|
||||||
vid = self._request_webpage(video_url, video_id)
|
ext_req = HEADRequest(video_url)
|
||||||
ext = vid.info().gettype().split("/")[1]
|
ext_handle = self._request_webpage(
|
||||||
|
ext_req, video_id, note='Determining extension')
|
||||||
|
ext = urlhandle_detect_ext(ext_handle)
|
||||||
|
|
||||||
return {
|
return {
|
||||||
'id': video_id,
|
'id': video_id,
|
||||||
|
|
|
@ -1550,3 +1550,14 @@ def ytdl_is_updateable():
|
||||||
def args_to_str(args):
|
def args_to_str(args):
|
||||||
# Get a short string representation for a subprocess command
|
# Get a short string representation for a subprocess command
|
||||||
return ' '.join(shlex_quote(a) for a in args)
|
return ' '.join(shlex_quote(a) for a in args)
|
||||||
|
|
||||||
|
|
||||||
|
def urlhandle_detect_ext(url_handle):
|
||||||
|
try:
|
||||||
|
url_handle.headers
|
||||||
|
getheader = lambda h: url_handle.headers[h]
|
||||||
|
except AttributeError: # Python < 3
|
||||||
|
getheader = url_handle.info().getheader
|
||||||
|
|
||||||
|
return getheader('Content-Type').split("/")[1]
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue