28997 Commits

Author SHA1 Message Date
Philipp Hagemeister
71907db3ba [vimeo] Fix normal videos (Fixes #1642)
Vimeo Pro Videos are still broken
2013-10-23 11:38:53 +02:00
Rogério Brito
f642efff00 Merge branch 'master' into use-other-downloaders
Conflicts:
	youtube_dl/YoutubeDL.py
2013-10-23 05:38:19 -02:00
Jaime Marquínez Ferrándiz
0a4503dd95 Respect the download parameter in YoutubeDL.process_video_result if the extractor handle the format selection 2013-10-23 05:36:15 -02:00
Joshua Elsasser
4cd5ebc6d9 [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-23 05:36:15 -02:00
Jaime Marquínez Ferrándiz
6f9579e9b3 [youtube] Use 'node is None' when checking if the video has automatic captions
It had stopped working and it reports a FutureWarning
2013-10-23 05:36:15 -02:00
Jaime Marquínez Ferrándiz
08b855fa81 Fix the duration field for the VideoDetective and InternetVideoArchive tests
Also remove the use of the old format system and the comment
2013-10-23 05:36:15 -02:00
Jaime Marquínez Ferrándiz
64ed402a9b [googleplus] Fix upload_date extraction 2013-10-23 05:36:15 -02:00
Jaime Marquínez Ferrándiz
9fb2a603bc [arte] Set the format_note and the format_id fields (closes #1628) 2013-10-23 05:36:15 -02:00
Jaime Marquínez Ferrándiz
ac279133b3 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-23 05:36:15 -02:00
Jaime Marquínez Ferrándiz
1d4be5b13f YoutubeDL: remove method that came from FileDownloader 2013-10-23 05:36:15 -02:00
Jaime Marquínez Ferrándiz
f1f707de3c Allow to use the extension for the format selection
The best format with the extension is downloaded.
2013-10-23 05:36:15 -02:00
Jaime Marquínez Ferrándiz
d91f3b20a6 Accept requested formats to be in the format 35/best (closes #1552)
The format selection code is now an independent function.
2013-10-23 05:36:15 -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
Philipp Hagemeister
c7b6aa8db1 release 2013.10.23 2013-10-23 00:10:29 +02:00
Philipp Hagemeister
df1c39ec5c release 2013.10.23 2013.10.23 2013-10-23 00:07:27 +02:00
Philipp Hagemeister
1b3b408cc4 release 2013.10.22 2013-10-22 23:01:36 +02:00
Philipp Hagemeister
80f55a9511 release 2013.10.22 2013.10.22 2013-10-22 22:35:13 +02:00
Philipp Hagemeister
7853cc5ae1 Merge remote-tracking branch 'origin/master'
Conflicts:
	youtube_dl/YoutubeDL.py
2013-10-22 22:30:06 +02:00
Philipp Hagemeister
586a91b67f Expand tilde in template (Fixes #1639) 2013-10-22 22:28:26 +02: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
Jaime Marquínez Ferrándiz
fe7e0c9825 Style fixes in YoutubeDL.py
Fixed some of the problems reported by pep8
2013-10-22 14:49:34 +02:00
Jaime Marquínez Ferrándiz
12893efe01 Respect the download parameter in YoutubeDL.process_video_result if the extractor handle the format selection 2013-10-22 00:01:59 +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
Jaime Marquínez Ferrándiz
3fd39e37f2 YoutubeDL: remove method that came from FileDownloader 2013-10-21 13:52:24 +02:00
Jaime Marquínez Ferrándiz
49e86983e7 Allow to use the extension for the format selection
The best format with the extension is downloaded.
2013-10-21 13:31:55 +02:00
Jaime Marquínez Ferrándiz
a9c58ad945 Accept requested formats to be in the format 35/best (closes #1552)
The format selection code is now an independent function.
2013-10-21 13:19:58 +02:00
jakeogh
13d08e303e added --no-generic option to skip the generic information extractor. 2013-10-19 14:59:46 -07:00
Rogério Brito
9ef7cca548 Merge branch 'master' into use-other-downloaders 2013-10-19 17:05:00 -03: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
c6279f6d9d [CinemassacreIE] Add tc_url to extracted info and fix wrong if statement 2013-10-19 17:41:18 +02:00
rzhxeo
68277cfc7d [CinemassacreIE] Some videos use a different page url 2013-10-19 17:14:20 +02:00
rzhxeo
b0505eb611 [CinemassacreIE] Fix information extraction 2013-10-19 16:46:17 +02:00
Philipp Hagemeister
284acd57d6 Add an author email 2013-10-19 11:14:20 +02:00
Rogério Brito
846f4764af Merge branch 'master' into use-other-downloaders 2013-10-18 19:34:16 -03: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
Philipp Hagemeister
d5594202aa Simplify release process 2013-10-18 23:34:55 +02:00
Rogério Brito
01b9d2b490 extractor: youtube: Allow format number as output template.
Since many video formats map to the same extension, we get problems when
trying to download more than one format of the same audio/video with the
same ID.

This commit introduces a numeric version of the template of the video
format, which can help users who start downloading with a format (say, 720p
mp4), stop and then resume with another format (say, 360p mp4). See:

* http://bugs.debian.org/689294
* http://bugs.debian.org/643831

An output template like '%(title)s-%(id)s.%(format_num)s.%(ext)s' would,
unmistakenly, solve such problems.

This is also helpful to know what format was effectively downloaded when a
user expected something else (like, for instance, in issue #1578 or many of
its duplicates).

Another application of this is in separate downloads of audio video (as in
issue #1612).

Signed-off-by: Rogério Brito <rbrito@ime.usp.br>
2013-10-18 18:30:57 -03:00
Philipp Hagemeister
e5adce03ae release 2013.10.18.2 2013-10-18 23:25:05 +02:00
Philipp Hagemeister
b186d949cf release 2013.10.18.2 2013.10.18.2 2013-10-18 23:22:54 +02:00