k4rli/youtube-dl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
7,550 Commits 1 Branch 0 Tags
d47ae7f620e3b7be2387da2a61b618a3730d932a
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Jaime Marquínez Ferrándiz 23ba76bc0e [dailymotion] Replace test 
It has been removed.
 2015-03-06 22:45:05 +01:00
Jaime Marquínez Ferrándiz 61e00a9775 [vimeo] Use https for player.vimeo.com urls (closes #5147) 2015-03-06 22:39:05 +01:00
Jaime Marquínez Ferrándiz d1508cd68d [vimeo:album] Fix password protected videos 
Since it only uses https now, don't recognize http urls.
 2015-03-06 22:16:26 +01:00
Jaime Marquínez Ferrándiz 9c85b5376d [vimeo] Fix and use '_verify_video_password' (#5001) 
It only supports verifying the password over https now.

Use it instead of manually setting the 'password' cookie because it allows to check if the password is correct.
 2015-03-06 19:08:27 +01:00
Jaime Marquínez Ferrándiz 3c6f245083 [vimeo] Fix upload date extraction 2015-03-06 18:16:56 +01:00
Jaime Marquínez Ferrándiz f28fe66970 [downloader/http] Add missing fields for _hook_progress call 
It would fail if you run 'youtube-dl --no-part URL' a second time when the file has already been downloaded.

(Reported in Fedora: https://bugzilla.redhat.com/show_bug.cgi?id=1195779)
 2015-03-04 12:14:38 +01:00
Jaime Marquínez Ferrándiz 123397317c [downloader/http] Remove wrong '_hook_progress' call (fixes #5117) 2015-03-03 18:45:56 +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 e9fade72f3 Add postprocessor for converting subtitles (closes #4954) 2015-02-28 14:43:24 +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 781a7ef60a [lynda] Use 'lstrip' for the subtitles 
The newlines at the end are important, they separate each piece of text.
 2015-02-27 16:18:18 +01:00
Jaime Marquínez Ferrándiz f3bff94cf9 [rtve] Extract duration 2015-02-27 12:24:51 +01:00
Jaime Marquínez Ferrándiz c10ea454dc [telecinco] Recognize more urls (closes #5065) 2015-02-25 23:52:54 +01:00
Jaime Marquínez Ferrándiz 13d8fbef30 [generic] Don't set the 'title' if it's not defined in the entry (closes #5061) 
Some of them may be an 'url' result, which in general don't have the 'title' field.
 2015-02-25 17:56:51 +01:00
Jaime Marquínez Ferrándiz 25ac63ed71 [rtve] Extract subtitles 2015-02-23 23:04:07 +01:00
Jaime Marquínez Ferrándiz ffdf972b91 [facebook] Extract all the formats (closes #5037) 2015-02-23 18:54:15 +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 80970e531b [test/subtitles] Update checksum for Viki 2015-02-22 11:52:22 +01:00
Jaime Marquínez Ferrándiz b7bb76df05 [test/subtitles] Remove some tests 
Test only with 'allsubtitles', the language selection is already tested in test_YoutubeDL.py
 2015-02-22 11:51:57 +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 ab84349b16 [test/YoutubeDL] Add test for subtitles 
Updated the offlinetest make target to not skip it
 2015-02-22 11:29:56 +01:00
Jaime Marquínez Ferrándiz 03091e372f [ted] Always extract the subtitles 
The required info is already in the webpage
 2015-02-22 00:27:59 +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
Jaime Marquínez Ferrándiz 93540ee10e [rtve] Fix the video url 
Changing mvod to mvod1 fixes the url, we don't need to add the query.
 2015-02-21 19:31:39 +01:00
Jaime Marquínez Ferrándiz fb7cb6823e Remove the SubtitlesInfoExtractor class 
No longer needed
 2015-02-19 23:24:24 +01:00
Jaime Marquínez Ferrándiz 6140baf4e1 [nationalgeographic] Add extractor (closes #4960) 2015-02-19 18:17:31 +01:00
Jaime Marquínez Ferrándiz f13b1e7d7f [bbccouk] Convert to new subtitles system 
I haven't found any video available outside the UK, so I haven't added tests.

I have updated how the srt file is build, because (at least for www.bbc.co.uk/programmes/p02j9b69) the subtitles is inside 'span' elements.
 2015-02-19 16:46:41 +01:00
Jaime Marquínez Ferrándiz 5c8a3f862a [nbc] Use a test video that works outside the US 2015-02-19 15:00:39 +01:00
Jaime Marquínez Ferrándiz 8807f1277f [theplatform] Convert to new subtitles system 2015-02-19 14:54:50 +01:00
Jaime Marquínez Ferrándiz a3b9157f49 [cbssports] Add extractor (closes #4996) 2015-02-19 13:06:53 +01:00
Jaime Marquínez Ferrándiz 93a16ba238 [vimeo] Raise the ExtractorError with expected=True when no video password is given 2015-02-18 22:00:12 +01:00
Jaime Marquínez Ferrándiz 4f7cea6c53 [viki] Convert to new subtitles system 2015-02-18 20:37:16 +01:00
Jaime Marquínez Ferrándiz afbdd3acc3 [rai] Convert to new subtitles system 2015-02-18 20:14:42 +01:00
Jaime Marquínez Ferrándiz 01561da142 [nrk] Convert to new subtitles system 2015-02-18 18:57:01 +01:00
Jaime Marquínez Ferrándiz 0af25f784b [mtv] Convert to new subtitles system 2015-02-18 18:27:45 +01:00
Jaime Marquínez Ferrándiz b9b42f2ea0 [npo] Convert to new subtitles system 2015-02-18 17:57:10 +01:00
Jaime Marquínez Ferrándiz 311c393838 [lynda] Convert to new subtitles system 2015-02-18 17:46:33 +01:00
Jaime Marquínez Ferrándiz 18c1c42405 [drtv] Convert to new subtitles system 2015-02-18 17:20:22 +01:00
Jaime Marquínez Ferrándiz 37dd5d4629 [mit] Don't set the subtitles field 
YouTube already provides them in more formats
 2015-02-18 17:19:56 +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
Jaime Marquínez Ferrándiz 9868ea4936 [extractor/common] Simplify subtitles handling methods 
Initially I was going to use a single method for handling both subtitles and automatic captions, that's why I used the 'list_subtitles' and the 'subtitles' variables.
 2015-02-17 22:16:29 +01:00
Jaime Marquínez Ferrándiz 85920dd01d [bliptv] Convert to new subtitles system 2015-02-17 21:56:25 +01:00
Jaime Marquínez Ferrándiz bd7fe0cf66 [walla] Convert to new subtitles system 2015-02-17 21:23:09 +01:00
Jaime Marquínez Ferrándiz 48246541da [ceskatelevize] Convert to new subtitles system 2015-02-17 21:17:47 +01:00
Jaime Marquínez Ferrándiz 4cd95bcbc3 [twitch:stream] Prefer the 'source' format (fixes #4972) 2015-02-17 18:57:01 +01:00
Jaime Marquínez Ferrándiz fbc503d696 [downloader/hls] Fix detection of ffmpeg/avconv (reported in #4966) 2015-02-17 16:40:42 +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
Jaime Marquínez Ferrándiz 163d966707 [downloader/external] curl: Add the '--location' flag 
curl doesn't follow redirections by default
 2015-02-17 16:21:02 +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 a1f2a06b34 [dailymotion] Convert to new subtitles system 2015-02-16 21:51:08 +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 65469a7f8b [vimeo] Convert to new subtitles system 
Removed some tests, the behaviour should be checked in a test for the YoutubeDL class
 2015-02-16 21:51:07 +01:00
Jaime Marquínez Ferrándiz 6b597516c1 [atresplayer] Convert to new subtitles system 2015-02-16 21:51:07 +01:00
Jaime Marquínez Ferrándiz b5857f62e2 [crunchyroll] Convert to new subtitles system 2015-02-16 21:51:07 +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
Jaime Marquínez Ferrándiz 8fb474fb17 [test/subtitles] Fix some tests 
The checksym for the CeskaTelevize subtitles has changed again, so we just test that it has a reasonable length.
 2015-02-15 15:01:07 +01:00
Jaime Marquínez Ferrándiz 6ca7732d5e [extractor/common] Fix link to external documentation 2015-02-14 22:20:24 +01:00
Jaime Marquínez Ferrándiz b0ab0fac49 Remove unused imports 2015-02-14 22:19:58 +01:00
Jaime Marquínez Ferrándiz cffcbc02de [postprocessor/ffmpeg] Don't let ffmpeg read from stdin (fixes #4945) 
If you run 'while read aurl ; do youtube-dl --extract-audio "${aurl}"; done < path_to_batch_file'  (batch_file contains one url per line) each call to youtube-dl consumed some characters and 'read' would assing to 'aurl' a non valid url, something like 'tube.com/watch?v=<id>'.
 2015-02-13 22:25:34 +01:00
Jaime Marquínez Ferrándiz 36e7a4ca2e [test/subtitles] Update checksums 2015-02-13 14:43:50 +01:00
Jaime Marquínez Ferrándiz ae6423d704 [bambuser] Fix 'uploader_id' extraction (fixes #4944) 2015-02-13 11:36:33 +01:00
Jaime Marquínez Ferrándiz 2d30521ab9 [youtube] Extract average rating (closes #2362) 2015-02-11 18:39:31 +01:00
Jaime Marquínez Ferrándiz 050fa43561 flake8: Ignore some error added in pep8 1.6 
* E402: we exectute code between imports, like modifying 'sys.path' in the tests
* E731: we assign to lambdas in a lot of places, we may want to consider defining functions in a single line instead (what pep8 recommends)
 2015-02-11 18:15:15 +01:00
Jaime Marquínez Ferrándiz f36f92f4da [aes] style: Put __all__ variable at the end of the file 2015-02-11 18:15:15 +01:00
Jaime Marquínez Ferrándiz d304209a85 [test/parameters.json] Set 'fixup' to 'never' 
The fixed audio files for Youtube have a size lower that the minimum required.
 2015-02-11 17:25:04 +01:00
Jaime Marquínez Ferrándiz ba61796458 [youtube] Don't override format info from the dash manifest (fixes #4911) 2015-02-09 15:04:22 +01:00
Jaime Marquínez Ferrándiz 0161353d7d [test/test_YoutubeDL] Remove debug print call 2015-02-06 23:58:01 +01:00
Jaime Marquínez Ferrándiz 2b4ecde2c8 [test/YoutubeDL] Add a simple test for postprocesors 
Just checks that the 'keepvideo' option works as intended.
 2015-02-06 23:54:25 +01: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
Jaime Marquínez Ferrándiz 467d3c9a0c [ffmpeg] --extrac-audio: Use the same options for avconv and ffmpeg 
They have been available in ffmpeg since version 0.9, and we require 1.0 or higher.
 2015-02-06 22:05:11 +01:00
Jaime Marquínez Ferrándiz a57b562cff [nfl] Add support for articles pages (fixes #4848) 2015-02-02 23:17:00 +01:00
Jaime Marquínez Ferrándiz e41b1f7385 Fix flake8 errors 2015-01-31 10:51:39 +01:00
Jaime Marquínez Ferrándiz cd596028d6 [rtve] Recognize mobile urls (fixes #4823) 2015-01-30 23:46:55 +01:00
Jaime Marquínez Ferrándiz cc57bd33a8 [rtve] Fix extraction 
Skip live stream test, we can't use the f4m manifest yet
 2015-01-30 23:46:55 +01: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
Jaime Marquínez Ferrándiz 4f264c02c7 [utils] YoutubeDLHTTPSHandler.https_open: pass all required arguments to do_open 
With this change the '--no-check-certificate' works again (#4807).
 2015-01-29 15:01:27 +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
Jaime Marquínez Ferrándiz 6d2749aac4 [drtv] Prefer the version without spoken subtitles (fixes #4779) 
For example for http://www.dr.dk/tv/se/moderne-klassikere/moderne-klassikere-one-republic-apologize#!/, there's a version where everytime someone speaks in English a computer voice translates it.
 2015-01-25 18:56:04 +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
Jaime Marquínez Ferrándiz 587a9c2749 [downloader/external] Use the 'http_headers' field 2015-01-24 18:25:09 +01:00
Jaime Marquínez Ferrándiz e1554a407d [extractors] Use http_headers for setting the User-Agent and the Referer 2015-01-24 18:23:53 +01:00
Jaime Marquínez Ferrándiz 3fcfb8e9fa [utils] YoutubeDLHandler: don't use 'Youtubedl-user-agent' for overriding the default user agent 
Setting the 'User-Agent' header is enough
 2015-01-24 18:07:21 +01:00
Jaime Marquínez Ferrándiz fdaaaaa878 README: Recommend using flake8 instead of pyflake and pep8 separately 2015-01-23 21:10:10 +01:00
Jaime Marquínez Ferrándiz 12d1fb5aa9 [twitch] PEP8 2015-01-23 21:05:07 +01:00
Jaime Marquínez Ferrándiz 48f00d15b1 [auengine] Remove extractor 
The test is probably infringing copyright and nobody has provided a new test (see #4643).
 2015-01-23 21:03:00 +01:00
Jaime Marquínez Ferrándiz 0920e5830f [atresplayer] Don't include f4m formats if they are protected by DRM (fixes #4705) 2015-01-23 16:39:23 +01:00
Jaime Marquínez Ferrándiz bf7fa94ec7 [downloader/f4m] build_fragments_list: Support videos with more than 1 segment 2015-01-23 16:31:52 +01:00
Jaime Marquínez Ferrándiz 47e0e1e0e2 [nbc] Fix pep8 issue 2015-01-21 10:36:15 +01:00
Jaime Marquínez Ferrándiz efcddaebe9 [cnn] Use edition.cnn.com for getting the information (fixes #4757) 
Some videos (like http://edition.cnn.com/videos/us/2015/01/20/orig-yellowstone-oil-spill.cnn) will fail if we use cnn.com.
 2015-01-21 10:31:57 +01:00
Jaime Marquínez Ferrándiz 5fe5112589 [CNNArticle] Update test 2015-01-21 10:27:18 +01:00
Jaime Marquínez Ferrándiz 2875cf01bb FFmpegEmbedSubtitlePP: simplify command 2015-01-16 13:37:37 +01:00
Jaime Marquínez Ferrándiz e205db3bcd FFmpegEmbedSubtitlePP: don't fail if the video doesn't have an audio stream (fixes #4718) 
Instead of specifying which streams ffmpeg must copy, we tell it to copy all.
 2015-01-16 13:29:01 +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
Jaime Marquínez Ferrándiz 9932a65370 [vk] Remove debug assert statement (fixes #4672, fixes #4514) 2015-01-09 20:13:53 +01:00
Jaime Marquínez Ferrándiz c5d666d374 Fix build with python 2.6 
* Packages cannot be executed
* '.format' needs the index of the argument

(Reported in https://github.com/Homebrew/homebrew/issues/35616)
 2015-01-07 16:09:43 +01:00
Jaime Marquínez Ferrándiz 5d8993b06a [extractor/__init__] Remove unused import 2015-01-07 11:59:15 +01:00