Commit Graph

314 Commits (003c69a84b68cadb46aeb8e03115848a722fd675)

Author SHA1 Message Date
Jaime Marquínez Ferrándiz 003c69a84b Use shutil.get_terminal_size for getting the terminal width if it's available (python >= 3.3) 9 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'
9 years ago
Jaime Marquínez Ferrándiz bfc993cc91 Merge branch 'subtitles-rework'
(Closes PR #4964)
9 years ago
Jaime Marquínez Ferrándiz b531cfc019 [YoutubeDL] remove compatiblity with the old subtitles system 9 years ago
Jaime Marquínez Ferrándiz 98c70d6fc7 [YoutubeDL] only add normal subtitles to the 'requested_subtitles' field if 'writesubtitles' is True 9 years ago
Jaime Marquínez Ferrándiz 4d17184817 [YoutubeDL] don't set the 'requested_subtitles' without writesubtitles or writeautomaticsub 9 years ago
Philipp Hagemeister 8fb3ac3649 PEP8: W503 9 years ago
Philipp Hagemeister b81a359eb6 [YoutubeDL] Use render_table for format listing 9 years ago
Jaime Marquínez Ferrándiz edab9dbf4d [YoutubeDL] use the 'render_table' function for listing the subtitles 9 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.
9 years ago
Philipp Hagemeister f9216ed6ad Merge remote-tracking branch 'origin/master' 9 years ago
Philipp Hagemeister f740fae2a4 [ffmpeg] Make available a property 9 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.
9 years ago
Philipp Hagemeister 85729c51af [downloader] Add --hls-prefer-native to use the native HLS downloader (#4966) 9 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.
9 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.
9 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.
9 years ago
Philipp Hagemeister 73fac4e911 [ffmpeg] Add --ffmpeg-location 9 years ago
Philipp Hagemeister 442c37b7a9 [YoutubeDL] Do not perform filter matching on partial results (Fixes #4921) 9 years ago
Philipp Hagemeister 7e5db8c930 [options] Add --no-color 9 years ago
Philipp Hagemeister 347de4931c [YoutubeDL] Add generic video filtering (Fixes #4916)
This functionality is intended to eventually encompass the current format filtering.
9 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.
9 years ago
Sergey M․ 2ec19e9558 [YoutubeDL] Allow filtering by audio sampling rate 9 years ago
Sergey M․ 9ddb6925bf [YoutubeDL] Allow filtering by string properties (#4906) 9 years ago
Jaime Marquínez Ferrándiz b3a286d69d [YoutubeDL] _calc_cookies: add get_header method to _PseudoRequest (#4861) 9 years ago
Sergey M․ 300753a069 [YoutubeDL] Fix video+audio format field (Closes #4880) 9 years ago
Philipp Hagemeister f6c24009be [YoutubeDL] Calculate thumbnail IDs automatically 9 years ago
Philipp Hagemeister 8f9312c387 Appease pyflakes8-3 9 years ago
Sergey M․ 6d593c3276 [YoutubeDL] Fix video+audio format_id (Closes #4824) 9 years ago
codesparkle 5468ff4d91 Remove duplicate dictionary keys 9 years ago
Jaime Marquínez Ferrándiz a7a14d9586 [YoutubeDL] set the 'thumbnails' field if the info_dict has the 'thumbnails' field
Since the '--write-thumbnail' uses the 'thumbnails' field and we didn't updated the info_dict, it wouldn't detect the thumbnail. (fixes #4812)
9 years ago
Sergey M․ dcf53d4408 [YoutubeDL] Set format_id for video+audio (Closes #3634) 9 years ago
Sergey M․ 3a0d2f520a [YoutubeDL] Temporary fix for subprocess encoding issues on python2 @ Windows (Closes #4787)
For now filenames will be encoded with preferrefencoding before written to disk
9 years ago
Philipp Hagemeister 9f0df77ab1 [YoutubeDL] Allow format filtering by fps 9 years ago
Jaime Marquínez Ferrándiz e72c7e4123 [YoutubeDL] Always set the '_filename' field in the info_dict (reported in #4053)
It's also useful when you use the '--write-info-json' option.
9 years ago
Philipp Hagemeister ee69b99af6 [YoutubeDL] clarify hook documentation 9 years ago
Philipp Hagemeister 881e6a1f5c Add --xattr-set-filesize option (Fixes #1348) 9 years ago
Philipp Hagemeister c14e88f0f5 [YoutubeDL] Add --playlist-items option (Fixes #2662) 9 years ago
Philipp Hagemeister ec82d85acd [YoutubeDL] Implement --write-all-thumbnails (Closes #2269) 9 years ago
Philipp Hagemeister cfb56d1af3 Add --list-thumbnails 9 years ago
Jaime Marquínez Ferrándiz 1070711d60 [YoutubeDL._calc_cookies] Restore the 'is_unverifiable'
I should have check everything was copied before commiting 4b405cfc6e.
9 years ago
Jaime Marquínez Ferrándiz 4b405cfc6e [YoutubeDL._calc_cookies] Restore the 'has_header' method
I didn't copied it from downloader/external
9 years ago
Jaime Marquínez Ferrándiz e5660ee6ae [YoutubeDL] Fill the info dict 'http_headers' field with all the headers available
Useful for external tools using the json output.

The methods '_calc_headers' and '_calc_cookies' have been copied from the downloader/external, now they just use "info_dict['http_headers']".
9 years ago
Philipp Hagemeister 222516d97d [downloader] Lay groundwork for external downloaders.
This comes with a very simply implementation for wget; the real work is in setting up the infrastructure.
9 years ago
Philipp Hagemeister a055469faf [downloader] Improve downloader selection 9 years ago
Philipp Hagemeister 62cd676c74 [youtube] Fixup DASH m4a headers
This fixes #2288, #2506, #2607, #3681, #4741, #4767.
9 years ago
Philipp Hagemeister 5f0d813d93 Merge remote-tracking branch 'rupertbaxter2/master'
Conflicts:
	youtube_dl/__init__.py
	youtube_dl/downloader/common.py
9 years ago
Philipp Hagemeister 083c9df93b [YoutubeDL] Allow filtering by properties (Fixes #4584) 9 years ago
Pierre 4340decad2 check for overwriting files in the downloader (fixes #3916, closes #3829) 9 years ago
Jaime Marquínez Ferrándiz f3ff1a3696 YoutubeDL: Make the decision about removing the original file after each postprocessor is run (fixes #2261)
If one of the processors said the file should be kept, it wouldn't pay
attention to the response from the following processors. This was wrong if the
'keep_video' option was False, if the first extractor modifies the original file
and then we extract its audio we don't want to keep the original video file.
9 years ago