projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[youjizz] Fix extraction (closes #13744)
[youtube-dl]
/
youtube_dl
/
downloader
/
http.py
diff --git
a/youtube_dl/downloader/http.py
b/youtube_dl/downloader/http.py
index a29f5cf31fddf3f3b15f47311fafeef9ab4f3d7a..af405b9509572bfd42bb11bd48bec5300d8105b3 100644
(file)
--- a/
youtube_dl/downloader/http.py
+++ b/
youtube_dl/downloader/http.py
@@
-7,14
+7,15
@@
import time
import re
from .common import FileDownloader
import re
from .common import FileDownloader
-from ..compat import (
- compat_urllib_request,
- compat_urllib_error,
-)
+from ..compat import compat_urllib_error
from ..utils import (
ContentTooShortError,
encodeFilename,
sanitize_open,
from ..utils import (
ContentTooShortError,
encodeFilename,
sanitize_open,
+ sanitized_Request,
+ write_xattr,
+ XAttrMetadataError,
+ XAttrUnavailableError,
)
)
@@
-29,8
+30,8
@@
class HttpFD(FileDownloader):
add_headers = info_dict.get('http_headers')
if add_headers:
headers.update(add_headers)
add_headers = info_dict.get('http_headers')
if add_headers:
headers.update(add_headers)
- basic_request =
compat_urllib_request.
Request(url, None, headers)
- request =
compat_urllib_request.
Request(url, None, headers)
+ basic_request =
sanitized_
Request(url, None, headers)
+ request =
sanitized_
Request(url, None, headers)
is_test = self.params.get('test', False)
is_test = self.params.get('test', False)
@@
-142,8
+143,8
@@
class HttpFD(FileDownloader):
if data_len is not None:
data_len = int(data_len) + resume_len
if data_len is not None:
data_len = int(data_len) + resume_len
- min_data_len = self.params.get(
"min_filesize", None
)
- max_data_len = self.params.get(
"max_filesize", None
)
+ min_data_len = self.params.get(
'min_filesize'
)
+ max_data_len = self.params.get(
'max_filesize'
)
if min_data_len is not None and data_len < min_data_len:
self.to_screen('\r[download] File is smaller than min-filesize (%s bytes < %s bytes). Aborting.' % (data_len, min_data_len))
return False
if min_data_len is not None and data_len < min_data_len:
self.to_screen('\r[download] File is smaller than min-filesize (%s bytes < %s bytes). Aborting.' % (data_len, min_data_len))
return False
@@
-181,9
+182,8
@@
class HttpFD(FileDownloader):
if self.params.get('xattr_set_filesize', False) and data_len is not None:
try:
if self.params.get('xattr_set_filesize', False) and data_len is not None:
try:
- import xattr
- xattr.setxattr(tmpfilename, 'user.ytdl.filesize', str(data_len))
- except(OSError, IOError, ImportError) as err:
+ write_xattr(tmpfilename, 'user.ytdl.filesize', str(data_len).encode('utf-8'))
+ except (XAttrUnavailableError, XAttrMetadataError) as err:
self.report_error('unable to set filesize xattr: %s' % str(err))
try:
self.report_error('unable to set filesize xattr: %s' % str(err))
try: