Akkariin/youtube-dl
1
0
Fork 0
mirror of https://github.com/l1ving/youtube-dl synced 2024-11-23 04:22:55 +08:00
Code Issues Releases Wiki Activity
2,751 Commits 2 Branches 1,081 Tags 175 MiB
1008bebade
Commit Graph

818 Commits

Author SHA1 Message Date
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
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