Commit graph

2239 commits

Author SHA1 Message Date
Philipp Hagemeister b2ae513586 Merge remote-tracking branch 'mc2avr/master' 2013-12-16 05:14:03 +01:00
Philipp Hagemeister e4a0489f6e Merge remote-tracking branch 'dstftw/channel9'
Conflicts:
	youtube_dl/extractor/__init__.py
2013-12-16 05:14:00 +01:00
Philipp Hagemeister b83be81d27 Credit @mjorlitzky for pornhd (#1961) 2013-12-16 05:11:19 +01:00
Philipp Hagemeister 6f5dcd4eee [pornhd] Simplify 2013-12-16 05:10:42 +01:00
Philipp Hagemeister 1bb2fc98e0 Merge remote-tracking branch 'mjorlitzky/master' 2013-12-16 05:07:58 +01:00
Philipp Hagemeister e3946f989e Set process title to youtube-dl
This allows killing all youtube-dl processes with killall youtube-dl, and shows up nicer in some programs.
2013-12-16 05:04:55 +01:00
Philipp Hagemeister 8863d0de91 release 2013.12.16 2013-12-16 04:45:32 +01:00
Philipp Hagemeister 7b6fefc9d4 Apply --no-overwrites for --write-* files as well (Fixes #1980) 2013-12-16 04:39:13 +01:00
Philipp Hagemeister 525ef9227f Add --get-duration (Fixes #859) 2013-12-16 04:15:10 +01:00
Philipp Hagemeister c0ba0f4859 Document duration field 2013-12-16 04:09:43 +01:00
Philipp Hagemeister b466b7029d [youtube] Make duration an integer or None 2013-12-16 04:09:05 +01:00
Philipp Hagemeister fa3ae234e0 [cbs] Add extractor (Fixes #1977) 2013-12-16 03:53:43 +01:00
Philipp Hagemeister 48462108f3 [theplatform] Fix geographic restriction check 2013-12-16 03:43:45 +01:00
Philipp Hagemeister f8b56e95b8 [theplatform] Detect geoblocked content 2013-12-16 03:34:46 +01:00
Philipp Hagemeister 5fe18bdbde Add --min-views / --max-views (Fixes #1979) 2013-12-16 03:09:49 +01:00
Jaime Marquínez Ferrándiz dca02c80bc Fix detection of the extension if the 'extractaudio' is given and improve the error message (#1969)
Using 'foo.mp4' shouldn't raise an error.
If 'foo' is given suggest using 'foo.%(ext)s' for the template
2013-12-15 11:42:38 +01:00
Jaime Marquínez Ferrándiz 9ee859b683 [daylimotion] Add support for urls from the mobile site (fixes #1953)
It uses the 'touch' subdomain and adds a '#' before 'video'
2013-12-14 14:20:12 +01:00
Michael Orlitzky 8e05c870b4 Add support for pornhd.com. 2013-12-13 22:24:32 -05:00
Jaime Marquínez Ferrándiz 5d574e143f [ign] Update one of test video's title 2013-12-13 17:04:40 +01:00
Philipp Hagemeister 2a203a6cda Merge pull request #1956 from dstftw/master
Fix typo in month name
2013-12-13 07:41:34 -08:00
dst dadb8184e4 Fix typo in month name 2013-12-13 22:27:37 +07:00
Jaime Marquínez Ferrándiz 7a563df90a [daum] Recognize mobile urls (#1952) 2013-12-12 13:05:38 +01:00
Jaime Marquínez Ferrándiz 24b173fa5c [naver] Recognize mobile urls (fixes #1951) 2013-12-12 13:04:02 +01:00
dst 9b17ba0fa5 [channel9] Fix test description md5 2013-12-12 16:10:17 +07:00
dst 211f555d4c [channel9] Missing import in __init__ 2013-12-12 15:55:31 +07:00
dst 4d2ebb6bd7 [channel9] Cleanup 2013-12-12 15:19:23 +07:00
dst df53747436 [channel9] Initial implementation (#1885) 2013-12-12 15:13:45 +07:00
Jaime Marquínez Ferrándiz 3bc2ddccc8 Move FileDownloader to its own module and create a new class for each download process
A suitable downloader can be found using the 'get_suitable_downloader' function.

Each subclass implements 'real_download', for downloading an info dict you call the 'download' method, which first checks if the video has already been downloaded
2013-12-11 16:18:48 +01:00
Jaime Marquínez Ferrándiz 8ab470f1b2 Now a new FileDownloader is created when downloading a video
The progress hooks can be added using the method "add_downloader_progress_hook"
2013-12-11 16:04:42 +01:00
Philipp Hagemeister f2c36ee43e release 2013.12.11.2 2013-12-11 09:22:25 +01:00
Philipp Hagemeister 00381b4ccb [pornhub] Fix URL regexp 2013-12-11 09:22:08 +01:00
Philipp Hagemeister fca1ef19c1 release 2013.12.11.1 2013-12-11 08:54:54 +01:00
Philipp Hagemeister 357ddadbf5 Fix thumbnail filename determination (Fixes #1945) 2013-12-11 08:54:48 +01:00
Philipp Hagemeister 08d03235f9 release 2013.12.11 2013-12-11 08:45:51 +01:00
Jaime Marquínez Ferrándiz 1825836235 Use _download_xml in more extractors 2013-12-10 21:03:53 +01:00
Jaime Marquínez Ferrándiz a0088bdf93 [vimeo] Fix unused argument of the _real_extract method 2013-12-10 20:43:16 +01:00
Jaime Marquínez Ferrándiz 48ad51b243 [vimeo] Fix the extraction for some 'player' or 'pro' videos
The variable the config dict is assigned to can change, now we try to detect it or fallback to a, b or c
2013-12-10 20:28:12 +01:00
Jaime Marquínez Ferrándiz 5458b4cefb [dailymotion] Fix view count extraction and make it non fatal (fixes #1940) 2013-12-10 19:47:00 +01:00
Jaime Marquínez Ferrándiz 7c86cd5ab1 [dailymotion] Fix uploader extraction
Now it looks directly in the info dictionary
2013-12-10 19:44:16 +01:00
mc2avr df1d7da2af add MDRIE 2013-12-10 18:40:50 +01:00
Jaime Marquínez Ferrándiz cbfc470228 [mixcloud] Try to get the m4a url if the mp3 url fails to download (fixes #1939) 2013-12-10 13:42:41 +01:00
Jaime Marquínez Ferrándiz f67ca84d4a [soundcloud] Fix the extension for 'downloadable' songs
In this case the 'original_format' field must be used.
2013-12-10 13:04:21 +01:00
Philipp Hagemeister e2b38da931 [mtv] Fixup incorrectly encoded XML documents 2013-12-10 12:45:22 +01:00
Philipp Hagemeister a30a60d8eb release 2013.12.10 2013-12-10 11:54:59 +01:00
Philipp Hagemeister 5a3ea17c94 [zdf] Correct order of unknown formats (#1936) 2013-12-10 11:52:10 +01:00
Philipp Hagemeister 475700acfe [soundcloud] Do not mistake original_format for ext (Fixes #1934) 2013-12-10 11:45:13 +01:00
Philipp Hagemeister 45598aab08 [YoutubeDL] Simplify filename preparation 2013-12-10 11:23:35 +01:00
Jaime Marquínez Ferrándiz 26e6393134 Set 'NA' as the default value for missing fields in the output template (fixes #1931)
Remove the `except KeyError` clause, it won't get raised anymore
2013-12-09 22:00:42 +01:00
Philipp Hagemeister 49929a20a7 release 2013.12.09.4 2013-12-09 20:05:27 +01:00
Philipp Hagemeister f8bd0194a7 Remove superfluous spaces 2013-12-09 20:05:10 +01:00
Jaime Marquínez Ferrándiz 77526143e7 [brightcove] Use the original url (usually the player) as the default referer (fixes #1929) 2013-12-09 20:01:43 +01:00
Philipp Hagemeister 4ff50ef846 [soundcloud] Do not match sets (Fixes #1930) 2013-12-09 19:57:00 +01:00
Philipp Hagemeister caefb1de87 [ndtv] Add extractor (Fixes #1924) 2013-12-09 19:44:33 +01:00
Philipp Hagemeister 1e1f84dac9 release 2013.12.09.3 2013-12-09 18:56:17 +01:00
Philipp Hagemeister 1d87e3a1c6 [rtlnow] Allow double slashes after domain name (Fixes #1928) 2013-12-09 18:56:05 +01:00
Philipp Hagemeister df8ae1e3a2 release 2013.12.09.2 2013-12-09 18:31:31 +01:00
Philipp Hagemeister f7d8d4a116 Merge branch 'master' of github.com:rg3/youtube-dl 2013-12-09 18:29:12 +01:00
Philipp Hagemeister 1c088fa89d Improve --bidi-workaround support 2013-12-09 18:29:07 +01:00
Jaime Marquínez Ferrándiz de2dd4c502 [soundcloud] add support for private links (fixes #1927) 2013-12-09 17:08:58 +01:00
Philipp Hagemeister 395293a889 [--load-info] Always read file as UTF-8
This allows editing the file (and not escaping non-ASCII characters) and reloading it in.
2013-12-09 04:59:51 +01:00
Philipp Hagemeister db4da14027 Merge remote-tracking branch 'jaimeMF/load-info' 2013-12-09 04:55:02 +01:00
Philipp Hagemeister 2101830c0d Remove unused imports 2013-12-09 04:53:23 +01:00
Philipp Hagemeister ffa8f0df0a Merge remote-tracking branch 'jaimeMF/yt-toplists' 2013-12-09 04:49:32 +01:00
Philipp Hagemeister 693b8b2d31 Merge remote-tracking branch 'dstftw/smotri.com-broadcast'
Conflicts:
	youtube_dl/FileDownloader.py
	youtube_dl/extractor/smotri.py
2013-12-09 04:42:35 +01:00
Philipp Hagemeister a0d96c9843 Add filename to --dump-json output (Fixes #1908) 2013-12-09 04:31:18 +01:00
Philipp Hagemeister eaa1a7bde3 release 2013.12.09.1 2013-12-09 04:09:06 +01:00
Philipp Hagemeister 0783b09b92 Add a workaround for terminals without bidi support (Fixes #1912) 2013-12-09 04:08:51 +01:00
Philipp Hagemeister ffe62508e4 release 2013.12.09 2013-12-09 03:03:01 +01:00
Philipp Hagemeister ac79fa02b8 Restore Python 2.6.<6 compatibility (Fixes #1860) 2013-12-09 03:02:54 +01:00
Philipp Hagemeister 7cc3570e53 Add fatal=False parameter to _download_* functions.
This allows us to simplify the calls in the youtube extractor even further.
2013-12-09 01:49:03 +01:00
Jaime Marquínez Ferrándiz baa7b1978b Remove the calls to 'compat_urllib_request.urlopen' in a few extractors 2013-12-08 22:24:55 +01:00
Jaime Marquínez Ferrándiz ac5118bcb9 [arte.tv:ddc] Add fields to the test and skip download (rtmp) 2013-12-08 16:35:29 +01:00
Camillo Dell'mour 52defb0c9b made ddc.arte.tv test working 2013-12-08 16:22:31 +01:00
Camillo Dell'mour 56a8ab7d60 added arte.tv extractor support for subdomain ddc - Mit offenen Karten(german) Le Dessous des Cartes(france) 2013-12-08 14:43:15 +01:00
Philipp Hagemeister 22686b91f0 release 2013.12.08.1 2013-12-08 07:32:25 +01:00
Philipp Hagemeister 31812a9e0e [youtube:channel] Fix automated channel detection 2013-12-08 07:30:42 +01:00
Philipp Hagemeister 11bf848191 [wimp] simplify 2013-12-08 07:22:19 +01:00
Philipp Hagemeister d4df5ed14c release 2013.12.08 2013-12-08 06:54:52 +01:00
Philipp Hagemeister 303b479e0a Automatically load SSL certs on Windows 2013-12-08 06:54:39 +01:00
Philipp Hagemeister 4c52160646 [FileDownloader] Fix progress report on Windows (Fixes #1918) 2013-12-08 06:53:46 +01:00
Philipp Hagemeister a213880aaf Simplify status reporting (#1918) 2013-12-08 05:49:35 +01:00
rzhxeo b860967ce4 [XHamsterIE] Fix md5 in second test 2013-12-07 22:17:13 +01:00
rzhxeo 8ca6b8fba1 [XHamsterIE] Fix HD video detection 2013-12-07 21:39:32 +01:00
Jaime Marquínez Ferrándiz c4d9e6731a [pyvideo] add support for videos that don't come from Youtube 2013-12-07 11:19:59 +01:00
Jaime Marquínez Ferrándiz 0d9ec5d963 [pyvideo] Cleanup and fix test 2013-12-07 11:00:56 +01:00
Adam Glenn f623530d6e removing bad VALID_URL 2013-12-06 21:12:10 -08:00
Adam Glenn ca9e02dc00 Adding pyvideo support 2013-12-06 21:11:01 -08:00
Jaime Marquínez Ferrándiz fb30ec22fd [vimeo] Add an extractor for groups 2013-12-06 22:01:41 +01:00
Jaime Marquínez Ferrándiz 5cc14c2fd7 [vimeo] Add an extractor for albums (closes #1911) 2013-12-06 21:48:44 +01:00
Jaime Marquínez Ferrándiz d349cd2240 [imdb] Fix extraction
The paths to each format's page may have leading whitespace.
The height and the duration can't be extracted.
2013-12-06 20:26:55 +01:00
Jaime Marquínez Ferrándiz 0b6a9f639f [vevo] Update test video's duration 2013-12-06 20:14:29 +01:00
Jaime Marquínez Ferrándiz 715c8e7bdb [youtube:playlist] Recognize mix ids for direct use (fixes #1295) 2013-12-06 19:52:41 +01:00
Jaime Marquínez Ferrándiz 7d4afc557f [youtube:playlist] Support mix ids longer than 13 (#1295) 2013-12-06 19:48:54 +01:00
Jaime Marquínez Ferrándiz 563e405411 [dailymotion] Fix view count regex
In some languages they can be in the format '123,456' instead of '123.456'
2013-12-06 13:41:07 +01:00
Jaime Marquínez Ferrándiz f53c966a73 [dailymotion] Extract view count (#1895) 2013-12-06 13:36:36 +01:00
Jaime Marquínez Ferrándiz 336c3a69bd [youtube] Extract like and dislike count (#1895) 2013-12-06 13:22:27 +01:00
Jaime Marquínez Ferrándiz 4e76179476 [vimeo] Extract views count, likes count and comments count (#1895) 2013-12-06 13:03:08 +01:00
Philipp Hagemeister ef4fd84857 [wistia] Add extractor 2013-12-06 09:15:04 +01:00
Philipp Hagemeister 72135030d1 Merge remote-tracking branch 'origin/master' 2013-12-05 22:30:04 +01:00
Jaime Marquínez Ferrándiz 3514813d5b [francetv] Add support for urls in the format http://www.france3.fr/emissions/{program}/diffusions/{date} (fixes #1898) 2013-12-05 21:49:30 +01:00
Jaime Marquínez Ferrándiz 9e60602084 [francetv] Add support for more channels: 3, 4, 5 and Ô (#1898)
Rename the France2IE extractor to FranceTVIE
2013-12-05 21:48:41 +01:00
Philipp Hagemeister 19e3dfc9f8 [9gag] Like/dislike count (#1895) 2013-12-05 18:29:07 +01:00
Philipp Hagemeister a1ef7e85d6 Remove unused imports 2013-12-05 14:31:54 +01:00
Philipp Hagemeister ef2fac6f4a Merge branch 'master' of github.com:rg3/youtube-dl 2013-12-05 14:29:14 +01:00
Philipp Hagemeister 7fc3fa0545 [9gag] Add extractor 2013-12-05 14:29:08 +01:00
Jaime Marquínez Ferrándiz 673d1273ff [vevo] Support '/watch/{id}' urls 2013-12-05 12:41:58 +01:00
Jaime Marquínez Ferrándiz b9a2c53833 [metacafe] Add support for cbs videos (fixes #1838)
They use theplatform.com
2013-12-04 23:43:50 +01:00
Jaime Marquínez Ferrándiz e9bf7479d2 Add an extractor for theplatform.com 2013-12-04 23:41:22 +01:00
Jaime Marquínez Ferrándiz bfb9f7bc4c [hotnewhiphop] Update test's title 2013-12-04 20:36:26 +01:00
Philipp Hagemeister 29030c0a4c Merge remote-tracking branch 'dstftw/correct-valid-urls' 2013-12-04 19:56:05 +01:00
dst c0ade33e16 Correct some extractor _VALID_URL regexes 2013-12-04 20:34:47 +07:00
Philipp Hagemeister 671c0f151d release 2013.12.04 2013-12-04 14:19:07 +01:00
Philipp Hagemeister 27dcce1904 [youtube] Resolve URLs in comments 2013-12-04 14:18:49 +01:00
dst 8aff7b9bc4 [smotri] Fix broadcast ticket regex 2013-12-04 12:36:12 +07:00
dst 55f6597c67 [smotri] Add an extractor for live rtmp broadcasts 2013-12-04 08:41:09 +07:00
Jaime Marquínez Ferrándiz d494389821 Option '--load-info': if the download fails, try extracting the info with the 'webpage_url' field of the info dict
The video url may have expired.
2013-12-03 20:16:52 +01:00
Jaime Marquínez Ferrándiz 1dcc4c0cad Add --load-info option (#972)
It just calls the 'YoutubeDL.process_ie_result' with the dictionary from the json file
2013-12-03 20:15:20 +01:00
Jaime Marquínez Ferrándiz 84db81815a Move common code for extractors based in MTV services to a new base class
Removes the duplication of the thumbnail extraction code (only MTVIE needs to override it)
2013-12-03 14:58:24 +01:00
Jaime Marquínez Ferrándiz fb7abb31af Remove the compatibility code used before the new format system was implemented 2013-12-03 14:31:20 +01:00
Philipp Hagemeister ce93879a9b [daum] Fix real video ID extraction 2013-12-03 14:16:58 +01:00
Philipp Hagemeister 938384c587 [redtube] Fix search for title 2013-12-03 14:08:16 +01:00
Philipp Hagemeister e9d8e302aa [xhamster] Change test checksum 2013-12-03 14:06:16 +01:00
Jaime Marquínez Ferrándiz cb7fb54600 Change the ie_name of YoutubeSearchDateIE
It produced a duplicate entry when listing the extractors with '--list-extractors' and generates noise in the commit log when generating the supported sites webpage (like in 09f355f73b)
2013-12-03 13:55:25 +01:00
Philipp Hagemeister cf6758d204 Document disabling proxy (#1882) 2013-12-03 13:33:07 +01:00
Philipp Hagemeister 731e3dde29 release 2013.12.03 2013-12-03 13:13:09 +01:00
Philipp Hagemeister a0eaa341e1 [configuration] Undo code breakage 2013-12-03 13:11:20 +01:00
Philipp Hagemeister fb27c2295e Correct configuration file locations 2013-12-03 13:09:48 +01:00
Philipp Hagemeister 1b753cb334 Add Windows configuration file locations (#1881) 2013-12-03 13:04:02 +01:00
Philipp Hagemeister 36a826a50d Clarify --download-archive help (#1757) 2013-12-03 11:54:52 +01:00
Philipp Hagemeister 8796857429 Credit @dstftw for smotri IE 2013-12-02 17:43:22 +01:00
Philipp Hagemeister aaebed13a8 [smotri] Simplify 2013-12-02 17:08:17 +01:00
Philipp Hagemeister 25939ffe56 Merge branch 'smotri.com' of https://github.com/dstftw/youtube-dl 2013-12-02 15:56:35 +01:00
dst 5270d8cb13 Added extractors for smotri.com 2013-12-02 20:10:19 +07:00
Philipp Hagemeister 0037e02921 release 2013.12.02 2013-12-02 13:37:26 +01:00
Philipp Hagemeister 6ad14cab59 Add --socket-timeout option 2013-12-02 13:37:05 +01:00
Philipp Hagemeister a9be0cc736 Merge branch 'master' of github.com:rg3/youtube-dl 2013-12-02 13:36:20 +01:00
Jaime Marquínez Ferrándiz 55a10eab48 [vimeo] Add an extractor for users (closes #1871) 2013-12-01 22:36:18 +01:00
Philipp Hagemeister e344693b65 Make socket timeout configurable, and bump default to 10 minutes (#1862) 2013-12-01 11:42:02 +01:00
Philipp Hagemeister 355e4fd07e [generic] Find embedded dailymotion videos (Fixes #1848) 2013-12-01 01:21:33 +01:00
Philipp Hagemeister 5e09d6abbd [clipfish] Skip test on travis 2013-12-01 01:16:20 +01:00
Jaime Marquínez Ferrándiz 0a688bc0b2 [youtube] Add support for downloading top lists (fixes #1868)
It needs to know the channel and the title of the list, because the ids change every time you browse the channels and are attached to a 'VISITOR_INFO1_LIVE' cookie.
2013-11-30 14:56:51 +01:00
Philipp Hagemeister b138de72f2 Merge branch 'master' of github.com:rg3/youtube-dl 2013-11-30 00:42:56 +01:00
Philipp Hagemeister 06dcbb71d8 Clarify help of --write-pages (#1853) 2013-11-30 00:42:43 +01:00
Jaime Marquínez Ferrándiz c5171c454b [yahoo] Force use of the http protocol for downloading the videos. 2013-11-29 22:06:17 +01:00
Philipp Hagemeister 323ec6ae56 Clarify --download-archive help 2013-11-29 15:57:43 +01:00
Jaime Marquínez Ferrándiz befd88b786 [yahoo] Add an extractor for yahoo news (closes #1849) 2013-11-29 15:25:43 +01:00
Philipp Hagemeister a3fb4675fb Do not mutate default arguments
In this case, it looks rather harmless (since the conditions for --restrict-filenames should not change while a process is running), but just to be sure.
This also simplifies the interface for callers, who can just pass in the idiomatic None for "I don't care, whatever is the default".
2013-11-29 15:25:11 +01:00
Nicolas Kaiser 9986238ba9 fix typo in help 2013-11-29 09:48:38 +01:00
Jaime Marquínez Ferrándiz acf37ca151 [imdb] Fix the resolution values (fixes #1847)
We were using the size of the player, it was the same for all the formats
2013-11-29 07:56:14 +01:00
Philipp Hagemeister 17769d5a6c release 2013.11.29 2013-11-29 03:34:26 +01:00