|
@@ -9,17 +9,23 @@ from ..utils import ExtractorError
|
|
|
class TinyPicIE(InfoExtractor):
|
|
|
IE_NAME = 'tinypic'
|
|
|
IE_DESC = 'tinypic.com videos'
|
|
|
- _VALID_URL = r'http://tinypic\.com/player\.php\?v=(?P<id>[^&]+)&s=\d+'
|
|
|
-
|
|
|
- _TEST = {
|
|
|
- 'url': 'http://tinypic.com/player.php?v=6xw7tc%3E&s=5#.UtqZmbRFCM8',
|
|
|
- 'md5': '609b74432465364e72727ebc6203f044',
|
|
|
- 'info_dict': {
|
|
|
- 'id': '6xw7tc',
|
|
|
- 'ext': 'flv',
|
|
|
- 'title': 'shadow phenomenon weird',
|
|
|
+ _VALID_URL = r'http://(?:.+?\.)?tinypic\.com/player\.php\?v=(?P<id>[^&]+)&s=\d+'
|
|
|
+
|
|
|
+ _TESTS = [
|
|
|
+ {
|
|
|
+ 'url': 'http://tinypic.com/player.php?v=6xw7tc%3E&s=5#.UtqZmbRFCM8',
|
|
|
+ 'md5': '609b74432465364e72727ebc6203f044',
|
|
|
+ 'info_dict': {
|
|
|
+ 'id': '6xw7tc',
|
|
|
+ 'ext': 'flv',
|
|
|
+ 'title': 'shadow phenomenon weird',
|
|
|
+ },
|
|
|
+ },
|
|
|
+ {
|
|
|
+ 'url': 'http://de.tinypic.com/player.php?v=dy90yh&s=8',
|
|
|
+ 'only_matching': True,
|
|
|
}
|
|
|
- }
|
|
|
+ ]
|
|
|
|
|
|
def _real_extract(self, url):
|
|
|
mobj = re.match(self._VALID_URL, url)
|