03950c90f7
Merge remote-tracking branch 'jaimemf/format_spec_groups' ( closes #6124 )
2015-08-03 15:22:51 +02:00
8250c32f49
[YoutubeDL] don't default to 'bestvideo+bestaudio/best' for live videos
...
Doesn't work currently.
2015-07-20 20:25:53 +02:00
f72b0a6032
Revert xvid to avi and make docs to be similar to existing external downloader option
2015-07-11 22:15:16 +06:00
ac9ed061ec
Merge branch 'master' of https://github.com/aurium/youtube-dl into aurium-master
2015-07-11 21:58:12 +06:00
0a31a35098
[YoutubeDL] format spec: add additional checks for invalid syntax
2015-07-10 22:46:25 +02:00
bb8e553662
[YoutubeDL] format spec: Do not fail when a filter gives an empty result
...
For example with 'best[height<40]' we ended getting a 'IndexError: list index out of range'.
2015-07-04 21:41:09 +02:00
f5f4a27a96
[YoutubeDL] format spec: fix handling of '/' with ','
...
When using 'bestvideo/best,bestaudio', 'bestvideo/best' must be set as the current_selector (instead of appending it to the selectors), otherwise when it gets the ',' it would append 'None' to the selectors.
2015-07-04 21:30:26 +02:00
1866432db7
Rename --pp-params to --postprocessor-args and access value as super class attribute
2015-06-30 16:22:09 -03:00
cf2ac6df68
[YoutubeDL] format spec: Fix handling of '+' with '/'
...
'bestvideo+bestaudio/best' was incorrectly interpreted as 'bestvideo+(bestaudio/best)', so it would fail if 'bestaudio' doesn't exist instead of falling back to 'best'.
2015-06-30 19:50:17 +02:00
0130afb76e
[YoutubeDL] format spec: allow grouping specifiers with parentheses
2015-06-29 12:46:02 +02:00
5acfa126c8
[YoutubeDL] format spec: treat 'all' like a normal specifier
...
So you can use filters with it, for example 'all[width>=400][width<=600]'.
2015-06-28 22:48:02 +02:00
67134eaba1
[YoutubeDL] rework how the format spec is processed
...
The spec string is processed using 'tokenize.tokenize' to split it in words and operators, the filters are still processed using regular expressions.
This should make easier to allow grouping operators with parens.
2015-06-28 22:31:35 +02:00
9603e8a7d9
[YoutubeDL] Handle None width and height similarly to formats
2015-06-28 22:55:28 +06:00
3c3b4176bd
Merge pull request #5961 from dstftw/force-generic-extractor
...
Add --force-generic-extractor
2015-06-24 19:10:45 +05:00
14835de9fb
Use shlex.split for --pp-params and update related docs.
2015-06-16 18:10:31 -03:00
0501bfa159
[YoutubeDL] Youku extractor now uses the standard format selection
2015-06-16 00:15:30 +08:00
180940e02d
spelling mistake corrected
...
acces changed to accessing
2015-06-14 11:19:42 +05:30
0072afca8e
[YoutubeDL] Remove force_generic_extractor arg from process_ie_result
2015-06-13 02:21:29 +06:00
61aa5ba36e
[YoutubeDL] Remove global state for force_generic_extractor flag in favor of passing argument
2015-06-13 02:05:21 +06:00
9f4323252a
[YoutubeDL] Fix for multiple URLs
2015-06-12 21:56:50 +06:00
d22dec74ff
Add `--force-generic-extractor`
...
For some extractors that are hard to workout a good _VALID_URL we use very vague and unrestrictive ones,
e.g. just allowing anything after hostname and capturing part of URL as id.
If some of these extractors happen to have an video embed of some different hoster or platform
and this scenario was not handled in extractor itself we end up with inability to download this embed
until extractor is fixed to support embed of this kind.
Forcing downloader to use the generic extractor can be a neat temporary solution for this problem.
Example: FiveTV extractor with Tvigle embed - http://www.5-tv.ru/rabota/broadcasts/48/
2015-06-12 19:20:12 +06:00
a55e36f48d
[YoutubeDL] Handle out-of-range timestamps ( #5826 )
2015-06-08 21:05:17 +06:00
df15ef8dab
[YoutubeDL] Tweak select_format for video only media
2015-05-31 04:05:09 +06:00
931bc3c3a7
[YoutubeDL] Do not loose request method information
2015-05-30 22:52:02 +06:00
181c7053e3
[YoutubeDL] Make sure all formats have unique format_id
2015-05-30 16:04:44 +06:00
71646e4653
[YoutubeDL] Initialize `files_to_delete` ( Closes #5797 )
2015-05-24 04:14:01 +06:00
4a5a898a8f
[YoutubeDL] Clarify incompatible formats merge message
...
When `-f` is not specified it's misleading to see `You have requested ...` as user did not actually request any formats.
2015-05-17 20:56:03 +06:00
3884dcf313
YoutubeDL: ignore indexes from 'playlist_items' that are not in the list ( fixes #5706 )
...
We ignore them instead of failing to match the behaviour of the 'playliststart' parameter.
2015-05-15 14:08:26 +02:00
82245a6de7
[YoutubeDL] Restore filename for thumbnails
2015-05-14 15:21:27 +06:00
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
8e59539752
[postprocessor/embedthumbnail] Use thumbnails downloaded by YoutubeDL
2015-05-14 02:32:00 +08:00
3749e36e9f
[YoutubeDL] Fix PEP8 W503
2015-05-13 21:16:45 +08:00
97fcf1bbd0
[YoutubeDL] Check if merger can actually merge
2015-05-11 02:01:16 +06:00
7fcb605b82
[YoutubeDL] Fallback to `-f best` when merger is outdated
2015-05-11 00:27:29 +06:00
95c5534f8e
ExecAfterDownloadPP, YoutubeDL: remove unused parameters
2015-05-10 17:41:11 +02:00
3799834dcf
[YoutubeDL] Do not force bestvideo+bestaudio when outtmpl is stdout ( #5627 )
2015-05-07 20:46:11 +06:00
2699da8041
[YoutubeDL] Improve description file naming
2015-05-02 23:36:55 +06:00
98727e123f
[YoutubeDL] Improve annotations file naming
2015-05-02 23:35:18 +06:00
b29e0000e6
[YoutubeDL] Improve JSON info file naming
2015-05-02 23:23:44 +06:00
666a9a2b95
[YoutubeDL] Improve audio/video-only file naming
2015-05-02 23:11:34 +06:00
38c6902b90
[YoutubeDL] Ensure correct extension is always present for a merged file ( Closes #5535 )
2015-05-02 22:52:21 +06:00
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
df8301fef5
[YoutubeDL] pep8: use 'k not in' instead of 'not k in'
2015-04-30 20:18:42 +02:00
4070b458ec
[YoutubeDL] Do not write requested info in info JSON file ( Closes #5562 , closes #5564 )
2015-04-30 23:55:05 +06:00
e01c56f9e1
[YoutubeDL] Generalize best/worst format match behavior
2015-04-30 21:06:51 +06:00
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
5456d78f0c
Typo "incompatible" instead of "uncompatible"
2015-04-29 10:07:49 -04:00
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
8be2bdfabd
[YoutubeDL] Remove the redundant assignment to old_filename
...
Caused by commmit 592e97e855
2015-04-22 15:05:35 +08:00
6728187ac0
[YoutubeDL] mp3 is compatible with mp4
2015-04-20 21:58:46 +06:00
17c8675853
[YoutubeDL] Allow bestvideo+bestaudio/best strategy for ted extractor
2015-04-20 21:58:29 +06:00
c0dea0a782
[YoutubeDL] Respect explicit `--merge-format-output` for uncompatible formats as well
2015-04-19 22:33:52 +06:00
81cd954a51
[YoutubeDL] Merge incompatible formats into mkv ( #5456 )
2015-04-19 17:55:42 +02:00
feccf29c87
[YoutubeDL] Make `bestvideo+bestaudio/best` default format when merger is available
2015-04-19 17:51:56 +02:00
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
d47aeb2252
FFmpegMergerPP: use the new system for specifying which files can be delete
2015-04-18 11:52:36 +02:00
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
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
2015-04-17 22:38:14 +02:00
c36a959549
[YoutubeDL] Try to download worst audio+video served by a single file first ( Closes #5408 )
2015-04-12 17:36:29 +06:00
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
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
1a944d8a2a
Print a warning if no ssl certificates are loaded
2015-04-02 14:09:55 +02:00
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
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
613b2d9dc6
Fix mistyped docstring indent
2015-03-15 20:18:23 +09:00
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
3a77719c5a
Don't accept '-1' as format, 'all' is clearer
2015-03-11 17:38:35 +01:00
e5a11a2293
[YoutubeDL] Sanitize path before creating non-existent paths ( Closes #4324 )
2015-03-08 22:09:42 +06:00
1bb5c511a5
[YoutubeDL] Sanitize outtmpl as path
2015-03-08 20:57:30 +06:00
7dcad95d4f
[YoutubeDL] Sanitize outtmpl as it may contain forbidden characters
2015-03-08 01:13:23 +06:00
2461f79d2a
[utils] Correct per-request proxy handling
2015-03-03 13:56:06 +01:00
91410c9bfa
[letv] Add --cn-verification-proxy ( Closes #5077 )
2015-03-03 00:03:06 +01:00
c75f0b361a
[downloader/external] Add support for custom options ( Fixes #4885 , closes #5098 )
2015-03-02 18:21:31 +01:00
31bd39256b
--load-info: Use the fileinput module
...
It automatically handles the '-' filename as stdin
2015-03-01 11:54:48 +01:00
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
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
bfc993cc91
Merge branch 'subtitles-rework'
...
(Closes PR #4964 )
2015-02-23 17:13:03 +01:00
b531cfc019
[YoutubeDL] remove compatiblity with the old subtitles system
2015-02-23 16:12:35 +01:00
98c70d6fc7
[YoutubeDL] only add normal subtitles to the 'requested_subtitles' field if 'writesubtitles' is True
2015-02-22 11:37:27 +01:00
4d17184817
[YoutubeDL] don't set the 'requested_subtitles' without writesubtitles or writeautomaticsub
2015-02-22 00:27:49 +01:00
8fb3ac3649
PEP8: W503
2015-02-21 14:55:13 +01:00
b81a359eb6
[YoutubeDL] Use render_table for format listing
2015-02-19 00:28:58 +01:00
edab9dbf4d
[YoutubeDL] use the 'render_table' function for listing the subtitles
2015-02-17 22:59:19 +01:00
5cda4eda72
[YoutubeDL] Use a progress hook for progress reporting
...
Instead of every downloader calling two helper functions, let our progress report be an ordinary progress hook like everyone else's.
Closes #4875 .
2015-02-17 21:40:35 +01:00
f9216ed6ad
Merge remote-tracking branch 'origin/master'
2015-02-17 17:28:51 +01:00
f740fae2a4
[ffmpeg] Make available a property
2015-02-17 17:26:41 +01:00
662435f728
[YoutubeDL] Use a Request object for getting the cookies ( fixes #4970 )
...
So that we don't have to implement all the methods used by the cookiejar.
2015-02-17 16:29:24 +01:00
85729c51af
[downloader] Add --hls-prefer-native to use the native HLS downloader ( #4966 )
2015-02-17 12:09:12 +01:00
360e1ca5cc
[youtube] Convert to new subtitles system
...
The automatic captions are stored in the 'automactic_captions' field, which is used if no normal subtitles are found for an specific language.
2015-02-16 22:47:39 +01:00
c84dd8a90d
[YoutubeDL] store the subtitles to download in the 'requested_subtitles' field
...
We need to keep the orginal subtitles information, so that the '--load-info' option can be used to list or select the subtitles again.
We'll also be able to have a separate field for storing the automatic captions info.
2015-02-16 21:51:08 +01:00
a504ced097
Improve subtitles support
...
For each language the extractor builds a list with the available formats sorted (like for video formats), then YoutubeDL selects one of them using the '--sub-format' option which now allows giving the format preferences (for example 'ass/srt/best').
For each format the 'url' field can be set so that we only download the contents if needed, or if the contents needs to be processed (like in crunchyroll) the 'data' field can be used.
The reasons for this change are:
* We weren't checking that the format given with '--sub-format' was available, checking it in each extractor would be repetitive.
* It allows to easily support giving a format preference.
* The subtitles were automatically downloaded in the extractor, but I think that if you use for example the '--dump-json' option you want to finish as fast as possible.
Currently only the ted extractor has been updated, but the old system still works.
2015-02-16 21:51:03 +01:00
73fac4e911
[ffmpeg] Add --ffmpeg-location
2015-02-16 04:05:53 +01:00
442c37b7a9
[YoutubeDL] Do not perform filter matching on partial results ( Fixes #4921 )
2015-02-10 11:28:28 +01:00
7e5db8c930
[options] Add --no-color
2015-02-10 04:22:10 +01:00
347de4931c
[YoutubeDL] Add generic video filtering ( Fixes #4916 )
...
This functionality is intended to eventually encompass the current format filtering.
2015-02-10 03:32:24 +01:00
43f244b6d5
[YoutubeDL] Do not show worst in --list-formats output
...
Nobody wants to know what the worst possible format is. And if they do, they can still provide -f worst.
2015-02-09 15:57:42 +01:00
2ec19e9558
[YoutubeDL] Allow filtering by audio sampling rate
2015-02-09 01:09:45 +06:00
9ddb6925bf
[YoutubeDL] Allow filtering by string properties ( #4906 )
2015-02-09 01:07:43 +06:00
b3a286d69d
[YoutubeDL] _calc_cookies: add get_header method to _PseudoRequest ( #4861 )
2015-02-06 22:23:06 +01:00
300753a069
[YoutubeDL] Fix video+audio format field ( Closes #4880 )
2015-02-06 00:51:16 +06:00
Jaime Marquínez Ferrándiz
Sergey M․
Aurélio A. Heckert
Yen Chi Hsuan
Shrimadhav U K
zouhair
Kang Hyojun
Philipp Hagemeister