Commit Graph

439 Commits (9c7b509b2a3da1e23e81a2b9039185e09180328a)

Author SHA1 Message Date
Jaime Marquínez Ferrándiz d96d604e53 YoutubeDL: format spec: don't accept a bare '/' (#6124) 9 years ago
Jaime Marquínez Ferrándiz 03950c90f7 Merge remote-tracking branch 'jaimemf/format_spec_groups' (closes #6124) 9 years ago
Jaime Marquínez Ferrándiz 8250c32f49 [YoutubeDL] don't default to 'bestvideo+bestaudio/best' for live videos
Doesn't work currently.
9 years ago
Sergey M․ f72b0a6032 Revert xvid to avi and make docs to be similar to existing external downloader option 9 years ago
Sergey M․ ac9ed061ec Merge branch 'master' of https://github.com/aurium/youtube-dl into aurium-master 9 years ago
Jaime Marquínez Ferrándiz 0a31a35098 [YoutubeDL] format spec: add additional checks for invalid syntax 9 years ago
Jaime Marquínez Ferrándiz 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'.
9 years ago
Jaime Marquínez Ferrándiz 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.
9 years ago
Aurélio A. Heckert 1866432db7 Rename --pp-params to --postprocessor-args and access value as super class attribute 9 years ago
Jaime Marquínez Ferrándiz 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'.
9 years ago
Jaime Marquínez Ferrándiz 0130afb76e [YoutubeDL] format spec: allow grouping specifiers with parentheses 9 years ago
Jaime Marquínez Ferrándiz 5acfa126c8 [YoutubeDL] format spec: treat 'all' like a normal specifier
So you can use filters with it, for example 'all[width>=400][width<=600]'.
9 years ago
Jaime Marquínez Ferrándiz 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.
9 years ago
Sergey M․ 9603e8a7d9 [YoutubeDL] Handle None width and height similarly to formats 9 years ago
Sergey M. 3c3b4176bd Merge pull request #5961 from dstftw/force-generic-extractor
Add --force-generic-extractor
10 years ago
Aurélio A. Heckert 14835de9fb Use shlex.split for --pp-params and update related docs. 10 years ago
Yen Chi Hsuan 0501bfa159 [YoutubeDL] Youku extractor now uses the standard format selection 10 years ago
Shrimadhav U K 180940e02d spelling mistake corrected
acces changed to accessing
10 years ago
Sergey M․ 0072afca8e [YoutubeDL] Remove force_generic_extractor arg from process_ie_result 10 years ago
Sergey M․ 61aa5ba36e [YoutubeDL] Remove global state for force_generic_extractor flag in favor of passing argument 10 years ago
Sergey M․ 9f4323252a [YoutubeDL] Fix for multiple URLs 10 years ago
Sergey M․ 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/
10 years ago
Sergey M․ a55e36f48d [YoutubeDL] Handle out-of-range timestamps (#5826) 10 years ago
Sergey M․ df15ef8dab [YoutubeDL] Tweak select_format for video only media 10 years ago
Sergey M․ 931bc3c3a7 [YoutubeDL] Do not loose request method information 10 years ago
Sergey M․ 181c7053e3 [YoutubeDL] Make sure all formats have unique format_id 10 years ago
Sergey M․ 71646e4653 [YoutubeDL] Initialize `files_to_delete` (Closes #5797) 10 years ago
Sergey M․ 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.
10 years ago
Jaime Marquínez Ferrándiz 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.
10 years ago
Sergey M․ 82245a6de7 [YoutubeDL] Restore filename for thumbnails 10 years ago
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
10 years ago
Yen Chi Hsuan 8e59539752 [postprocessor/embedthumbnail] Use thumbnails downloaded by YoutubeDL 10 years ago
Yen Chi Hsuan 3749e36e9f [YoutubeDL] Fix PEP8 W503 10 years ago
Sergey M․ 97fcf1bbd0 [YoutubeDL] Check if merger can actually merge 10 years ago
Sergey M․ 7fcb605b82 [YoutubeDL] Fallback to `-f best` when merger is outdated 10 years ago
Jaime Marquínez Ferrándiz 95c5534f8e ExecAfterDownloadPP, YoutubeDL: remove unused parameters 10 years ago
Sergey M․ 3799834dcf [YoutubeDL] Do not force bestvideo+bestaudio when outtmpl is stdout (#5627) 10 years ago
Sergey M․ 2699da8041 [YoutubeDL] Improve description file naming 10 years ago
Sergey M․ 98727e123f [YoutubeDL] Improve annotations file naming 10 years ago
Sergey M․ b29e0000e6 [YoutubeDL] Improve JSON info file naming 10 years ago
Sergey M․ 666a9a2b95 [YoutubeDL] Improve audio/video-only file naming 10 years ago
Sergey M․ 38c6902b90 [YoutubeDL] Ensure correct extension is always present for a merged file (Closes #5535) 10 years ago
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
10 years ago
Jaime Marquínez Ferrándiz df8301fef5 [YoutubeDL] pep8: use 'k not in' instead of 'not k in' 10 years ago
Sergey M․ 4070b458ec [YoutubeDL] Do not write requested info in info JSON file (Closes #5562, closes #5564) 10 years ago
Sergey M․ e01c56f9e1 [YoutubeDL] Generalize best/worst format match behavior 10 years ago
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.
10 years ago
zouhair 5456d78f0c Typo "incompatible" instead of "uncompatible" 10 years ago
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.
10 years ago
Yen Chi Hsuan 8be2bdfabd [YoutubeDL] Remove the redundant assignment to old_filename
Caused by commmit 592e97e855
10 years ago
Sergey M․ 6728187ac0 [YoutubeDL] mp3 is compatible with mp4 10 years ago
Sergey M․ 17c8675853 [YoutubeDL] Allow bestvideo+bestaudio/best strategy for ted extractor 10 years ago
Sergey M․ c0dea0a782 [YoutubeDL] Respect explicit `--merge-format-output` for uncompatible formats as well 10 years ago
Sergey M․ 81cd954a51 [YoutubeDL] Merge incompatible formats into mkv (#5456) 10 years ago
Sergey M․ feccf29c87 [YoutubeDL] Make `bestvideo+bestaudio/best` default format when merger is available 10 years ago
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
10 years ago
Jaime Marquínez Ferrándiz d47aeb2252 FFmpegMergerPP: use the new system for specifying which files can be delete 10 years ago
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).
10 years ago
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.
10 years ago
Sergey M․ c36a959549 [YoutubeDL] Try to download worst audio+video served by a single file first (Closes #5408) 10 years ago
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)
10 years ago
Sergey M․ a3c7019e06 [YoutubeDL] Check for `get_ca_certs` availability
`get_ca_certs` is not available in python <3.4
10 years ago
Jaime Marquínez Ferrándiz 1a944d8a2a Print a warning if no ssl certificates are loaded 10 years ago
Jaime Marquínez Ferrándiz 70a1165b32 Don't use bare 'except:'
They catch any exception, including KeyboardInterrupt, we don't want to catch it.
10 years ago
Jaime Marquínez Ferrándiz 179d6678b1 Remove the 'stitle' field
A warning has been printed for more than 2 years (since 97cd3afc75)
10 years ago
Kang Hyojun 613b2d9dc6 Fix mistyped docstring indent 10 years ago
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.
10 years ago
Jaime Marquínez Ferrándiz 3a77719c5a Don't accept '-1' as format, 'all' is clearer 10 years ago
Sergey M․ e5a11a2293 [YoutubeDL] Sanitize path before creating non-existent paths (Closes #4324) 10 years ago
Sergey M․ 1bb5c511a5 [YoutubeDL] Sanitize outtmpl as path 10 years ago
Sergey M․ 7dcad95d4f [YoutubeDL] Sanitize outtmpl as it may contain forbidden characters 10 years ago
Philipp Hagemeister 2461f79d2a [utils] Correct per-request proxy handling 10 years ago
Philipp Hagemeister 91410c9bfa [letv] Add --cn-verification-proxy (Closes #5077) 10 years ago
Philipp Hagemeister c75f0b361a [downloader/external] Add support for custom options (Fixes #4885, closes #5098) 10 years ago
Jaime Marquínez Ferrándiz 31bd39256b --load-info: Use the fileinput module
It automatically handles the '-' filename as stdin
10 years ago
Jaime Marquínez Ferrándiz 003c69a84b Use shutil.get_terminal_size for getting the terminal width if it's available (python >= 3.3) 10 years ago
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'
10 years ago
Jaime Marquínez Ferrándiz bfc993cc91 Merge branch 'subtitles-rework'
(Closes PR #4964)
10 years ago
Jaime Marquínez Ferrándiz b531cfc019 [YoutubeDL] remove compatiblity with the old subtitles system 10 years ago
Jaime Marquínez Ferrándiz 98c70d6fc7 [YoutubeDL] only add normal subtitles to the 'requested_subtitles' field if 'writesubtitles' is True 10 years ago
Jaime Marquínez Ferrándiz 4d17184817 [YoutubeDL] don't set the 'requested_subtitles' without writesubtitles or writeautomaticsub 10 years ago
Philipp Hagemeister 8fb3ac3649 PEP8: W503 10 years ago
Philipp Hagemeister b81a359eb6 [YoutubeDL] Use render_table for format listing 10 years ago
Jaime Marquínez Ferrándiz edab9dbf4d [YoutubeDL] use the 'render_table' function for listing the subtitles 10 years ago
Philipp Hagemeister 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.
10 years ago
Philipp Hagemeister f9216ed6ad Merge remote-tracking branch 'origin/master' 10 years ago
Philipp Hagemeister f740fae2a4 [ffmpeg] Make available a property 10 years ago
Jaime Marquínez Ferrándiz 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.
10 years ago
Philipp Hagemeister 85729c51af [downloader] Add --hls-prefer-native to use the native HLS downloader (#4966) 10 years ago
Jaime Marquínez Ferrándiz 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.
10 years ago
Jaime Marquínez Ferrándiz 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.
10 years ago
Jaime Marquínez Ferrándiz 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.
10 years ago
Philipp Hagemeister 73fac4e911 [ffmpeg] Add --ffmpeg-location 10 years ago
Philipp Hagemeister 442c37b7a9 [YoutubeDL] Do not perform filter matching on partial results (Fixes #4921) 10 years ago
Philipp Hagemeister 7e5db8c930 [options] Add --no-color 10 years ago
Philipp Hagemeister 347de4931c [YoutubeDL] Add generic video filtering (Fixes #4916)
This functionality is intended to eventually encompass the current format filtering.
10 years ago
Philipp Hagemeister 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.
10 years ago
Sergey M․ 2ec19e9558 [YoutubeDL] Allow filtering by audio sampling rate 10 years ago
Sergey M․ 9ddb6925bf [YoutubeDL] Allow filtering by string properties (#4906) 10 years ago
Jaime Marquínez Ferrándiz b3a286d69d [YoutubeDL] _calc_cookies: add get_header method to _PseudoRequest (#4861) 10 years ago