Sergey M․
98b8ec8616
Merge branch 'best-fallback-on-outdated-avconv' of https://github.com/dstftw/youtube-dl into dstftw-best-fallback-on-outdated-avconv
...
Conflicts:
youtube_dl/YoutubeDL.py
2015-05-14 15:18:58 +06:00
Yen Chi Hsuan
8e59539752
[postprocessor/embedthumbnail] Use thumbnails downloaded by YoutubeDL
2015-05-14 02:32:00 +08:00
Yen Chi Hsuan
3749e36e9f
[YoutubeDL] Fix PEP8 W503
2015-05-13 21:16:45 +08:00
Sergey M․
97fcf1bbd0
[YoutubeDL] Check if merger can actually merge
2015-05-11 02:01:16 +06:00
Sergey M․
7fcb605b82
[YoutubeDL] Fallback to `-f best` when merger is outdated
2015-05-11 00:27:29 +06:00
Jaime Marquínez Ferrándiz
95c5534f8e
ExecAfterDownloadPP, YoutubeDL: remove unused parameters
2015-05-10 17:41:11 +02:00
Sergey M․
3799834dcf
[YoutubeDL] Do not force bestvideo+bestaudio when outtmpl is stdout ( #5627 )
2015-05-07 20:46:11 +06:00
Sergey M․
2699da8041
[YoutubeDL] Improve description file naming
2015-05-02 23:36:55 +06:00
Sergey M․
98727e123f
[YoutubeDL] Improve annotations file naming
2015-05-02 23:35:18 +06:00
Sergey M․
b29e0000e6
[YoutubeDL] Improve JSON info file naming
2015-05-02 23:23:44 +06:00
Sergey M․
666a9a2b95
[YoutubeDL] Improve audio/video-only file naming
2015-05-02 23:11:34 +06:00
Sergey M․
38c6902b90
[YoutubeDL] Ensure correct extension is always present for a merged file ( Closes #5535 )
2015-05-02 22:52:21 +06:00
Sergey M․
cb202fd286
[YoutubeDL] Filter requested info fields on `--load-info` as well
...
In order to properly handle JSON info files generated by youtube-dl versions prior to 4070b458ec
2015-05-01 00:44:34 +06:00
Jaime Marquínez Ferrándiz
df8301fef5
[YoutubeDL] pep8: use 'k not in' instead of 'not k in'
2015-04-30 20:18:42 +02:00
Sergey M․
4070b458ec
[YoutubeDL] Do not write requested info in info JSON file ( Closes #5562 , closes #5564 )
2015-04-30 23:55:05 +06:00
Sergey M․
e01c56f9e1
[YoutubeDL] Generalize best/worst format match behavior
2015-04-30 21:06:51 +06:00
Jaime Marquínez Ferrándiz
8dd5418803
Make 'best' format only match non-DASH formats ( closes #5554 )
...
Otherwise it's impossible to only download non-DASH formats, for example `best[height=?480]/best` would download a DASH video if it's the only one with height=480, instead for falling back to the second format specifier.
For audio only urls (soundcloud, bandcamp ...), the best audio will be downloaded as before.
2015-04-29 22:53:18 +02:00
zouhair
5456d78f0c
Typo "incompatible" instead of "uncompatible"
2015-04-29 10:07:49 -04:00
Jaime Marquínez Ferrándiz
9f3fa89f7c
Remove the --max-quality option
...
It doesn't work well with 'bestvideo' and 'bestaudio' because they are usually before the max quality.
Format filters should be used instead, they are more flexible and don't require the requested quality to exist for each video.
2015-04-25 11:59:54 +02:00
Yen Chi Hsuan
8be2bdfabd
[YoutubeDL] Remove the redundant assignment to old_filename
...
Caused by commmit 592e97e855
2015-04-22 15:05:35 +08:00
Sergey M․
6728187ac0
[YoutubeDL] mp3 is compatible with mp4
2015-04-20 21:58:46 +06:00
Sergey M․
17c8675853
[YoutubeDL] Allow bestvideo+bestaudio/best strategy for ted extractor
2015-04-20 21:58:29 +06:00
Sergey M․
c0dea0a782
[YoutubeDL] Respect explicit `--merge-format-output` for uncompatible formats as well
2015-04-19 22:33:52 +06:00
Sergey M․
81cd954a51
[YoutubeDL] Merge incompatible formats into mkv ( #5456 )
2015-04-19 17:55:42 +02:00
Sergey M․
feccf29c87
[YoutubeDL] Make `bestvideo+bestaudio/best` default format when merger is available
2015-04-19 17:51:56 +02:00
Jaime Marquínez Ferrándiz
5b5fbc0867
Detect already merged videos
...
Without the '--keep-video' option the two files would be downloaded again and even using the option, ffmpeg would be run again, which for some videos can take a long time.
We use a temporary file with ffmpeg so that the final file only exists if it success
2015-04-19 17:51:41 +02:00
Jaime Marquínez Ferrándiz
d47aeb2252
FFmpegMergerPP: use the new system for specifying which files can be delete
2015-04-18 11:52:36 +02:00
Jaime Marquínez Ferrándiz
592e97e855
Postprocessors: use a list for the files that can be deleted
...
We could only know if we had to delete the original file, but this system allows to specify us more files (like subtitles).
2015-04-18 11:36:42 +02:00
Jaime Marquínez Ferrándiz
ecc6bd1341
YoutubeDL.post_process: simplify keep_video handling
...
Since keep_video started as None we always set it to keep_video_wish unless it was None, so in the end keep_video == keep_video_wish. This should have been changed in f3ff1a3696
, but I didn't notice it.
2015-04-17 22:38:14 +02:00
Sergey M․
c36a959549
[YoutubeDL] Try to download worst audio+video served by a single file first ( Closes #5408 )
2015-04-12 17:36:29 +06:00
Jaime Marquínez Ferrándiz
8e4b83b96b
Remove check for ssl certs
...
When it uses a capath instead of a cafile, 'get_ca_certs' or 'cert_store_stats' only returns certificates already used in a connection.
(see #5364 )
2015-04-06 22:18:08 +02:00
Sergey M․
a3c7019e06
[YoutubeDL] Check for `get_ca_certs` availability
...
`get_ca_certs` is not available in python <3.4
2015-04-02 22:50:10 +06:00
Jaime Marquínez Ferrándiz
1a944d8a2a
Print a warning if no ssl certificates are loaded
2015-04-02 14:09:55 +02:00
Jaime Marquínez Ferrándiz
70a1165b32
Don't use bare 'except:'
...
They catch any exception, including KeyboardInterrupt, we don't want to catch it.
2015-03-27 13:02:20 +01:00
Jaime Marquínez Ferrándiz
179d6678b1
Remove the 'stitle' field
...
A warning has been printed for more than 2 years (since 97cd3afc75
)
2015-03-21 12:34:44 +01:00
Kang Hyojun
613b2d9dc6
Fix mistyped docstring indent
2015-03-15 20:18:23 +09:00
Philipp Hagemeister
486dd09e0b
[YoutubeDL] Check for bytes instead of unicode output templates ( #5192 )
...
Also adapt the embedding examples for those poor souls still using 2.x.
2015-03-13 08:40:20 +01:00
Jaime Marquínez Ferrándiz
3a77719c5a
Don't accept '-1' as format, 'all' is clearer
2015-03-11 17:38:35 +01:00
Sergey M․
e5a11a2293
[YoutubeDL] Sanitize path before creating non-existent paths ( Closes #4324 )
2015-03-08 22:09:42 +06:00
Sergey M․
1bb5c511a5
[YoutubeDL] Sanitize outtmpl as path
2015-03-08 20:57:30 +06:00
Sergey M․
7dcad95d4f
[YoutubeDL] Sanitize outtmpl as it may contain forbidden characters
2015-03-08 01:13:23 +06:00
Philipp Hagemeister
2461f79d2a
[utils] Correct per-request proxy handling
2015-03-03 13:56:06 +01:00
Philipp Hagemeister
91410c9bfa
[letv] Add --cn-verification-proxy ( Closes #5077 )
2015-03-03 00:03:06 +01:00
Philipp Hagemeister
c75f0b361a
[downloader/external] Add support for custom options ( Fixes #4885 , closes #5098 )
2015-03-02 18:21:31 +01:00
Jaime Marquínez Ferrándiz
31bd39256b
--load-info: Use the fileinput module
...
It automatically handles the '-' filename as stdin
2015-03-01 11:54:48 +01:00
Jaime Marquínez Ferrándiz
003c69a84b
Use shutil.get_terminal_size for getting the terminal width if it's available (python >= 3.3)
2015-02-28 21:44:57 +01:00
Jaime Marquínez Ferrándiz
0f2c0d335b
[YoutubeDL] Use the InfoExtractor._download_webpage method for getting the subtitles
...
It handles encodings better, for example for 'http://www.npo.nl/nos-journaal/14-02-2015/POW_00942207 '
2015-02-28 14:03:27 +01:00
Jaime Marquínez Ferrándiz
bfc993cc91
Merge branch 'subtitles-rework'
...
(Closes PR #4964 )
2015-02-23 17:13:03 +01:00
Jaime Marquínez Ferrándiz
b531cfc019
[YoutubeDL] remove compatiblity with the old subtitles system
2015-02-23 16:12:35 +01:00
Jaime Marquínez Ferrándiz
98c70d6fc7
[YoutubeDL] only add normal subtitles to the 'requested_subtitles' field if 'writesubtitles' is True
2015-02-22 11:37:27 +01:00