Upstream/youtube-dl
1
0
Fork 0
mirror of https://github.com/ytdl-org/youtube-dl.git synced 2024-12-21 00:27:57 +01:00
Code Issues Projects Releases Wiki Activity
2,860 Commits 10 Branches 1,120 Tags 224 MiB
a1ee09e815
Commit Graph

888 Commits

Author SHA1 Message Date
Jaime Marquínez Ferrándiz
d24ffe1cfa [rtlnow] Remove the test for nitro 
The videos expire.
 2013-11-15 12:57:59 +01:00
Jaime Marquínez Ferrándiz
78fb87b283 Don't accept '>' inside the content attribute in OpenGraph regexes 2013-11-15 12:54:13 +01:00
Jaime Marquínez Ferrándiz
ab2d524780 Improve the OpenGraph regex 
* Do not accept '>' between the property and content attributes.
* Recognize the properties if the content attribute is before the property attribute using two regexes (fixes the extraction of the description for SlideshareIE).
 2013-11-15 12:24:54 +01:00
Jaime Marquínez Ferrándiz
85d61685f1 [tvp] Update the title and the description of the test video 2013-11-15 12:10:22 +01:00
Jaime Marquínez Ferrándiz
b9643eed7c [youtube:channel] Fix the extraction of autogenerated channels 
The ajax pages are empty, now it looks directly in the channel's /videos page
 2013-11-15 11:51:45 +01:00
Philipp Hagemeister
0e145dd541 Merge branch 'master' of github.com:rg3/youtube-dl 2013-11-15 01:46:50 +01:00
Philipp Hagemeister
9f9be844fc [youtube] Fix protocol-independent URLs (Fixes #1768) 2013-11-15 01:45:39 +01:00
Jaime Marquínez Ferrándiz
e3b9ab5e18 [soundlcoud] Set the correct extension for the tracks (fixes #1766) 
Some tracks are not in mp3 format, they can be wav files.
 2013-11-14 19:45:39 +01:00
Jaime Marquínez Ferrándiz
c66d2baa9c [livestream] Add an extractor for the original version of livestream (closes #1764) 
The two versions use different systems.
 2013-11-14 13:16:32 +01:00
Jaime Marquínez Ferrándiz
ca715127a2 Don't assume the 'subtitlesformat' is set in the params dict (fixes #1750) 2013-11-13 17:14:10 +01:00
Jaime Marquínez Ferrándiz
ea7a7af1d4 [gamekings] Fix the test video checksum 2013-11-13 17:13:06 +01:00
Philipp Hagemeister
c3a3028f9f [tvp] Minor improvements (#1730) 2013-11-13 11:06:53 +01:00
Philipp Hagemeister
6c5ad80cdc Merge remote-tracking branch 'saper/tvp' 2013-11-13 11:03:49 +01:00
Philipp Hagemeister
384b98cd8f [gamekings] Minor fixes (#1759) 2013-11-13 10:51:00 +01:00
Jelle van der Waa
eb9b5bffef Add extractor for gamekings.tv 2013-11-13 10:38:47 +01:00
migbac
0bd59f3723 Add support for d8.tv 2013-11-12 23:32:03 +01:00
Jaime Marquínez Ferrándiz
8b8cbd8f6d [vine] Fix uploader extraction 2013-11-12 20:50:52 +01:00
Philipp Hagemeister
eb0a839866 [common] Simplify og_search_property 2013-11-12 10:36:23 +01:00
Jaime Marquínez Ferrándiz
0ed05a1d2d Use the 'rtmp_live' field for the live parameter of rtmpdump 2013-11-10 12:45:17 +01:00
Jaime Marquínez Ferrándiz
1008bebade Merge remote-tracking branch 'rzhxeo/rtmpdump_live' 2013-11-10 12:38:40 +01:00
Jaime Marquínez Ferrándiz
be6dfd1b49 [ted] Return a single info_dict for talks urls 
It failed with the --list-subs option
 2013-11-10 12:09:12 +01:00
Jaime Marquínez Ferrándiz
231516b6c9 Merge pull request #1705 from iemejia/master 
[ted] support for subtitles
 2013-11-10 11:54:18 +01:00
Jaime Marquínez Ferrándiz
fb53d58dcf Merge pull request #1726 from saper/escaped 
Fix AssertionError when og property not found
 2013-11-10 02:51:52 -08:00
Jaime Marquínez Ferrándiz
f470c6c812 [arte] Improve the format sorting 
Also use the bitrate.
Prefer normal version and sourds/mal version over original version with subtitles.
 2013-11-09 19:05:19 +01:00
Jaime Marquínez Ferrándiz
566d4e0425 [arte] Make sure the format_id is unique (closes #1739) 
Include the bitrate and use the height instead of the quality field.
 2013-11-09 19:01:23 +01:00
Jaime Marquínez Ferrándiz
81be02d2f9 [cnn] Accept www.cnn.com urls (fixes #1740) 2013-11-09 18:16:32 +01:00
Jaime Marquínez Ferrándiz
c2b6a482d5 [brightcove] the format function requires to specify the index in python2.6 2013-11-09 18:10:11 +01:00
Jaime Marquínez Ferrándiz
12c167c881 [soundcloud] Allow to download tracks marked as not 'streamable' 
They use the rtmp protocol but if the are marked as 'downloadable' it can use the direct download link.
 2013-11-09 18:08:03 +01:00
Jaime Marquínez Ferrándiz
20aafee7fa [kankan] Fix the video url 
It now requires two additional parameters, one is a timestamp we get from the getCdnresource_flv page and the other is a key we have to build.
 2013-11-09 16:51:11 +01:00
Jaime Marquínez Ferrándiz
dd5bcdc4c9 [brightcove] Set the 'Referer' header if the url has the 'linkBaseUrl' parameter (fixes #1553) 2013-11-07 21:06:48 +01:00
Jaime Marquínez Ferrándiz
b1a80ec1a9 [xnxx] Accept urls that start with 'www' (fixes #1734) 2013-11-06 23:45:01 +01:00
Jaime Marquínez Ferrándiz
51040b72ed [brightcove] Support redirected urls from bcove.me (fixes #1732) 
'bctid' needs to be changed to '@videoPlayer', and 'bckey' to 'playerKey'.
 2013-11-06 22:03:00 +01:00
Jaime Marquínez Ferrándiz
4f045eef8f [youtube:channel] Fix the extraction 
The page don't include the 'load more' button anymore, now we directly get the 'c4_browse_ajax' pages.
 2013-11-06 21:42:33 +01:00
Jaime Marquínez Ferrándiz
5d7b253ea0 Add an extractor for eitb.tv (fixes #1608) 
The BrighcoveExperience object doesn't contain the video id, the extractor adds it and passes the url to BrightcoveIE.
 2013-11-06 20:06:14 +01:00
Jaime Marquínez Ferrándiz
b0759f0c19 [brightcove] Extract all the available formats 2013-11-06 19:05:41 +01:00
Jaime Marquínez Ferrándiz
065472936a Add an extractor for space.com (fixes #1718) 
It uses Brightcove, but requires some special process for getting a url with the playerKey field in some videos
 2013-11-06 17:37:39 +01:00
Jaime Marquínez Ferrándiz
fc4a0c2aec [brightcove] Change the 'videoId' or 'videoID' field to '@videoPlayer' (fixes #1697) 
It seems to be needed when using the htmlFederated page
 2013-11-06 17:31:47 +01:00
Jaime Marquínez Ferrándiz
eeb165e674 [brightcove] Add the extraction of the url from generic 2013-11-06 16:58:03 +01:00
Jaime Marquínez Ferrándiz
9ee2b5f6f2 tests: don't run the test if any of the extractors listed in the 'add_ie' field is marked as not working 2013-11-06 16:43:26 +01:00
Marcin Cieślak
5137ebac0b [tvp] Telewizja Polska: new extractor for tvp.pl, fixes #1719 
Thanks-To: mplonski

https://github.com/mplonski/linux/blob/master/tvp-dl.py
 2013-11-05 23:47:40 +01:00
Marcin Cieślak
a8eeb0597b Fix AssertionError when og property not found 
On tvp.pl some webpages contain OpenGraph
metadata and some don't.

If og property is not found, _og_search_description
fails with

WARNING: unable to extract OpenGraph description; please report this issue on http://yt-dl.org/bug
Traceback (most recent call last):
  File "/usr/home/saper/bin/youtube-dl", line 18, in <module>
    youtube_dl.main()
  File "/usr/home/saper/sw/youtube-dl/youtube_dl/__init__.py", line 766, in main
    _real_main(argv)
  File "/usr/home/saper/sw/youtube-dl/youtube_dl/__init__.py", line 719, in _real_main
    retcode = ydl.download(all_urls)
  File "/usr/home/saper/sw/youtube-dl/youtube_dl/YoutubeDL.py", line 715, in download
    videos = self.extract_info(url)
  File "/usr/home/saper/sw/youtube-dl/youtube_dl/YoutubeDL.py", line 348, in extract_info
    ie_result = ie.extract(url)
  File "/usr/home/saper/sw/youtube-dl/youtube_dl/extractor/common.py", line 125, in extract
    return self._real_extract(url)
  File "/usr/home/saper/sw/youtube-dl/youtube_dl/extractor/tvp.py", line 56, in _real_extract
    info['description'] = self._og_search_description(webpage)
  File "/usr/home/saper/sw/youtube-dl/youtube_dl/extractor/common.py", line 331, in _og_search_description
    return self._og_search_property('description', html, fatal=False, **kargs)
  File "/usr/home/saper/sw/youtube-dl/youtube_dl/extractor/common.py", line 325, in _og_search_property
    return unescapeHTML(escaped)
  File "/usr/home/saper/sw/youtube-dl/youtube_dl/utils.py", line 494, in unescapeHTML
    assert type(s) == type(u'')
AssertionError

The patch allows me to use:

  try:
    info['description'] = self._og_search_description(webpage)
    info['thumbnail'] = self._og_search_thumbnail(webpage)
  except RegexNotFoundError:
    pass
 2013-11-05 23:19:29 +01:00
Ismaël Mejía
4ed3e51080 [ted] fixed error in case of no subtitles present 
I created a test, but I leave it commented since TED videos get
new subtitles frequently.
 2013-11-05 12:00:13 +01:00
rzhxeo
2dcf7d8f99 [GenericIE] Also detect youtube if src url of iframe is embedded in ' instaed of " 2013-11-05 02:08:02 +01:00
Jaime Marquínez Ferrándiz
19b0668251 [canal2c] Accept more urls (fixes #1723) 
The url only needs to have the 'idVideo' field in the query, in any position.
We have to set the 'void=oui' in the webpage url, so that we get the file name.
 2013-11-04 22:26:19 +01:00
Jaime Marquínez Ferrándiz
e7e6b54d8a [teamcoco] Parse the xml file and extract all the formats 2013-11-03 17:48:12 +01:00
Jaime Marquínez Ferrándiz
2a1a8ffe41 Merge pull request #1693 from alexvh/teamcoco_fix 
[teamcoco] Fix video url extraction for some videos
 2013-11-03 17:19:51 +01:00
Philipp Hagemeister
08fb86c49b [youtube] Add description for YoutubeSearchDateIE (#1710) 2013-11-03 15:59:10 +01:00
Philipp Hagemeister
3633d77c0f Merge remote-tracking branch 'CBGoodBuddy/ytsearchtime' 2013-11-03 15:56:55 +01:00
Philipp Hagemeister
12ebdd1506 [viddler] Support non-digit IDs (Fixes #1714) 2013-11-03 15:49:59 +01:00
Jaime Marquínez Ferrándiz
1baf9a5938 Merge pull request #1698 from rzhxeo/cinemassacre 
[CinemassacreIE] Support more embed urls
 2013-11-03 05:17:12 -08:00
Jaime Marquínez Ferrándiz
a56f9de156 Style fixes for extractors: remove spaces around (,),{ and } 2013-11-03 14:06:47 +01:00
Jaime Marquínez Ferrándiz
fa5d47af4b Merge pull request #1679 from rzhxeo/mofosex 
Add support for http://www.mofosex.com
 2013-11-03 05:04:14 -08:00
Jaime Marquínez Ferrándiz
d607038753 Merge pull request #1677 from rzhxeo/xtube 
Add support for http://www.xtube.com
 2013-11-03 03:28:02 -08:00
Jaime Marquínez Ferrándiz
9ac6a01aaf Merge pull request #1676 from rzhxeo/extremetube 
Add support for http://www.extremetube.com
 2013-11-03 03:25:46 -08:00
Jaime Marquínez Ferrándiz
9103bbc5cd Add the 'webpage_url' field to info_dict 
The url for the video page, it must allow to reproduce the result.
It's automatically set by YoutubeDL if it's missing.
 2013-11-03 12:11:13 +01:00
Craig Markwardt
a3dd924871 Add YoutubeSearchDateIE extractor to youtube.py & __init__.py, which searches by publication date. 2013-11-02 22:40:48 -04:00
rzhxeo
137bbb3e37 [XTubeIE] Add description to TEST 2013-11-02 22:45:48 +01:00
rzhxeo
86ad94bb2e [ExtremeTubeIE] Set age_limit to 18 and fix uploader extraction 2013-11-02 22:33:49 +01:00
Jaime Marquínez Ferrándiz
3e56add7c9 Merge pull request #1678 from rzhxeo/keezmovies 
[KeezMoviesIE] Detect URLs with numbers in the SEO part correct
 2013-11-02 14:15:52 -07:00
Jaime Marquínez Ferrándiz
f52f01b5d2 [brightcove] Don't set the extension 
If the video only has the 'FLVFullLengthURL' key, it can still be an mp4 file.
 2013-11-02 21:20:46 +01:00
Jaime Marquínez Ferrándiz
98d7efb537 [exfm] skip tests 
The site is down too often.
 2013-11-02 20:51:09 +01:00
Jaime Marquínez Ferrándiz
cf51923545 [youtube] Remove vevo test 
The video is no longer available and it seems that vevo video don't use encrypted signatures anymore.
 2013-11-02 20:46:26 +01:00
Ismaël Mejía
38fcd4597a Merge remote-tracking branch 'iemejia/master' 2013-11-02 19:56:06 +01:00
Jaime Marquínez Ferrándiz
165e3bb67a [bambuser] Add an extractor for channels (closes #1702) 2013-11-02 19:50:57 +01:00
Ismaël Mejía
38db46794f Merge branch 'ted_subtitles' 2013-11-02 19:50:45 +01:00
Ismaël Mejía
a9a3876d55 [ted] Added support for subtitle download 2013-11-02 19:48:39 +01:00
Ismaël Mejía
1f343eaabb [subtitles] refactor to support websites with subtitle information the 
webpage.

I added the parameter webpage, so now it's similar to the way automatic
captions are handled. This is an improvement needed for websites like
TED.
 2013-11-02 19:29:25 +01:00
Jaime Marquínez Ferrándiz
72a5b4f702 Add an extractor for bambuser.com (#1702) 2013-11-02 19:01:01 +01:00
rzhxeo
0a43ddf320 [CinemassacreIE] Add live paramter to extracted info as a workaround 2013-11-02 18:08:35 +01:00
Philipp Hagemeister
8eddf3e91d [youtube] Encode subtitle track name in request (Fixes #1700) 2013-11-02 11:21:05 +01:00
Jaime Marquínez Ferrándiz
60d142aa8d Add an extractor for vk.com (closes #1635) 2013-11-01 22:34:18 +01:00
Jaime Marquínez Ferrándiz
66cf3ac342 [metacafe] Fix support for age-restricted videos (fixes #1696) 
The 'Content-Type' header must be set for disabling the family filter.
The 'flashversion' cookie  is only needed for AnyClip videos.
Added tests for standard metacafe videos and for age-restricted videos.
Also set the 'age_limit' field.
 2013-11-01 11:56:15 +01:00
rzhxeo
ab4e151347 [CinemassacreIE] Support more embed urls 2013-11-01 01:24:23 +01:00
Alex Van't Hof
ac2547f5ff [teamcoco] Fix video url extraction for some videos 
Video url extraction failed for some videos,
e.g. http://teamcoco.com/video/old-time-baseball

The url extracted was also occasionally suboptimal quality,
e.g. http://teamcoco.com/video/louis-ck-interview-george-w-bush
 2013-10-31 15:41:14 -04:00
Jaime Marquínez Ferrándiz
5f1ea943ab [livestream] fix the extraction of events 
It now uses a json dictionary from the webpage.
 2013-10-31 08:07:26 +01:00
Philipp Hagemeister
9f1109a564 [dailymotion] Fix support for age-restricted videos (Fixes #1688) 2013-10-31 00:20:49 +01:00
Philipp Hagemeister
72321ead7b [vevo] Readd support for SMIL (Fixes #1683) 2013-10-30 01:14:17 +01:00
Philipp Hagemeister
b5d0d817bc Remove superfluous space 2013-10-30 01:09:44 +01:00
Filippo Valsorda
b9a836515f Update the Vimeo test vector md5 
confirmed that this is indeed the first 10241 (we went off by one with
byte range 0-10240) of the full, playing mp4, so they probably
reencoded or something
 2013-10-29 16:44:35 -04:00
Jaime Marquínez Ferrándiz
21c924f406 [arte] Download the 'Originalversion' version if it's the only one available (fixes #1682) 2013-10-29 20:58:49 +01:00
Philipp Hagemeister
e54fd4b23b [vevo] Add more format details 2013-10-29 15:10:09 +01:00
Philipp Hagemeister
912cbf5d4e [vevo] Fix timestamp handling 
( / 1000 is implicit float division )
 2013-10-29 14:00:23 +01:00
Philipp Hagemeister
f7ff55aa78 Merge remote-tracking branch 'origin/master' 2013-10-29 06:48:18 +01:00
Philipp Hagemeister
795f28f871 [youtube] Fix login (Fixes #1681) 2013-10-29 06:45:54 +01:00
Jaime Marquínez Ferrándiz
321a01f971 [mtv] Remove the templates from the mediagen url 2013-10-28 23:37:01 +01:00
Jaime Marquínez Ferrándiz
2563bcc85c Add an extractor for MySpace (closes #1666) 2013-10-28 22:02:17 +01:00
rzhxeo
dcc2a706ef Add support for http://www.xtube.com 2013-10-28 19:23:48 +01:00
rzhxeo
2bc67c35ac [KeezMoviesIE] Detect URLs with numbers in the SEO part correct 2013-10-28 18:22:55 +01:00
rzhxeo
77ae65877e Add support for http://www.mofosex.com 2013-10-28 18:18:58 +01:00
rzhxeo
32a35e4418 Add support for http://www.extremetube.com 2013-10-28 17:35:01 +01:00
Philipp Hagemeister
1003d108d5 [vimeo] Support hash in URL (Fixes #1669) 2013-10-28 11:32:22 +01:00
Philipp Hagemeister
c1002e96e9 Let extractors omit ext in formats 2013-10-28 11:28:02 +01:00
Philipp Hagemeister
77d0a82fef [addanime] Use new formats system 2013-10-28 11:24:47 +01:00
Philipp Hagemeister
ebc14f251c Merge remote-tracking branch 'origin/master' 2013-10-28 10:44:13 +01:00
Philipp Hagemeister
d41e6efc85 New debug option --write-pages 2013-10-28 10:44:02 +01:00
Filippo Valsorda
8ffa13e03e [Instagram] get the non-https link, as they are serving Akamai cert from a instagram.com domain 2013-10-28 02:34:29 -04:00
Filippo Valsorda
750e9833b8 Add the missing age_limit tags; added a devscript to do a superficial check for porn sites without the age_limit tag in the test 2013-10-28 01:50:17 -04:00
Filippo Valsorda
82f0ac657c Merge pull request #1657 by @rzhxeo 
[YouPornIE] Extract all encrypted links and remove doubles at the end
 2013-10-28 01:45:52 -04:00
Filippo Valsorda
eb6a2277a2 Merge pull request #1659 by @rzhxeo 
Add support for http://www.tube8.com
 2013-10-28 01:38:28 -04:00
Filippo Valsorda
f8778fb0fa Merge pull request #1663 by @rzhxeo 
Add support for http://www.spankwire.com
 2013-10-28 01:35:11 -04:00