projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'polskie-radio-programme' of https://github.com/JakubAdamWieczorek/youtu...
[youtube-dl]
/
youtube_dl
/
extractor
/
moevideo.py
diff --git
a/youtube_dl/extractor/moevideo.py
b/youtube_dl/extractor/moevideo.py
index d2a73fdabfd52c727b8fa79067f68cae3117d796..91ee9c4e95204718cb069fe1dc36908821b7af6d 100644
(file)
--- a/
youtube_dl/extractor/moevideo.py
+++ b/
youtube_dl/extractor/moevideo.py
@@
-7,17
+7,17
@@
import re
from .common import InfoExtractor
from ..utils import (
ExtractorError,
from .common import InfoExtractor
from ..utils import (
ExtractorError,
- compat_urllib_parse,
- compat_urllib_request,
int_or_none,
int_or_none,
+ sanitized_Request,
+ urlencode_postdata,
)
class MoeVideoIE(InfoExtractor):
)
class MoeVideoIE(InfoExtractor):
- IE_DESC = '
moevideo.net and playreplay
.net'
+ IE_DESC = '
LetitBit video services: moevideo.net, playreplay.net and videochart
.net'
_VALID_URL = r'''(?x)
https?://(?P<host>(?:www\.)?
_VALID_URL = r'''(?x)
https?://(?P<host>(?:www\.)?
- (?:
moevideo\.net|playreplay
\.net))/
+ (?:
(?:moevideo|playreplay|videochart)
\.net))/
(?:video|framevideo)/(?P<id>[0-9]+\.[0-9A-Za-z]+)'''
_API_URL = 'http://api.letitbit.net/'
_API_KEY = 'tVL0gjqo5'
(?:video|framevideo)/(?P<id>[0-9]+\.[0-9A-Za-z]+)'''
_API_URL = 'http://api.letitbit.net/'
_API_KEY = 'tVL0gjqo5'
@@
-34,8
+34,9
@@
class MoeVideoIE(InfoExtractor):
'width': 540,
'height': 360,
'duration': 179,
'width': 540,
'height': 360,
'duration': 179,
- 'filesize_approx': 17822500,
- }
+ 'filesize': 17822500,
+ },
+ 'skip': 'Video has been removed',
},
{
'url': 'http://playreplay.net/video/77107.7f325710a627383d40540d8e991a',
},
{
'url': 'http://playreplay.net/video/77107.7f325710a627383d40540d8e991a',
@@
-49,8
+50,9
@@
class MoeVideoIE(InfoExtractor):
'width': 480,
'height': 296,
'duration': 6027,
'width': 480,
'height': 296,
'duration': 6027,
- 'filesize_approx': 588257923,
- }
+ 'filesize': 588257923,
+ },
+ 'skip': 'Video has been removed',
},
]
},
]
@@
-76,8
+78,8
@@
class MoeVideoIE(InfoExtractor):
],
]
r_json = json.dumps(r)
],
]
r_json = json.dumps(r)
- post =
compat_urllib_parse.urlencode
({'r': r_json})
- req =
compat_urllib_request.
Request(self._API_URL, post)
+ post =
urlencode_postdata
({'r': r_json})
+ req =
sanitized_
Request(self._API_URL, post)
req.add_header('Content-type', 'application/x-www-form-urlencoded')
response = self._download_json(req, video_id)
req.add_header('Content-type', 'application/x-www-form-urlencoded')
response = self._download_json(req, video_id)
@@
-99,7
+101,7
@@
class MoeVideoIE(InfoExtractor):
'url': video_url,
'width': width,
'height': height,
'url': video_url,
'width': width,
'height': height,
- 'filesize
_approx
': filesize,
+ 'filesize': filesize,
}]
return {
}]
return {