projects
/
youtube-dl
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
fea82c1
)
[googledrive] Extend _VALID_URL (closes #9785)
author
Sergey M․
<dstftw@gmail.com>
Sun, 27 Aug 2017 17:50:41 +0000
(
00:50
+0700)
committer
Sergey M․
<dstftw@gmail.com>
Sun, 27 Aug 2017 17:50:41 +0000
(
00:50
+0700)
youtube_dl/extractor/googledrive.py
patch
|
blob
|
history
diff --git
a/youtube_dl/extractor/googledrive.py
b/youtube_dl/extractor/googledrive.py
index 37d37390197b0393c1415bd86e9e30e2b93d7c5c..3bf462d631d7ca20f8eb1b146b496a7c3a57415f 100644
(file)
--- a/
youtube_dl/extractor/googledrive.py
+++ b/
youtube_dl/extractor/googledrive.py
@@
-13,7
+13,18
@@
from ..utils import (
class GoogleDriveIE(InfoExtractor):
class GoogleDriveIE(InfoExtractor):
- _VALID_URL = r'https?://(?:(?:docs|drive)\.google\.com/(?:uc\?.*?id=|file/d/)|video\.google\.com/get_player\?.*?docid=)(?P<id>[a-zA-Z0-9_-]{28,})'
+ _VALID_URL = r'''(?x)
+ https?://
+ (?:
+ (?:docs|drive)\.google\.com/
+ (?:
+ (?:uc|open)\?.*?id=|
+ file/d/
+ )|
+ video\.google\.com/get_player\?.*?docid=
+ )
+ (?P<id>[a-zA-Z0-9_-]{28,})
+ '''
_TESTS = [{
'url': 'https://drive.google.com/file/d/0ByeS4oOUV-49Zzh4R1J6R09zazQ/edit?pli=1',
'md5': '5c602afbbf2c1db91831f5d82f678554',
_TESTS = [{
'url': 'https://drive.google.com/file/d/0ByeS4oOUV-49Zzh4R1J6R09zazQ/edit?pli=1',
'md5': '5c602afbbf2c1db91831f5d82f678554',
@@
-42,7
+53,13
@@
class GoogleDriveIE(InfoExtractor):
'title': 'Andreea Banica feat Smiley - Hooky Song (Official Video).mp4',
'duration': 189,
},
'title': 'Andreea Banica feat Smiley - Hooky Song (Official Video).mp4',
'duration': 189,
},
- 'only_matching': True
+ 'only_matching': True,
+ }, {
+ 'url': 'https://drive.google.com/open?id=0B2fjwgkl1A_CX083Tkowdmt6d28',
+ 'only_matching': True,
+ }, {
+ 'url': 'https://drive.google.com/uc?id=0B2fjwgkl1A_CX083Tkowdmt6d28',
+ 'only_matching': True,
}]
_FORMATS_EXT = {
'5': 'flv',
}]
_FORMATS_EXT = {
'5': 'flv',