From: Philipp Hagemeister Date: Tue, 17 Dec 2013 15:26:32 +0000 (+0100) Subject: [generic] Support application/ogg for direct links X-Git-Url: http://git.oshgnacknak.de/?a=commitdiff_plain;h=3e78514568ddb516d23de052f694c8de7ab469d7;p=youtube-dl [generic] Support application/ogg for direct links Also remove some debugging code. --- diff --git a/youtube_dl/extractor/generic.py b/youtube_dl/extractor/generic.py index 209f68204..fd32370c2 100644 --- a/youtube_dl/extractor/generic.py +++ b/youtube_dl/extractor/generic.py @@ -164,18 +164,18 @@ class GenericIE(InfoExtractor): # Check for direct link to a video content_type = response.headers.get('Content-Type', '') - m = re.match(r'^(?:audio|video)/(?P.+)$', content_type) + m = re.match(r'^(?Paudio|video|application(?=/ogg$))/(?P.+)$', content_type) if m: upload_date = response.headers.get('Last-Modified') if upload_date: upload_date = unified_strdate(upload_date) - assert (url_basename(url) == 'trailer.mp4') return { 'id': video_id, 'title': os.path.splitext(url_basename(url))[0], 'formats': [{ 'format_id': m.group('format_id'), 'url': url, + 'vcodec': u'none' if m.group('type') == 'audio' else None }], 'upload_date': upload_date, }