midgard/youtube-dl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[soulanime] Fix under Python 3

Browse source
This commit is contained in:
Philipp Hagemeister 2015-01-04 02:20:45 +01:00
parent 788fa208c8
commit 2ccd1b10e5
2 changed files with 19 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
youtube_dl/extractor/soulanime.py
View file

@ -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,

11
youtube_dl/utils.py
View file

@ -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]