Commit Graph

413 Commits (4763b624a6655bc2333157031c73858f6b918f61)

Author SHA1 Message Date
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
Sergey M․ 300753a069 [YoutubeDL] Fix video+audio format field (Closes #4880) 10 years ago
Philipp Hagemeister f6c24009be [YoutubeDL] Calculate thumbnail IDs automatically 10 years ago
Philipp Hagemeister 8f9312c387 Appease pyflakes8-3 10 years ago
Sergey M․ 6d593c3276 [YoutubeDL] Fix video+audio format_id (Closes #4824) 10 years ago
codesparkle 5468ff4d91 Remove duplicate dictionary keys 10 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)
10 years ago
Sergey M․ dcf53d4408 [YoutubeDL] Set format_id for video+audio (Closes #3634) 10 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
10 years ago
Philipp Hagemeister 9f0df77ab1 [YoutubeDL] Allow format filtering by fps 10 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.
10 years ago
Philipp Hagemeister ee69b99af6 [YoutubeDL] clarify hook documentation 10 years ago
Philipp Hagemeister 881e6a1f5c Add --xattr-set-filesize option (Fixes #1348) 10 years ago
Philipp Hagemeister c14e88f0f5 [YoutubeDL] Add --playlist-items option (Fixes #2662) 10 years ago
Philipp Hagemeister ec82d85acd [YoutubeDL] Implement --write-all-thumbnails (Closes #2269) 10 years ago
Philipp Hagemeister cfb56d1af3 Add --list-thumbnails 10 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.
10 years ago
Jaime Marquínez Ferrándiz 4b405cfc6e [YoutubeDL._calc_cookies] Restore the 'has_header' method
I didn't copied it from downloader/external
10 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']".
10 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.
10 years ago
Philipp Hagemeister a055469faf [downloader] Improve downloader selection 10 years ago
Philipp Hagemeister 62cd676c74 [youtube] Fixup DASH m4a headers
This fixes #2288, #2506, #2607, #3681, #4741, #4767.
10 years ago
Philipp Hagemeister 5f0d813d93 Merge remote-tracking branch 'rupertbaxter2/master'
Conflicts:
	youtube_dl/__init__.py
	youtube_dl/downloader/common.py
10 years ago
Philipp Hagemeister 083c9df93b [YoutubeDL] Allow filtering by properties (Fixes #4584) 10 years ago
Pierre 4340decad2 check for overwriting files in the downloader (fixes #3916, closes #3829) 10 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.
10 years ago
Philipp Hagemeister 8bfa75451b [options] Add --no-call-home
While we're at it, also drop "experimental" moniker for --call-home - should work fine.
10 years ago
Philipp Hagemeister 58b1f00d19 [YoutubeDL] Add new --call-home option for debugging 10 years ago
Philipp Hagemeister be4a824d74 Add new option --source-address
Closes #3618, fixes #721, fixes #2481, fixes #4551, closes #1020.
10 years ago
Philipp Hagemeister 6271f1cad9 [youtube|ffmpeg] Automatically correct video with non-square pixels (Fixes #4674) 10 years ago
Philipp Hagemeister 45598f1578 Merge remote-tracking branch 'aft90/merge-output-format'
Conflicts:
	youtube_dl/YoutubeDL.py
10 years ago
Andrei Troie d02115f837 Use the option in preparing the merge output filename 10 years ago
Philipp Hagemeister f90ad27375 [YoutubeDL] Copy over format metadata when merging (Fixes #4671) 10 years ago
Philipp Hagemeister 0217c78377 [YoutubeDL] Allow selection by more extensions 10 years ago
Philipp Hagemeister 0590062925 Respect age_limit when listing extractors (Fixes #4653) 10 years ago
Philipp Hagemeister e65566a9cc [youtube] Correct handling when DASH manifest is not necessary to find all formats 10 years ago
Jaime Marquínez Ferrándiz f00fd51dae Don't write the description file if info_dict['description'] is None (#3166) 10 years ago
Jaime Marquínez Ferrándiz 0e4cb4f406 YoutubeDL: style fix 10 years ago
AndroKev cd58dc3e56 Update YoutubeDL.py 10 years ago
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
10 years ago
Philipp Hagemeister 734ea11e3c Drop hash character in downloader output (#4484) 10 years ago
Philipp Hagemeister d86007873e [YoutubeDL] Document where details for format can be found 10 years ago
Philipp Hagemeister 71b640cc5b [YoutubeDL] Add declarative version of progress hooks 10 years ago
Philipp Hagemeister 4f026fafbc [YoutubeDL] Make postprocessors declarative
Instead of having to configure PPs in code, this allows us and embedding programs not to worry about imports or finer details, similarly to how we handle IEs.
10 years ago
Mark Schreiber ff815fe65a Download playlist items in reverse order
Series of videos are typically uploaded to YouTube playlists in
chronological order.  By default, these videos are downloaded
latest-to-earliest; this is great for seeing the latest videos in a
series, but prevents streaming video in the order that the videos were
produced.  Add an option to download videos in reverse order,
earliest-to-latest.

Conflicts:
	youtube_dl/YoutubeDL.py
	youtube_dl/__init__.py
10 years ago
Philipp Hagemeister 412c617d0f [cnet] Update to new theplatform infrastructure (Fixes #2736) 10 years ago
Philipp Hagemeister f17e4c9c28 [screenwavemedia] Simplify (#3766) 10 years ago
cryptonaut 16ae61f655 Handle --get-url with merged formats (fixes #2883)
Outputs one URL per line
10 years ago
Philipp Hagemeister b82f815f37 Allow iterators for playlist result entries 10 years ago
Sergey M․ 706d7d4ee7 [YoutubeDL] Avoid negative timestamps on Windows 10 years ago
Philipp Hagemeister 4aae94f9d0 [YoutubeDL] Remove incorrect documentation 10 years ago
Philipp Hagemeister acda92f6bc Clarify --no-playlist documentation (Closes #4309) 10 years ago
Jouke Waleson 9e1a5b8455 PEP8: applied even more rules 10 years ago
Jouke Waleson 8bcc875676 PEP8: more applied 10 years ago
Jouke Waleson 5f6a1245ff PEP8 applied 10 years ago
Philipp Hagemeister 7d4111ed14 Provide guidance when called with a YouTube ID starting with a dash.
Reported at https://news.ycombinator.com/item?id=8648121
10 years ago
Philipp Hagemeister 42e12102a9 [YoutubeDL] Fix multi_video check 10 years ago
Philipp Hagemeister dfd5313afd [YoutubeDL] Support new _type multi_video 10 years ago
Philipp Hagemeister c9bf41145f [YoutubeDL] Warn if an extractor returns compat_list 10 years ago
Jaime Marquínez Ferrándiz 92120217eb [cache] Fix writing to paths with unicode characters
* Use "compat_getenv"
* "write_json_file" now expects the filename to be a string
10 years ago
Philipp Hagemeister c6afed48ff [YoutubeDL] guard against strange sys.stdouts 10 years ago
Jaime Marquínez Ferrándiz c295490830 [YoutubeDL] Fix bug in the detection of formats that don't contain video (fixes #4150)
If the format requested was not available, we called the method '.get' in None.
10 years ago
Philipp Hagemeister a1cf99d03a [YoutubeDL] Add playlist_id and playlist_title fields (Fixes #4139) 10 years ago
Jaime Marquínez Ferrándiz f866e474f3 [YoutubeDL] Don't dowload formats for merging if the first doesn't contain the video (#4132) 10 years ago
Philipp Hagemeister 8c25f81bee [util] Move compatibility functions out of util
utils is large enough without these compatibility functions.

Everything that is present in newer versions of Python (i.e. with dev Python it's just an import) goes into compat.py .
Everything else (i.e. youtube-dl-specific helpers) goes into utils.py .
10 years ago
Philipp Hagemeister 4c83c96795 [YoutubeDL] Include rtmpdump in exe versions -v output 10 years ago
Philipp Hagemeister fbb21cf528 [youtube] Add formats 298, 299 (Fixes #4056) 10 years ago
Philipp Hagemeister 3511266bc3 [YoutubeDL] Simplify API of YoutubeDL
Calling add_default_extractors twice should be harmless since the first set of extractors will match.
10 years ago
Philipp Hagemeister 488447455d [ffmpeg] Warn if ffmpeg/avconv version is too old (Fixes #4026) 10 years ago
Philipp Hagemeister d28b517154 [YoutubeDL] Output avconv/ffmpeg versions if -v is given 10 years ago
Sergey M․ f889cea109 Merge branch 'compat-getenv-and-expanduser' of https://github.com/dstftw/youtube-dl into dstftw-compat-getenv-and-expanduser
Conflicts:
	test/test_utils.py
	youtube_dl/__init__.py
10 years ago
Philipp Hagemeister 63e0be3415 New option --dump-single-json (#4003) 10 years ago
Philipp Hagemeister e82c1e9a6e [YoutubeDL] Do not apply playlist info to videos when extract_flat is set (#4003) 10 years ago
Philipp Hagemeister 057a5206cc Add --flat-playlist option (Closes #4003) 10 years ago
George Boyle 53d9009bdb KeyError on initialising YoutubeDL in python3 #3910 10 years ago
George Boyle 1b725173a5 Fixed typo 10 years ago
Sergey M․ 4644ac5527 [core] Decode environment variables with filesystem encoding (Fixes #3854, Fixes #3217, Fixes #2918)
Introduces compat versions of os.getenv and os.path.expanduser
10 years ago
Sergey M․ ee0d90707a [YoutubeDL] Fix string check for python3 10 years ago
Sergey M․ 68b0973046 [YoutubeDL] Expect all kind of strings in urlopen
Now it doesn't fail if req is python2's str
10 years ago
Philipp Hagemeister 1de33fafd9 [YoutubeDL] Allow downloading multiple formats with , 10 years ago
Philipp Hagemeister e2e5dae64d Add -f m4a 10 years ago
Sergey M․ d05cfe0600 [YoutubeDL/utils] Clarify rationale for URL escaping in comment, move escape routines to utils and add some tests 10 years ago
Sergey M․ 37419b4f99 [YoutubeDL] Escape non-ASCII characters in URLs
urllib chokes on URLs with non-ASCII characters (see http://bugs.python.org/issue3991)
Working around by replacing request's original URL with escaped one
10 years ago
Philipp Hagemeister a0e07d3161 [youtube] Move cache into its own module 10 years ago
Philipp Hagemeister 241f7a8ade Merge remote-tracking branch 'JGjorgji/fix-leading-zeroes' 10 years ago
Philipp Hagemeister 8d31fa3cce [execafterdownload] Simplify (#3569) 10 years ago
Gjorgji Jankovski c6b4132a0a renamed for consistency 10 years ago
Gjorgji Jankovski ad260c90ab Filenames are padded according to the playlist length 10 years ago
Philipp Hagemeister be843678b1 [YouTubeDL] Correct handling of age_limit = None in result 10 years ago
Philipp Hagemeister e8ee972c6e Allow playlist test definitions in test_download.
This moves playlist tests where they belong, i.e. to the extractors themselves.
Additionally, all our network interaction configuration for tests in test_download now applies to playlist tests as well.
11 years ago
Philipp Hagemeister 11b85ce62e [YouTubeDL] Best practices (Closes #3370) 11 years ago
Philipp Hagemeister 4192b51c7c Replace failure handling with up-front check.
The only time that write_string should fail is if the Python is completely braindead.
Check for that condition and output a more accurate warning.

See #3326 for details.
11 years ago
rupertbaxter2 b7f8116406 Deletes temp files after postprocess merge unless -k option is specified 11 years ago
Philipp Hagemeister b0472057a3 [YoutubeDL] Make sure we really, really get out the encoding string
Fixes #3326
Apparently, on some platforms, even outputting this fails already.
11 years ago
Philipp Hagemeister 9732d77ed2 [snotr] PEP8 and minor fixes (#3296) 11 years ago
Philipp Hagemeister 8d5797b00f [YoutubeDL] Show download URL when -v is set
This will allow us to debug issues like #3204
11 years ago
Philipp Hagemeister be6d722904 [cnn] Improve thumbnail extraction 11 years ago
Philipp Hagemeister d551980823 [spiegeltv] Simplify and PEP8 11 years ago
Philipp Hagemeister acd69589a5 [YoutubeDL] Do not require default output template to be set 11 years ago
Philipp Hagemeister c57f775710 [YoutubeDL] Add simple tests for format_note (Closes #2825) 11 years ago
robbie e4db19511a Fix subtitle download error reporting (Fixes #2724) 11 years ago
Philipp Hagemeister b58ddb32ba [utils] Completely rewrite Windows output (Fixes #2672) 11 years ago
Philipp Hagemeister 734f90bb41 Use --encoding when outputting 11 years ago
Philipp Hagemeister d26e981df4 Correct check for empty dirname (Fixes #2683) 11 years ago
Philipp Hagemeister bec1fad223 [YouTubeDL] Throw an early error if the info_dict result is invalid 11 years ago
Philipp Hagemeister cce929eaac [franceculture] Add extractor (Fixes #2669) 11 years ago
Philipp Hagemeister 62fec3b2ff Add new --encoding option (Fixes #2650) 11 years ago
Philipp Hagemeister ad8915b729 Add --no-warnings option (Fixes #2630) 11 years ago
Philipp Hagemeister ea38e55fff [instagram] Add support for user profiles (Fixes #2606) 11 years ago
Philipp Hagemeister 7e8c0af004 Add --prefer-insecure option (Fixes #2364) 11 years ago
Philipp Hagemeister 1a4895453a [YoutubeDL] Improve error message 11 years ago
Jaime Marquínez Ferrándiz bc6d597828 Add bestvideo and worstvideo to special format names (#2163) 11 years ago
Philipp Hagemeister 955c451456 Rename upload_timestamp to timestamp 11 years ago
Philipp Hagemeister 9d2ecdbc71 [vevo] Centralize timestamp handling 11 years ago
Philipp Hagemeister db95dc13a1 [playvid] Simplify (#2539) 11 years ago
Jaime Marquínez Ferrándiz a0792b738e Don't install the global url opener
All the code uses now the urlopen method of YoutubeDL
11 years ago
Jaime Marquínez Ferrándiz 19a41fc613 Don't set the global socket timeout
Use the timeout argument of the `OpenerDirector.open` method instead
11 years ago
Philipp Hagemeister 805ef3c60b Correct automatic resolution determination 11 years ago
Jaime Marquínez Ferrándiz 6d07ce0162 YoutubeDL: If the logger is set call its `warning` method in `report_warning` 11 years ago
Jaime Marquínez Ferrándiz e9c092f125 YoutubeDL: Use its `urlopen` method for downloading the thumbnail. 11 years ago
Philipp Hagemeister 17b75c0de1 Document width, height, and resolution (#1445) 11 years ago
Philipp Hagemeister c9ae7b9565 [youtube] Add support for search result URLs (Fixes #2495) 11 years ago
Philipp Hagemeister 0afef30b23 Add display_id field 11 years ago
Jaime Marquínez Ferrándiz f89197d73e Some pep8 style fixes 11 years ago
Philipp Hagemeister 1394ce65b4 [youtube] Add new formats (Fixes #2221) 11 years ago
Philipp Hagemeister fd28827864 Do not count unmatched videos for --max-downloads (Fixes #2211) 11 years ago
Philipp Hagemeister d3e5bbf437 Correct --max-downloads with --ignore-errors 11 years ago