@ -3,7 +3,6 @@ from __future__ import unicode_literals
import re
from .common import InfoExtractor
from .fivemin import FiveMinIE
class AolIE ( InfoExtractor ) :
@ -42,31 +41,31 @@ class AolIE(InfoExtractor):
def _real_extract ( self , url ) :
mobj = re . match ( self . _VALID_URL , url )
video_id = mobj . group ( ' id ' )
playlist_id = mobj . group ( ' playlist_id ' )
if playlist_id and not self . _downloader . params . get ( ' noplaylist ' ) :
self . to_screen ( ' Downloading playlist %s - add --no-playlist to just download video %s ' % ( playlist_id , video_id ) )
if not playlist_id or self . _downloader . params . get ( ' noplaylist ' ) :
return self . url_result ( ' 5min: %s ' % video_id )
self . to_screen ( ' Downloading playlist %s - add --no-playlist to just download video %s ' % ( playlist_id , video_id ) )
webpage = self . _download_webpage ( url , playlist_id )
title = self . _html_search_regex (
r ' <h1 class= " video-title[^ " ]* " >(.+?)</h1> ' , webpage , ' title ' )
playlist_html = self . _search_regex (
r " (?s)<ul \ s+class= ' video-related[^ ' ]* ' >(.*?)</ul> " , webpage ,
' playlist HTML ' )
entries = [ {
' _type ' : ' url ' ,
' url ' : ' aol-video: %s ' % m . group ( ' id ' ) ,
' ie_key ' : ' Aol ' ,
} for m in re . finditer (
r " <a \ s+href= ' .*videoid=(?P<id>[0-9]+) ' \ s+class= ' video-thumb ' > " ,
playlist_html ) ]
webpage = self . _download_webpage ( url , playlist_id )
title = self . _html_search_regex (
r ' <h1 class= " video-title[^ " ]* " >(.+?)</h1> ' , webpage , ' title ' )
playlist_html = self . _search_regex (
r " (?s)<ul \ s+class= ' video-related[^ ' ]* ' >(.*?)</ul> " , webpage ,
' playlist HTML ' )
entries = [ {
' _type ' : ' url ' ,
' url ' : ' aol-video: %s ' % m . group ( ' id ' ) ,
' ie_key ' : ' Aol ' ,
} for m in re . finditer (
r " <a \ s+href= ' .*videoid=(?P<id>[0-9]+) ' \ s+class= ' video-thumb ' > " ,
playlist_html ) ]
return {
' _type ' : ' playlist ' ,
' id ' : playlist_id ,
' display_id ' : mobj . group ( ' playlist_display_id ' ) ,
' title ' : title ,
' entries ' : entries ,
}
return {
' _type ' : ' playlist ' ,
' id ' : playlist_id ,
' display_id ' : mobj . group ( ' playlist_display_id ' ) ,
' title ' : title ,
' entries ' : entries ,
}
return FiveMinIE . _build_result ( video_id )