projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Switch codebase to use sanitized_Request instead of
[youtube-dl]
/
youtube_dl
/
downloader
/
dash.py
diff --git
a/youtube_dl/downloader/dash.py
b/youtube_dl/downloader/dash.py
index cd84e0b07200d5d93304757eac78f8e51d716845..535f2a7fc7236a5717f1b0bf0375a5876cf00226 100644
(file)
--- a/
youtube_dl/downloader/dash.py
+++ b/
youtube_dl/downloader/dash.py
@@
-3,7
+3,7
@@
from __future__ import unicode_literals
import re
from .common import FileDownloader
import re
from .common import FileDownloader
-from ..
compat import compat_urllib_r
equest
+from ..
utils import sanitized_R
equest
class DashSegmentsFD(FileDownloader):
class DashSegmentsFD(FileDownloader):
@@
-16,19
+16,28
@@
class DashSegmentsFD(FileDownloader):
base_url = info_dict['url']
segment_urls = info_dict['segment_urls']
base_url = info_dict['url']
segment_urls = info_dict['segment_urls']
+ is_test = self.params.get('test', False)
+ remaining_bytes = self._TEST_FILE_SIZE if is_test else None
byte_counter = 0
byte_counter = 0
- def append_url_to_file(outf, target_url, target_name):
+ def append_url_to_file(outf, target_url, target_name
, remaining_bytes=None
):
self.to_screen('[DashSegments] %s: Downloading %s' % (info_dict['id'], target_name))
self.to_screen('[DashSegments] %s: Downloading %s' % (info_dict['id'], target_name))
- req = compat_urllib_request.Request(target_url)
+ req = sanitized_Request(target_url)
+ if remaining_bytes is not None:
+ req.add_header('Range', 'bytes=0-%d' % (remaining_bytes - 1))
+
data = self.ydl.urlopen(req).read()
data = self.ydl.urlopen(req).read()
+
+ if remaining_bytes is not None:
+ data = data[:remaining_bytes]
+
outf.write(data)
return len(data)
def combine_url(base_url, target_url):
if re.match(r'^https?://', target_url):
return target_url
outf.write(data)
return len(data)
def combine_url(base_url, target_url):
if re.match(r'^https?://', target_url):
return target_url
- return '%s
/%s' % (base_url
, target_url)
+ return '%s
%s%s' % (base_url, '' if base_url.endswith('/') else '/'
, target_url)
with open(tmpfilename, 'wb') as outf:
append_url_to_file(
with open(tmpfilename, 'wb') as outf:
append_url_to_file(
@@
-37,8
+46,13
@@
class DashSegmentsFD(FileDownloader):
for i, segment_url in enumerate(segment_urls):
segment_len = append_url_to_file(
outf, combine_url(base_url, segment_url),
for i, segment_url in enumerate(segment_urls):
segment_len = append_url_to_file(
outf, combine_url(base_url, segment_url),
- 'segment %d / %d' % (i + 1, len(segment_urls)))
+ 'segment %d / %d' % (i + 1, len(segment_urls)),
+ remaining_bytes)
byte_counter += segment_len
byte_counter += segment_len
+ if remaining_bytes is not None:
+ remaining_bytes -= segment_len
+ if remaining_bytes <= 0:
+ break
self.try_rename(tmpfilename, filename)
self.try_rename(tmpfilename, filename)