aboutsummaryrefslogtreecommitdiff
path: root/youtube_dl/FileDownloader.py
diff options
context:
space:
mode:
authorJaime Marquínez Ferrándiz <jaime.marquinez.ferrandiz@gmail.com>2013-04-20 12:50:14 +0200
committerJaime Marquínez Ferrándiz <jaime.marquinez.ferrandiz@gmail.com>2013-04-20 12:58:35 +0200
commit6de8f1afb72d35560396817cbc2ed96180daa019 (patch)
treeb5b5b94d6aadab58a598f70c8ebc0ec5503ad625 /youtube_dl/FileDownloader.py
parent93412126422b1324e920dc5097ee57c3ad11371b (diff)
downloadyoutube-dl-6de8f1afb72d35560396817cbc2ed96180daa019.tar.xz
Allows to specify which IE should be used for extracting info for a result of type url
Diffstat (limited to 'youtube_dl/FileDownloader.py')
-rw-r--r--youtube_dl/FileDownloader.py17
1 files changed, 14 insertions, 3 deletions
diff --git a/youtube_dl/FileDownloader.py b/youtube_dl/FileDownloader.py
index 03346ab04..9c0c42f8d 100644
--- a/youtube_dl/FileDownloader.py
+++ b/youtube_dl/FileDownloader.py
@@ -17,6 +17,7 @@ if os.name == 'nt':
import ctypes
from .utils import *
+from .InfoExtractors import get_info_extractor
class FileDownloader(object):
@@ -425,13 +426,23 @@ class FileDownloader(object):
return u'"' + title + '" title matched reject pattern "' + rejecttitle + '"'
return None
- def extract_info(self, url, download = True):
+ def extract_info(self, url, download = True, ie_name = None):
'''
Returns a list with a dictionary for each video we find.
If 'download', also downloads the videos.
'''
suitable_found = False
- for ie in self._ies:
+
+ #We copy the original list
+ ies = list(self._ies)
+
+ if ie_name is not None:
+ #We put in the first place the given info extractor
+ first_ie = get_info_extractor(ie_name)()
+ first_ie.set_downloader(self)
+ ies.insert(0, first_ie)
+
+ for ie in ies:
# Go to next InfoExtractor if not suitable
if not ie.suitable(url):
continue
@@ -486,7 +497,7 @@ class FileDownloader(object):
return ie_result
elif result_type == 'url':
#We get the video pointed by the url
- result = self.extract_info(ie_result['url'], download)[0]
+ result = self.extract_info(ie_result['url'], download, ie_name = ie_result['ie_key'])[0]
return result
elif result_type == 'playlist':
#We process each entry in the playlist