projects
/
youtube-dl
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
989e9f8
)
[toggle] Improve _VALID_URL
author
Sergey M․
<dstftw@gmail.com>
Sat, 19 Dec 2015 13:58:18 +0000
(19:58 +0600)
committer
Sergey M․
<dstftw@gmail.com>
Sat, 19 Dec 2015 13:58:18 +0000
(19:58 +0600)
youtube_dl/extractor/togglesg.py
patch
|
blob
|
history
diff --git
a/youtube_dl/extractor/togglesg.py
b/youtube_dl/extractor/togglesg.py
index 47b2bfcb8e71f8bae8507a0eef90909ef3002756..22c6c91b9f15529076100ca07b523a9dd52e11b7 100644
(file)
--- a/
youtube_dl/extractor/togglesg.py
+++ b/
youtube_dl/extractor/togglesg.py
@@
-17,7
+17,7
@@
from ..utils import (
class ToggleSgIE(InfoExtractor):
IE_NAME = 'togglesg'
class ToggleSgIE(InfoExtractor):
IE_NAME = 'togglesg'
- _VALID_URL = r'https?://video\.toggle\.sg/(?:en|zh)/(?:series|clips|movies)/
.+?/
(?P<id>[0-9]+)'
+ _VALID_URL = r'https?://video\.toggle\.sg/(?:en|zh)/(?:series|clips|movies)/
(?:[^/]+/)+
(?P<id>[0-9]+)'
_TESTS = [{
'url': 'http://video.toggle.sg/en/series/lion-moms-tif/trailers/lion-moms-premier/343115',
'info_dict': {
_TESTS = [{
'url': 'http://video.toggle.sg/en/series/lion-moms-tif/trailers/lion-moms-premier/343115',
'info_dict': {
@@
-46,8
+46,9
@@
class ToggleSgIE(InfoExtractor):
'skip_download': 'DRM-protected wvm download',
}
}, {
'skip_download': 'DRM-protected wvm download',
}
}, {
+ # this also tests correct video id extraction
'note': 'm3u8 links are geo-restricted, but Android/mp4 is okay',
'note': 'm3u8 links are geo-restricted, but Android/mp4 is okay',
- 'url': 'http://video.toggle.sg/en/series/28th-sea-games-5-show/ep11/332861',
+ 'url': 'http://video.toggle.sg/en/series/28th-sea-games-5-show/
28th-sea-games-5-show-
ep11/332861',
'info_dict': {
'id': '332861',
'ext': 'mp4',
'info_dict': {
'id': '332861',
'ext': 'mp4',