1
0
mirror of https://github.com/ytdl-org/youtube-dl.git synced 2025-02-06 18:20:02 +00:00
Commit Graph

13626 Commits

Author SHA1 Message Date
John Hawkinson
3cd6469e36 [iqm2] Improve jwplayer_data regexp
Surprise! URLs can have parentheses in them, just like like @dstftw
reminded us in
001a30f335 (r83538385)

Use . instead of [^)] and anchor the regexp with \)\); at the end.
Add an only_matching test case for this, although it may switch from
realtime to processed in a few hours...
2016-10-18 00:00:11 -04:00
John Hawkinson
02f4d4e44f Move JWPlayer JSON array handling to IQM2
Out of @yan12125's concern that the presumption that JWPlayer data as
an array representing multiple formats rather than a playlist might be
specific to IQM2, move this code from jwplatform.py to iqm2.py.

JWPlatformBase now reverts to throwing a TypeError if it gets an
array.

Now IQM2 redefines the _extract_jwplayer_data() method as well, but it
continues to leverage JWPlatformBase for _parse_jwplayer_data(), which
is the bulk of the work.
2016-10-10 10:55:42 -04:00
John Hawkinson
cb2e9ec69e Use subsidiary page's media ID, not parent page
Video IDs should be based on the unique ID of the video, not the
meeting ID of the parent page that links to the media
page. Unfortunately we don't learn the media ID until after
downloading the first page.
2016-10-10 02:24:39 -04:00
John Hawkinson
87af84de37 Leverage JWPlatformBase instead of Generic
Per @yan12125's suggestion:
* Redefine _find_jwplayer_data() to use the SetupJWPlayer RE that's IQM2-specific
* Retreive the 2ndary webpage on our own
* Search for the title just like generic does
2016-10-10 02:12:44 -04:00
John Hawkinson
00253f8312 [JWPlatformBase] handle a few more cases
* If our parsed JSON ends up as a list, rather than a dict, then store
  it in ['sources'] as that list, rather than trying to wrap it in an
  array, which leads to type errors. (Such a list indicates multiple
  file formats/sources, rather than a playlist.)

* Allow format labels like 'SD 480' and 'HD 720' in addition to '1080p'
2016-10-10 02:07:34 -04:00
John Hawkinson
c1ce8deed8 re-fill _TESTS (whitespace) 2016-10-10 01:57:56 -04:00
John Hawkinson
01845abc92 Remove verbose printing
It should move to YoutubeDL.process_ie_result per @yan12125,
future pull request forthcoming.
2016-10-09 09:18:23 -04:00
John Hawkinson
6589917a0b Remove #'d debugging per @yan12125 2016-10-09 09:15:52 -04:00
John Hawkinson
8d8acd193e Use _match_id() instead of re.match()
Oops, when I created this extractor I copied the sample code from the
2014 manpage on my system, thus missing 4bc77c8417ca0340d09dcebb311d06aa7d5ba0ac's
introduction of the _match_id() helper function.
2016-10-09 08:00:15 -04:00
John Hawkinson
f46aea8404 remove blank line 2016-10-08 23:12:37 -04:00
John Hawkinson
2cc84715bc Set to_generic -> True to suppress fallback msg 2016-10-08 23:11:07 -04:00
John Hawkinson
9a2ed02b65 debugging print -> self.to_screen() 2016-10-08 22:46:09 -04:00
John Hawkinson
f8eeb2b25a Some instances don't have downloadable video
E.g. somervillecityma.iqm2.com only has the JWPlayer video.
Makes a better test case, so add it as the first.
2016-10-08 21:01:43 -04:00
John Hawkinson
0bdb0c707b Condense comments, distribute 2016-10-08 19:38:28 -04:00
John Hawkinson
077bf26371 Use url_result instead of instance of GenericIE() 2016-10-08 19:31:50 -04:00
John Hawkinson
e6a1522743 Tighten up regex comment 2016-10-08 19:23:59 -04:00
John Hawkinson
71fbddb78a Use (?i) for case-insensitivity in URLs 2016-10-08 19:21:33 -04:00
John Hawkinson
e468f91968 Move test cases from comment to _TESTS 2016-10-08 19:17:32 -04:00
John Hawkinson
78210b31fa copyedit comments 2016-10-06 01:51:06 -04:00
John Hawkinson
021c07f81a Comment verbatim example of <div id=VideoPanelInner/> 2016-10-06 01:42:30 -04:00
John Hawkinson
e2135e8791 Handle relative URLs with urlparse.urljoin() 2016-10-06 01:38:25 -04:00
John Hawkinson
9adff20bb5 strip unused title= code 2016-10-06 01:33:34 -04:00
John Hawkinson
841b2af158 strip unnecessary comments from template 2016-10-06 01:30:44 -04:00
John Hawkinson
bca0b731c4 Case-insensitive URL match 2016-10-06 01:29:58 -04:00
John Hawkinson
70d117053d [IQM2] Add new extractor
first cut
2016-10-06 01:09:53 -04:00
Remita Amine
017eb82934 [npo] detect geo restriction 2016-10-05 18:27:02 +01:00
Sergey M․
b1d798887e
[npo] Add support for 2doc.nl (Closes #10842) 2016-10-05 23:43:08 +07:00
Steffan Donal
0a33bb2cb2
Rename "Steffan 'Ruirize' James" to "Steffan Donal"
Legal name change!
2016-10-05 03:32:14 +07:00
Remita Amine
185744f92f [lego] Add new extractor(closes #10369) 2016-10-04 10:30:57 +01:00
Remita Amine
7232e54813 [tonline] Add new extractor(#10376) 2016-10-04 08:00:25 +01:00
Sergey M․
6eb5503b12
[techtalks] Relax _VALID_URL 2016-10-04 02:54:36 +07:00
Aleksander Nitecki
539c881bfc
[techtalks] Allow URL-s with name part omitted. 2016-10-04 02:52:33 +07:00
Sergey M․
c1b2a0858c
[youtube:live] Extend _VALID_URL (Closes #10839) 2016-10-04 02:10:23 +07:00
Remita Amine
215ff6e0f3 [theweatherchannel] Add new extractor(closes #7188) 2016-10-03 18:20:34 +01:00
Déstin Reed
dcdb292fdd
Unify coding cookie 2016-10-03 23:44:29 +07:00
Remita Amine
c1084ddb0c [thisoldhouse] Add new extractor(closes #10837) 2016-10-03 15:27:09 +01:00
Sergey M․
ee5de4e38e
[nhl] Add support for wch2016.com (Closes #10833) 2016-10-03 00:54:02 +07:00
Yen Chi Hsuan
25291b979a Merge pull request #10829 from TRox1972/pornoxo_improve
[pornoxo] Use JWPlatform to improve metadata extraction
2016-10-02 20:19:34 +08:00
Déstin Reed
567a5996ca [pornoxo] Use JWPlatform to improve metadata extraction 2016-10-02 13:07:02 +02:00
Sergey M․
6c152ce20f
release 2016.10.02 2016-10-02 15:58:00 +07:00
Sergey M․
26406d33c7
[ChangeLog] Actualize 2016-10-02 15:56:33 +07:00
Yen Chi Hsuan
703b3afa93
[amcnetworks] Skip a restricted _TEST 2016-10-02 14:25:06 +08:00
Yen Chi Hsuan
99ed78c79e
[jwplatform] Support DASH streams 2016-10-02 14:07:49 +08:00
Yen Chi Hsuan
fd15264172
[jwplatform] Support old-style jwplayer playlists 2016-10-02 13:47:06 +08:00
Yen Chi Hsuan
bd26441205
[utils] Fix xattr error handling 2016-10-02 03:03:41 +08:00
Yen Chi Hsuan
b19e275d99
[__init__] Fix lost xattr if --embed-thumbnail used
Reported at
https://github.com/rg3/youtube-dl/issues/9054#issuecomment-250451823
2016-10-02 02:12:14 +08:00
Sergey M․
f6ba581f89
[byutv:event] Add extractor 2016-10-02 00:50:07 +07:00
Sergey M․
6d2549fb4f
[byutv] Fix id and display id 2016-10-02 00:44:54 +07:00
Déstin Reed
4da4516973
[byutv] Rely on _match_id and _parse_json 2016-10-02 00:41:18 +07:00
Sergey M․
e1e97c2446
[periscope:user] Fix extraction (Closes #10820) 2016-10-01 22:50:47 +07:00