MarcoBuster/youtube-dl
1
1
Fork 0
mirror of https://github.com/ytdl-org/youtube-dl synced 2024-11-01 04:32:55 +01:00
Code Issues Releases Wiki Activity
3,206 Commits 10 Branches 1,120 Tags 240 MiB
8958b6916c
Commit Graph

1093 Commits

Author SHA1 Message Date
Philipp Hagemeister
3f8ced5144 Merge remote-tracking branch 'jaimeMF/yt-playlists' 2013-11-22 20:11:54 +01:00
Philipp Hagemeister
dca0872056 Move the opener to the YoutubeDL object. 
This is the first step towards being able to just import youtube_dl and start using it.
Apart from removing global state, this would fix problems like #1805.
 2013-11-22 19:57:52 +01:00
Philipp Hagemeister
15c3adbb16 Merge branch 'master' of github.com:rg3/youtube-dl 2013-11-22 19:08:33 +01:00
Philipp Hagemeister
f143a42fe6 [bandcamp] Skip album test 2013-11-22 19:08:25 +01:00
Jaime Marquínez Ferrándiz
241650c7ff [vimeo] Fix the extraction of vimeo pro and player.vimeo.com videos 2013-11-22 18:20:31 +01:00
Philipp Hagemeister
cffa6aa107 [bandcamp] Support trackinfo-style songs (Fixes #1270) 2013-11-22 17:44:55 +01:00
Philipp Hagemeister
02e4ebbbad [streamcloud] Add IE (Fixes #1801) 2013-11-22 17:19:22 +01:00
Philipp Hagemeister
ab009f59ef [toutv] Fix a typo 2013-11-22 17:18:03 +01:00
Jaime Marquínez Ferrándiz
0980426559 [bandcamp] add support for albums (reported in #1270) 2013-11-22 16:05:14 +01:00
Jaime Marquínez Ferrándiz
64bb5187f5 [soundcloud] Retrieve the file url using the client_id for the iPhone (fixes #1798) 
The desktop's client_id always give the rtmp url, but with the iPhone one it returns the http url if it's available.
 2013-11-21 13:16:19 +01:00
Philipp Hagemeister
9e4f50a8ae [sztv] skip test, site is undergoing mid-term maintenance 2013-11-20 09:59:03 +01:00
Philipp Hagemeister
0190eecc00 [nhl] Make NHLVideocenter IE_DESC fit with other descriptions 2013-11-20 09:45:29 +01:00
Philipp Hagemeister
ca872a4c0b [spankwire] Fix description search 2013-11-20 09:23:53 +01:00
Philipp Hagemeister
f2e87ef4fa [anitube] Skip test (on travis) 2013-11-20 07:46:44 +01:00
Philipp Hagemeister
0ad97bbc05 [spankwire] fix check for description 2013-11-20 07:45:32 +01:00
Philipp Hagemeister
c4864091a1 [videopremium] Support new crazy redirect scheme 2013-11-20 07:43:21 +01:00
Philipp Hagemeister
9a98a466b3 [toutv] really skip test 2013-11-20 07:37:22 +01:00
Philipp Hagemeister
da6a795fdb [escapist] Fix title search 2013-11-20 07:23:23 +01:00
Philipp Hagemeister
c5edcde21f [escapist] upper-case URL 2013-11-20 06:56:59 +01:00
Philipp Hagemeister
15ff3c831e [escapist] Fix syntax error 2013-11-20 06:55:07 +01:00
Philipp Hagemeister
100959a6d9 [escapist] Add support for HD format (Closes #1755) 2013-11-20 06:52:08 +01:00
Philipp Hagemeister
8f05351984 [anitube] Minor fixes (#1776) 2013-11-20 06:35:02 +01:00
Philipp Hagemeister
71791f414c Merge remote-tracking branch 'diffycat/master' 2013-11-20 06:28:13 +01:00
Philipp Hagemeister
f3682997d7 Clean up unused imports and other minor mistakes 2013-11-20 06:27:48 +01:00
Philipp Hagemeister
cc13cc0251 [teamcoco] Correct error 2013-11-20 06:25:33 +01:00
Philipp Hagemeister
5904088811 Add support for tou.tv (Fixes #1792) 2013-11-20 06:13:19 +01:00
Jaime Marquínez Ferrándiz
69545c2aff [d8] inherit from CanalplusIE 
it reuses the same extraction process
 2013-11-19 20:44:20 +01:00
Jaime Marquínez Ferrándiz
495da337ae Merge pull request #1758 from migbac/master 
Add support for d8.tv
 2013-11-19 20:43:14 +01:00
Philipp Hagemeister
cb7dfeeac4 [youtube] only allow domain name to be upper-case (#1786) 2013-11-18 16:42:35 +01:00
Philipp Hagemeister
4113e6ab56 [auengine] Do not return unnecessary ext 2013-11-18 14:36:01 +01:00
Philipp Hagemeister
9906d397a0 [auengine] Simplify 2013-11-18 13:56:45 +01:00
Philipp Hagemeister
887c6acdf2 Support multiple embedded YouTube URLs (Fixes #1787) 2013-11-18 13:28:26 +01:00
Philipp Hagemeister
83aa529330 Support protocol-independent URLs (#1787) 2013-11-18 13:18:17 +01:00
Philipp Hagemeister
fccd377198 Suppor embed-only videos (Fixes #1746) 2013-11-18 13:05:18 +01:00
Philipp Hagemeister
63b7b7224a [MTVIE] Try with RTMP URL if download fails 
This fixes youtube-dl http://www.southpark.de/clips/155251/cartman-vs-the-dog-whisperer
 2013-11-17 22:11:40 +01:00
rzhxeo
746f491f82 Add support for southpark.de 2013-11-17 17:54:47 +01:00
rzhxeo
1672647ade [SouthParkStudiosIE] Move from _TEST to _TESTS 2013-11-17 17:43:58 +01:00
rzhxeo
90b6bbc38c [SouthParkStudiosIE] Also detect urls without http:// or www 2013-11-17 17:42:24 +01:00
Philipp Hagemeister
1d699755e0 [youtube] Add view_count (Fixes #1781) 2013-11-17 11:06:16 +01:00
Philipp Hagemeister
ddf49c6344 [arte] remove two typos 2013-11-17 11:05:49 +01:00
Anton Larionov
ba3881dffd Add support for anitube.se (#1417) 2013-11-16 18:26:34 +04:00
Philipp Hagemeister
d1c252048b [redtube] Do not test md5, seems to vary 2013-11-16 10:30:09 +01:00
Philipp Hagemeister
eab2724138 [gamekings] Do not test md5 sum, precise file changes regularly 2013-11-16 02:32:23 +01:00
Philipp Hagemeister
21ea3e06c9 [gamekings] remove unnecessary import 2013-11-16 02:31:02 +01:00
Philipp Hagemeister
52d703d3d1 [tvp] Skip tests 2013-11-16 02:09:30 +01:00
Philipp Hagemeister
ce152341a1 [bambuser] Do not test for MD5, seems to be flaky 2013-11-16 01:59:28 +01:00
Philipp Hagemeister
f058e34011 [dailymotion] Fix playlists 2013-11-16 01:56:23 +01:00
Philipp Hagemeister
7150858d49 [spiegel] Implement format selection 2013-11-16 01:33:12 +01:00
Philipp Hagemeister
91c7271aab Add automatic generation of format note based on bitrate and codecs 2013-11-16 01:08:43 +01:00
Philipp Hagemeister
fc2ef392be [ted] Fix playlists (Fixes #1770) 2013-11-15 14:33:51 +01:00
Philipp Hagemeister
463a908705 [ted] simplify 2013-11-15 14:06:38 +01:00
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
Jaime Marquínez Ferrándiz
880e1c529d [youtube:playlist] Login into youtube if requested (fixes #1757) 
Allows to download private playlists
 2013-11-13 16:39:11 +01:00
Jaime Marquínez Ferrándiz
dcbb45803f [youtube:playlist] Don't use the gdata api (closes #1508) 
Parse the playlist pages instead
 2013-11-13 16:26:50 +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
rzhxeo
c8434e8316 Add support for crunchyroll.com 2013-11-09 11:25:12 +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
Filippo Valsorda
e2f9de207c Merge pull request #1664 by @rzhxeo 
Add support for http://www.keezmovies.com
 2013-10-28 01:25:46 -04:00
Filippo Valsorda
a93cc0d943 Merge pull request #1661 by @rzhxeo 
Add support for http://www.pornhub.com
 2013-10-28 00:50:39 -04:00
Filippo Valsorda
7d8c2e07f2 [Exfm] replace the failing Soundcloud test vector (broken also in browser) 2013-10-28 00:33:43 -04:00
Filippo Valsorda
efb4c36b18 Merge pull request #1660 from pyed/master 
[addanime] try to download HQ before normal
 2013-10-27 21:14:19 -07:00
Jaime Marquínez Ferrándiz
29526d0d2b Merge pull request #1656 from rzhxeo/xhamster 
[XHamsterIE] Extract SD and HD video
 2013-10-27 10:12:59 -07:00
Abdulelah Alfntokh
198e370f23 [addanime] better regex. 2013-10-27 19:48:02 +03:00
Jaime Marquínez Ferrándiz
c19f7764a5 [generic] Detect bandcamp pages that use custom domains (closes #1662) 
They embed the original url in the 'og:url' property.
 2013-10-27 14:40:25 +01:00
Jaime Marquínez Ferrándiz
bc63d9d329 [rtlnow] Change the test for rtlnitronow 2013-10-27 14:26:19 +01:00
Jaime Marquínez Ferrándiz
aa929c37d5 [generic] Fix test video's checksum 2013-10-27 14:21:37 +01:00
Jaime Marquínez Ferrándiz
af4d506eb3 [faz] Use a regex for getting the description 
The page cannot be parsed in python2.6 with the html parser.
 2013-10-27 14:18:55 +01:00
rzhxeo
5da0549581 [KeezMoviesIE] Correct return value for embedded videos 2013-10-27 12:48:09 +01:00
Jaime Marquínez Ferrándiz
749a4fd2fd [facebook] Don't recommend to report the issue if the video is private. 2013-10-27 12:13:55 +01:00
Jaime Marquínez Ferrándiz
6f71ef580c [facebook] Report a more meaningful message if the video cannot be accessed (closes #1658) 2013-10-27 12:09:46 +01:00
Jaime Marquínez Ferrándiz
67874aeffa [facebook] Fix the login process (fixes #1244) 2013-10-27 12:07:58 +01:00
Abdulelah Alfntokh
3e6a330d38 [addanime] fix md5sum 2013-10-27 13:51:26 +03:00
Abdulelah Alfntokh
aee5e18c8f [addanime] catch 'RegexNotFoundError' 2013-10-27 13:36:43 +03:00
rzhxeo
5b11143d05 Add support for http://www.keezmovies.com 2013-10-27 10:10:28 +01:00
rzhxeo
7b2212e954 Add support for http://www.spankwire.com 2013-10-27 01:59:26 +02:00
rzhxeo
71865091ab [Tube8IE] Fix regex for uploader extraction 2013-10-27 01:08:03 +02:00
rzhxeo
125cfd78e8 Add support for http://www.pornhub.com 2013-10-27 01:04:22 +02:00
rzhxeo
8cb57d9b91 [Tube8IE] Escape dot in regex 2013-10-27 00:21:27 +02:00
pyed
14e10b2b6e [addanime] try to download HQ before normal 2013-10-27 01:19:38 +03:00
rzhxeo
6e76104d66 [YouPornIE] Make webpage download more robust 2013-10-26 23:33:32 +02:00
rzhxeo
1d45a23b74 Add support for http://www.tube8.com 2013-10-26 23:27:30 +02:00
rzhxeo
7df286540f [YouPornIE] Extract all encrypted links and remove doubles at the end 2013-10-26 21:57:10 +02:00
rzhxeo
5d0c97541a [XHamsterIE] Extract SD and HD video 2013-10-26 20:38:54 +02:00
Philipp Hagemeister
49a25557b0 [8tracks] Use track count instead of looking at at_last_track property 
This fixes the error:

$ youtube-dl http://8tracks.com/vladmc/counting-stars
[8tracks] counting-stars: Downloading webpage
[8tracks] counting-stars: Downloading song information 1/4
[8tracks] counting-stars: Downloading song information 2/4
[8tracks] counting-stars: Downloading song information 3/4
[8tracks] counting-stars: Downloading song information 4/4
[8tracks] counting-stars: Downloading song information 5/4
Traceback (most recent call last):
  File "/usr/lib/python2.7/runpy.py", line 162, in _run_module_as_main
    "__main__", fname, loader, pkg_name)
  File "/usr/lib/python2.7/runpy.py", line 72, in _run_code
    exec code in run_globals
  File "/home/phihag/projects/youtube-dl/youtube_dl/__main__.py", line 18, in <module>
    youtube_dl.main()
  File "/home/phihag/projects/youtube-dl/youtube_dl/__init__.py", line 761, in main
    _real_main(argv)
  File "/home/phihag/projects/youtube-dl/youtube_dl/__init__.py", line 714, in _real_main
    retcode = ydl.download(all_urls)
  File "/home/phihag/projects/youtube-dl/youtube_dl/YoutubeDL.py", line 701, in download
    videos = self.extract_info(url)
  File "/home/phihag/projects/youtube-dl/youtube_dl/YoutubeDL.py", line 342, in extract_info
    ie_result = ie.extract(url)
  File "/home/phihag/projects/youtube-dl/youtube_dl/extractor/common.py", line 121, in extract
    return self._real_extract(url)
  File "/home/phihag/projects/youtube-dl/youtube_dl/extractor/eighttracks.py", line 111, in _real_extract
    'id': track_data['id'],
KeyError: 'id'
 2013-10-25 23:46:19 +02:00
Jaime Marquínez Ferrándiz
600cc1a4f0 [youtube] Set the format_id field to the itag of the format (closes #1624) 2013-10-25 17:17:46 +02:00
Jaime Marquínez Ferrándiz
ea32fbacc8 Fix the extensions of two tests with youtube videos 
The best quality is now a mp4 video.
 2013-10-25 16:55:37 +02:00
Jaime Marquínez Ferrándiz
00fe14fc75 [youtube] Also use the 'adaptative_fmts' field from the /get_video_info page (fixes #1649) 
The 'adaptative_fmts' field from the video page is not added to the 'url_encoded_fmt_stream_map'
 2013-10-25 16:52:58 +02:00
Jaime Marquínez Ferrándiz
fcc28edb2f [cinemassacre] Simplify 
* Remove some rtmp parameters that are not needed.
* Remove the md5 checksums, the video is not downloaded.
* Remove the code used before the current format system.
 2013-10-23 20:21:41 +02:00
Jaime Marquínez Ferrándiz
fac6be2dd5 Merge pull request #1632 from rzhxeo/cinemassacre 
[Cinemassacre] Download video that is shown in flash player
 2013-10-23 20:15:39 +02:00
Jaime Marquínez Ferrándiz
cdec0190c4 [dailymotion] Extract all the available formats (closes #1028) 2013-10-23 17:33:38 +02:00
Jaime Marquínez Ferrándiz
2450bcb28b [nowvideo] Fix key extraction 
Extract it from the embed page
 2013-10-23 17:00:33 +02:00
Jaime Marquínez Ferrándiz
93b22c7828 [vimeo] fix the extraction for videos protected with password 
Added a test video.
 2013-10-23 16:31:53 +02:00
Jaime Marquínez Ferrándiz
55b3e45bba [vimeo] Fix pro videos and player.vimeo.com urls 
The old process can still be used for those videos.
Added RegexNotFoundError, which is raised by _search_regex if it can't extract the info.
 2013-10-23 14:38:03 +02:00
Philipp Hagemeister
365bcf6d97 Merge remote-tracking branch 'origin/master' 2013-10-23 11:40:46 +02:00
Philipp Hagemeister
71907db3ba [vimeo] Fix normal videos (Fixes #1642) 
Vimeo Pro Videos are still broken
 2013-10-23 11:38:53 +02:00
Philipp Hagemeister
6803655ced Merge pull request #1622 from rbrito/fix-extension 
extractor: youtube: Set extension of AAC audio formats to m4a.
 2013-10-22 15:16:26 -07:00
Jaime Marquínez Ferrándiz
b028e96144 [arte.tv:creative] Update the title of the test 2013-10-22 21:06:06 +02:00
Jaime Marquínez Ferrándiz
ce68b5907c [nhl:videocenter] Fix playlist title extraction 2013-10-22 21:01:16 +02:00
Joshua Elsasser
a6387bfd3c [vimeo] Implement the new format selection system (closes PR #996) 
Rebased and deleted some parts to use the new system instead of copying the one from YoutubeIE
 2013-10-21 23:16:11 +02:00
Jaime Marquínez Ferrándiz
f6a54188c2 [youtube] Use 'node is None' when checking if the video has automatic captions 
It had stopped working and it reports a FutureWarning
 2013-10-21 16:28:55 +02:00
Jaime Marquínez Ferrándiz
cbbd9a9c69 Fix the duration field for the VideoDetective and InternetVideoArchive tests 
Also remove the use of the old format system and the comment
 2013-10-21 15:07:33 +02:00
Jaime Marquínez Ferrándiz
685a9cd2f1 [googleplus] Fix upload_date extraction 2013-10-21 15:00:21 +02:00
Jaime Marquínez Ferrándiz
182a107877 [arte] Set the format_note and the format_id fields (closes #1628) 2013-10-21 14:42:30 +02:00
Jaime Marquínez Ferrándiz
8c51aa6506 The 'format' field now defaults to '{format_id} - {width}x{height}{format_note}' 
Following the YoutubeIE format. The 'format_note' gives additional info about the format, for example '3D' or 'DASH video'.
 2013-10-21 14:42:06 +02:00
Philipp Hagemeister
f8b45beacc Merge remote-tracking branch 'rbrito/set-age' 
Conflicts:
	youtube_dl/extractor/xhamster.py
 2013-10-19 21:16:14 +02:00
Philipp Hagemeister
9d92015d43 [xhamster] Add support for age_limit (Instead of #1627) 2013-10-19 21:09:48 +02:00
Rogério Brito
50a6150ed9 extractor: Set age limit on some adult-related extractors. 
More age limit of videos for adult-related sites.

Note that, for redtube, I explicitly left the variable containing the age
limit, since the comment justifying the age limit is a good thing to have.

That being said, I included the age limit field on the test, to better
reflect what the information extractor does (even if it may not break the
automated tests).

Signed-off-by: Rogério Brito <rbrito@ime.usp.br>
 2013-10-19 14:19:25 -03:00
Rogério Brito
d5a9bb4ea9 extractor: youtube: Swap video dimensions to match standard practice. 
While working on this, I thought about simplifying things like changing
480x854 to 480p, and that seemed like a good option, until I realized that
people (me included) usually link the concept of some number followed by a p
with the video being 16:9.

So, we would be losing some information and, as we all know,
[explicit is better than implicit][*].

[*]: http://www.python.org/dev/peps/pep-0020/

This closes #1446.

Signed-off-by: Rogério Brito <rbrito@ime.usp.br>
 2013-10-19 14:04:44 -03:00
rzhxeo
b0505eb611 [CinemassacreIE] Fix information extraction 2013-10-19 16:46:17 +02:00
Rogério Brito
8ed6b34477 extractor: Set age limit on some adult-related extractors. 
This is similar in spirit to what was done in commit 8e590a117f.

Signed-off-by: Rogério Brito <rbrito@ime.usp.br>
 2013-10-18 19:32:37 -03:00
Rogério Brito
f6f1fc9286 extractor: youtube: Fix extension of dash formats. 
While we are at it, separate the audio formats from the video formats.

Signed-off-by: Rogério Brito <rbrito@ime.usp.br>
 2013-10-18 18:53:00 -03:00
Philipp Hagemeister
8e590a117f [xnxx] Add age_limit 2013-10-18 23:35:17 +02:00
Rogério Brito
16f36a6fc9 extractor: youtube: Set extension of AAC audio formats to m4a. 
This, in particular, eases downloading both audio and videos in DASH formats
before muxing them, which alleviates the problem that I exposed on issue

Furthermore, one may argue that this is, indeed, the case for correctness's
sake.

Signed-off-by: Rogério Brito <rbrito@ime.usp.br>
 2013-10-18 17:50:55 -03:00
Philipp Hagemeister
53c1d3ef49 Check for embedded YouTube player (Fixes #1616) 2013-10-18 11:44:57 +02:00
Philipp Hagemeister
7c58ef3275 [tudou] Fix title regex (Fixes #1614) 2013-10-18 11:16:20 +02:00
Philipp Hagemeister
416a5efce7 fix typos 2013-10-18 00:49:45 +02:00
Jaime Marquínez Ferrándiz
d21ab29200 Add an extractor for techtalks.tv (closes #1606) 2013-10-17 08:20:58 +02:00
Philipp Hagemeister
a733eb6c53 [youtube] Do not crash if caption info is missing altogether (Fixes #1610) 2013-10-17 02:19:19 +02:00
Philipp Hagemeister
591454798d [brightcove] Raise error if playlist is empty (#1608) 2013-10-17 01:02:17 +02:00
Philipp Hagemeister
38604f1a4f Merge remote-tracking branch 'origin/master' 2013-10-17 00:55:06 +02:00
Philipp Hagemeister
2d0efe70a6 [brightcove] Fix more broken XML (#1608) 2013-10-17 00:46:11 +02:00
Jaime Marquínez Ferrándiz
bfd14b1b2f Add an extractor for rutube.ru (closes #1136) 
It downloads with a m3u8 manifest, requires ffmpeg.
 2013-10-16 16:57:40 +02:00
Philipp Hagemeister
10eaae48ff Merge branch 'master' of github.com:rg3/youtube-dl 2013-10-15 12:05:24 +02:00
Philipp Hagemeister
9d4660cab1 [generic] Support embedded vimeo videos (#1602) 2013-10-15 12:05:13 +02:00
Jaime Marquínez Ferrándiz
9d74e308f7 [sztvhu] Fix the title extraction 2013-10-15 08:22:59 +02:00
Jaime Marquínez Ferrándiz
8381a92120 [websurg] Skipt the test 
It needs login information.
 2013-10-15 08:12:30 +02:00
Philipp Hagemeister
4f41664de8 Merge remote-tracking branch 'Rudloff/websurg' 2013-10-15 02:11:33 +02:00
Philipp Hagemeister
7cf67fbe29 [sztvhu] Simplify 2013-10-15 01:33:20 +02:00
Philipp Hagemeister
3ddf1a6d01 Merge remote-tracking branch 'Elbandi/master' 2013-10-15 01:26:34 +02:00
Philipp Hagemeister
850555c484 Merge remote-tracking branch 'origin/master' 2013-10-15 01:25:47 +02:00
Philipp Hagemeister
9ed3bdc64d [tudou] Add support for youku links (Closes #1571) 2013-10-15 01:20:04 +02:00
Jaime Marquínez Ferrándiz
c45aa56080 [gamespot] Fix video extraction (fixes #1587) 2013-10-14 16:46:07 +02:00
Philipp Hagemeister
7394b8db3b Merge remote-tracking branch 'origin/master' 2013-10-14 16:07:53 +02:00
Andras Elso
f9b3d7af47 Add an extractor for Szombathelyi TV 2013-10-14 13:07:47 +02:00
Filippo Valsorda
ea62a2da46 add VideoPremium.tv RTMP support 2013-10-14 01:32:47 -04:00
Jai Grimshaw
1fb07d10a3 [youtube] Adds #1312 Download annotations 
Adds #1321 Download annotations from youtube
Annotations are downloaded and written to a .annotations.xml file using the https://www.youtube.com/annotations_invideo?features=1&legacy=1&video_id=$VIDEOID API.
Added unit test for annotations.
 2013-10-14 16:22:27 +11:00
Philipp Hagemeister
9378ae6e1d [youku] Allow shortcut youku:ID and make non-matching groups non-matching (#1571) 2013-10-13 15:55:05 +02:00
Jaime Marquínez Ferrándiz
69a0c470b5 [arte] Add an extractor for future.arte.tv (closes #1593) 2013-10-13 14:21:13 +02:00
Jaime Marquínez Ferrándiz
c40f5cf45c [arte] add an extractor for creative.arte.tv (#1593) 
The +7 videos now use an independent extractor that is also used for the creative videos
 2013-10-13 13:54:31 +02:00
Jaime Marquínez Ferrándiz
4b7b839f24 Add an extractor for rottentomatoes.com and improve InternetVideoArchiveIE to get the best quality 2013-10-12 22:22:31 +02:00
Jaime Marquínez Ferrándiz
3d60d33773 Add an extractor for videodetective.com (closes #262) 
It uses the internetvideoarchive.com platform.
 2013-10-12 21:36:17 +02:00
Jaime Marquínez Ferrándiz
d7e66d39a0 Add an extractor for internetvideoarchive.com videos 
It's used by videodetective.com
 2013-10-12 21:34:04 +02:00
Filippo Valsorda
f5e54a1fda add support for NowVideo.ch 2013-10-12 13:11:03 -04:00
Joey Adams
3283533149 Fix Brightcove detection when another Flash object is on the page 
The regex used non-greedy match, but alas it failed on input like this:

    <object class="...> ... class="BrightcoveExperience"

It captured two objects and the intervening HTML.  This commit fixes this by
not allowing a ">" to appear before BrightcoveExperience.

Video in question: http://www.harpercollinschildrens.com/feature/petethecat/
 2013-10-11 21:52:33 -04:00
Jaime Marquínez Ferrándiz
8032e31f2d Merge pull request #1558 from rzhxeo/cinemassacre 
Add support for http://cinemassacre.com
 2013-10-11 20:38:26 +02:00
Jaime Marquínez Ferrándiz
d2f9cdb205 Merge branch 'cinemassacre' of github.com:rzhxeo/youtube-dl into rzhxeo-cinemassacre 2013-10-11 19:53:27 +02:00
Jaime Marquínez Ferrándiz
3823342d9d [arte] Prepare for generic format support (#980) 2013-10-11 16:33:31 +02:00
Jaime Marquínez Ferrándiz
91dbaef406 [nhl] Add an extractor for videocenter's categories (#1586) 
It downloads the last 12 videos.
 2013-10-11 14:33:26 +02:00
Jaime Marquínez Ferrándiz
cb354c8f62 [yahoo] Download the info from another page 
The 'meta' field is not always in the video webpage
 2013-10-10 21:01:45 +02:00
Jaime Marquínez Ferrándiz
1cbb27b151 [gamespot] Mark as broken (#1587) 2013-10-10 19:55:52 +02:00
Jaime Marquínez Ferrándiz
0ab4ff6378 [mtv] Strip the description 
There were some tabs and newlines added around the string.
 2013-10-10 19:53:44 +02:00
Jaime Marquínez Ferrándiz
63da13e829 Add an extractor for faz.net (closes #1582) 2013-10-10 19:37:17 +02:00
Jaime Marquínez Ferrándiz
2e1fa03bf5 Add an extractor for video.nhl.com (closes #1586) 2013-10-10 16:16:49 +02:00