projects
/
youtube-dl
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
6c37602
)
[wrzuta.pl] Detect error and update _TESTS
author
Yen Chi Hsuan
<yan12125@gmail.com>
Tue, 14 Jun 2016 03:14:59 +0000
(11:14 +0800)
committer
Yen Chi Hsuan
<yan12125@gmail.com>
Tue, 14 Jun 2016 03:14:59 +0000
(11:14 +0800)
youtube_dl/extractor/wrzuta.py
patch
|
blob
|
history
diff --git
a/youtube_dl/extractor/wrzuta.py
b/youtube_dl/extractor/wrzuta.py
index b811f57fbfe1ac575c8c080a6458697db9956982..bdd7097baec16afb2a3c83dbdde0e89ebc713a69 100644
(file)
--- a/
youtube_dl/extractor/wrzuta.py
+++ b/
youtube_dl/extractor/wrzuta.py
@@
-5,6
+5,7
@@
import re
from .common import InfoExtractor
from ..utils import (
from .common import InfoExtractor
from ..utils import (
+ ExtractorError,
int_or_none,
qualities,
remove_start,
int_or_none,
qualities,
remove_start,
@@
-27,16
+28,17
@@
class WrzutaIE(InfoExtractor):
'uploader_id': 'laboratoriumdextera',
'description': 'md5:7fb5ef3c21c5893375fda51d9b15d9cd',
},
'uploader_id': 'laboratoriumdextera',
'description': 'md5:7fb5ef3c21c5893375fda51d9b15d9cd',
},
+ 'skip': 'Redirected to wrzuta.pl',
}, {
}, {
- 'url': 'http://
jolka85.wrzuta.pl/audio/063jOPX5ue2/liber_natalia_szroeder_-_teraz_ty
',
- 'md5': '
bc78077859bea7bcfe4295d7d7fc9025
',
+ 'url': 'http://
vexling.wrzuta.pl/audio/01xBFabGXu6/james_horner_-_into_the_na_39_vi_world_bonus
',
+ 'md5': '
f80564fb5a2ec6ec59705ae2bf2ba56d
',
'info_dict': {
'info_dict': {
- 'id': '0
63jOPX5ue2
',
- 'ext': '
ogg
',
- 'title': '
Liber & Natalia Szroeder - Teraz Ty
',
- 'd
uration': 203
,
- '
uploader_id': 'jolka85'
,
- '
description': 'md5:2d2b6340f9188c8c4cd891580e481096
',
+ 'id': '0
1xBFabGXu6
',
+ 'ext': '
mp3
',
+ 'title': '
James Horner - Into The Na\'vi World [Bonus]
',
+ 'd
escription': 'md5:30a70718b2cd9df3120fce4445b0263b'
,
+ '
duration': 95
,
+ '
uploader_id': 'vexling
',
},
}]
},
}]
@@
-46,7
+48,10
@@
class WrzutaIE(InfoExtractor):
typ = mobj.group('typ')
uploader = mobj.group('uploader')
typ = mobj.group('typ')
uploader = mobj.group('uploader')
- webpage = self._download_webpage(url, video_id)
+ webpage, urlh = self._download_webpage_handle(url, video_id)
+
+ if urlh.geturl() == 'http://www.wrzuta.pl/':
+ raise ExtractorError('Video removed', expected=True)
quality = qualities(['SD', 'MQ', 'HQ', 'HD'])
quality = qualities(['SD', 'MQ', 'HQ', 'HD'])