Move FileDownloader to its own module and create a new class for each download process

A suitable downloader can be found using the 'get_suitable_downloader' function.

Each subclass implements 'real_download', for downloading an info dict you call the 'download' method, which first checks if the video has already been downloaded

1 files changed, 3 insertions, 3 deletions

diff --git a/youtube_dl/YoutubeDL.py b/youtube_dl/YoutubeDL.py
index 6a34f16d5..414aa5a80 100644
--- a/youtube_dl/YoutubeDL.py
+++ b/youtube_dl/YoutubeDL.py
@@ -51,7 +51,7 @@ from .utils import (
     YoutubeDLHandler,
 )
 from .extractor import get_info_extractor, gen_extractors
-from .FileDownloader import FileDownloader
+from .downloader import get_suitable_downloader
 from .version import __version__
 
 
@@ -847,10 +847,10 @@ class YoutubeDL(object):
                 success = True
             else:
                 try:
-                    fd = FileDownloader(self, self.params)
+                    fd = get_suitable_downloader(info_dict)(self, self.params)
                     for ph in self._fd_progress_hooks:
                         fd.add_progress_hook(ph)
-                    success = fd._do_download(filename, info_dict)
+                    success = fd.download(filename, info_dict)
                 except (compat_urllib_error.URLError, compat_http_client.HTTPException, socket.error) as err:
                     self.report_error(u'unable to download video data: %s' % str(err))
                     return