projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[youtube] Remove info el for get_video_info request
[youtube-dl]
/
youtube_dl
/
extractor
/
musicplayon.py
diff --git
a/youtube_dl/extractor/musicplayon.py
b/youtube_dl/extractor/musicplayon.py
index d74b276c1884372efed065d6e1c993819e4f9b29..1854d59a5307a5b22f2efdda08a2b6c944aa8c50 100644
(file)
--- a/
youtube_dl/extractor/musicplayon.py
+++ b/
youtube_dl/extractor/musicplayon.py
@@
-1,4
+1,4
@@
-#
en
coding: utf-8
+# coding: utf-8
from __future__ import unicode_literals
from .common import InfoExtractor
from __future__ import unicode_literals
from .common import InfoExtractor
@@
-11,9
+11,9
@@
from ..utils import (
class MusicPlayOnIE(InfoExtractor):
class MusicPlayOnIE(InfoExtractor):
- _VALID_URL = r'https?://(?:.+?\.)?musicplayon\.com/play(?:-touch)?\?(?:v|pl=
100
&play)=(?P<id>\d+)'
+ _VALID_URL = r'https?://(?:.+?\.)?musicplayon\.com/play(?:-touch)?\?(?:v|pl=
\d+
&play)=(?P<id>\d+)'
- _TEST
=
{
+ _TEST
S = [
{
'url': 'http://en.musicplayon.com/play?v=433377',
'md5': '00cdcdea1726abdf500d1e7fd6dd59bb',
'info_dict': {
'url': 'http://en.musicplayon.com/play?v=433377',
'md5': '00cdcdea1726abdf500d1e7fd6dd59bb',
'info_dict': {
@@
-24,10
+24,16
@@
class MusicPlayOnIE(InfoExtractor):
'duration': 342,
'uploader': 'ultrafish',
},
'duration': 342,
'uploader': 'ultrafish',
},
- }
+ }, {
+ 'url': 'http://en.musicplayon.com/play?pl=102&play=442629',
+ 'only_matching': True,
+ }]
+
+ _URL_TEMPLATE = 'http://en.musicplayon.com/play?v=%s'
def _real_extract(self, url):
video_id = self._match_id(url)
def _real_extract(self, url):
video_id = self._match_id(url)
+ url = self._URL_TEMPLATE % video_id
page = self._download_webpage(url, video_id)
page = self._download_webpage(url, video_id)