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
Jaime Marquínez Ferrándiz
4d17184817
[YoutubeDL] don't set the 'requested_subtitles' without writesubtitles or writeautomaticsub
2015-02-22 00:27:49 +01:00
Philipp Hagemeister
8fb3ac3649
PEP8: W503
2015-02-21 14:55:13 +01:00
Philipp Hagemeister
b81a359eb6
[YoutubeDL] Use render_table for format listing
2015-02-19 00:28:58 +01:00
Jaime Marquínez Ferrándiz
edab9dbf4d
[YoutubeDL] use the 'render_table' function for listing the subtitles
2015-02-17 22:59:19 +01:00
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 .
2015-02-17 21:40:35 +01:00
Philipp Hagemeister
f9216ed6ad
Merge remote-tracking branch 'origin/master'
2015-02-17 17:28:51 +01:00
Philipp Hagemeister
f740fae2a4
[ffmpeg] Make available a property
2015-02-17 17:26:41 +01:00
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.
2015-02-17 16:29:24 +01:00
Philipp Hagemeister
85729c51af
[downloader] Add --hls-prefer-native to use the native HLS downloader ( #4966 )
2015-02-17 12:09:12 +01:00
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.
2015-02-16 22:47:39 +01:00
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.
2015-02-16 21:51:08 +01:00
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.
2015-02-16 21:51:03 +01:00
Philipp Hagemeister
73fac4e911
[ffmpeg] Add --ffmpeg-location
2015-02-16 04:05:53 +01:00
Philipp Hagemeister
442c37b7a9
[YoutubeDL] Do not perform filter matching on partial results ( Fixes #4921 )
2015-02-10 11:28:28 +01:00
Philipp Hagemeister
7e5db8c930
[options] Add --no-color
2015-02-10 04:22:10 +01:00
Philipp Hagemeister
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
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.
2015-02-09 15:57:42 +01:00
Sergey M․
2ec19e9558
[YoutubeDL] Allow filtering by audio sampling rate
2015-02-09 01:09:45 +06:00
Sergey M․
9ddb6925bf
[YoutubeDL] Allow filtering by string properties ( #4906 )
2015-02-09 01:07:43 +06:00
Jaime Marquínez Ferrándiz
b3a286d69d
[YoutubeDL] _calc_cookies: add get_header method to _PseudoRequest ( #4861 )
2015-02-06 22:23:06 +01:00
Sergey M․
300753a069
[YoutubeDL] Fix video+audio format field ( Closes #4880 )
2015-02-06 00:51:16 +06:00
Philipp Hagemeister
f6c24009be
[YoutubeDL] Calculate thumbnail IDs automatically
2015-02-03 10:52:22 +01:00
Philipp Hagemeister
8f9312c387
Appease pyflakes8-3
2015-02-01 11:30:56 +01:00
Sergey M․
6d593c3276
[YoutubeDL] Fix video+audio format_id ( Closes #4824 )
2015-01-31 03:50:11 +06:00
codesparkle
5468ff4d91
Remove duplicate dictionary keys
2015-01-30 20:11:51 +11:00
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 )
2015-01-29 20:15:38 +01:00
Sergey M․
dcf53d4408
[YoutubeDL] Set format_id for video+audio ( Closes #3634 )
2015-01-29 00:44:40 +06:00
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
2015-01-27 22:38:28 +06:00
Philipp Hagemeister
9f0df77ab1
[YoutubeDL] Allow format filtering by fps
2015-01-26 14:36:22 +01:00
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.
2015-01-26 12:01:43 +01:00
Philipp Hagemeister
ee69b99af6
[YoutubeDL] clarify hook documentation
2015-01-25 06:15:54 +01:00
Philipp Hagemeister
881e6a1f5c
Add --xattr-set-filesize option ( Fixes #1348 )
2015-01-25 04:49:44 +01:00
Philipp Hagemeister
c14e88f0f5
[YoutubeDL] Add --playlist-items option ( Fixes #2662 )
2015-01-25 04:24:55 +01:00
Philipp Hagemeister
ec82d85acd
[YoutubeDL] Implement --write-all-thumbnails ( Closes #2269 )
2015-01-25 03:11:12 +01:00
Philipp Hagemeister
cfb56d1af3
Add --list-thumbnails
2015-01-25 02:43:19 +01:00
Jaime Marquínez Ferrándiz
1070711d60
[YoutubeDL._calc_cookies] Restore the 'is_unverifiable'
...
I should have check everything was copied before commiting 4b405cfc6e
.
2015-01-24 20:12:47 +01:00
Jaime Marquínez Ferrándiz
4b405cfc6e
[YoutubeDL._calc_cookies] Restore the 'has_header' method
...
I didn't copied it from downloader/external
2015-01-24 20:08:24 +01:00
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']".
2015-01-24 18:56:04 +01:00
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.
2015-01-24 01:38:48 +01:00
Philipp Hagemeister
a055469faf
[downloader] Improve downloader selection
2015-01-23 23:50:31 +01:00
Philipp Hagemeister
62cd676c74
[youtube] Fixup DASH m4a headers
...
This fixes #2288 , #2506 , #2607 , #3681 , #4741 , #4767 .
2015-01-23 18:39:12 +01:00
Philipp Hagemeister
5f0d813d93
Merge remote-tracking branch 'rupertbaxter2/master'
...
Conflicts:
youtube_dl/__init__.py
youtube_dl/downloader/common.py
2015-01-23 12:05:01 +01:00
Philipp Hagemeister
083c9df93b
[YoutubeDL] Allow filtering by properties ( Fixes #4584 )
2015-01-23 00:04:05 +01:00
Pierre
4340decad2
check for overwriting files in the downloader ( fixes #3916 , closes #3829 )
2015-01-11 12:02:27 +01:00
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.
2015-01-11 11:35:18 +01:00
Philipp Hagemeister
8bfa75451b
[options] Add --no-call-home
...
While we're at it, also drop "experimental" moniker for --call-home - should work fine.
2015-01-10 21:09:18 +01:00
Philipp Hagemeister
58b1f00d19
[YoutubeDL] Add new --call-home option for debugging
2015-01-10 21:02:27 +01:00
Philipp Hagemeister
be4a824d74
Add new option --source-address
...
Closes #3618 , fixes #721 , fixes #2481 , fixes #4551 , closes #1020 .
2015-01-10 19:56:51 +01:00
Philipp Hagemeister
6271f1cad9
[youtube|ffmpeg] Automatically correct video with non-square pixels ( Fixes #4674 )
2015-01-10 05:45:51 +01:00
Philipp Hagemeister
45598f1578
Merge remote-tracking branch 'aft90/merge-output-format'
...
Conflicts:
youtube_dl/YoutubeDL.py
2015-01-10 01:59:14 +01:00
Andrei Troie
d02115f837
Use the option in preparing the merge output filename
2015-01-10 00:29:06 +00:00
Philipp Hagemeister
f90ad27375
[YoutubeDL] Copy over format metadata when merging ( Fixes #4671 )
2015-01-09 20:50:23 +01:00
Philipp Hagemeister
0217c78377
[YoutubeDL] Allow selection by more extensions
2015-01-08 16:14:50 +01:00
Philipp Hagemeister
0590062925
Respect age_limit when listing extractors ( Fixes #4653 )
2015-01-07 07:20:20 +01:00
Philipp Hagemeister
e65566a9cc
[youtube] Correct handling when DASH manifest is not necessary to find all formats
2015-01-03 18:33:38 +01:00
Jaime Marquínez Ferrándiz
f00fd51dae
Don't write the description file if info_dict['description'] is None ( #3166 )
2014-12-21 20:49:14 +01:00
Jaime Marquínez Ferrándiz
0e4cb4f406
YoutubeDL: style fix
2014-12-17 14:55:27 +01:00
AndroKev
cd58dc3e56
Update YoutubeDL.py
2014-12-17 13:21:22 +01:00
AndroKev
c33bcf2051
only add video-id to archive, when successful
...
Example:
no space left--> youtube-dl adds the id to archive, but the video isn't fully downloaded
2014-12-17 13:05:19 +01:00
Philipp Hagemeister
734ea11e3c
Drop hash character in downloader output ( #4484 )
2014-12-16 00:37:42 +01:00