projects
/
youtube-dl
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
(from parent 1:
0d2c141
)
Merge pull request #4069 from anovicecodemonkey/support_funnyordie_articles_urls
author
Sergey M.
<dstftw@gmail.com>
Fri, 31 Oct 2014 13:25:22 +0000
(18:25 +0500)
committer
Sergey M.
<dstftw@gmail.com>
Fri, 31 Oct 2014 13:25:22 +0000
(18:25 +0500)
[FunnyOrDie] Add support for "/articles/" URLs
youtube_dl/extractor/funnyordie.py
patch
|
blob
|
history
diff --git
a/youtube_dl/extractor/funnyordie.py
b/youtube_dl/extractor/funnyordie.py
index ec6d96adaeff666bf0fea7fe78e766c6a6ac2808..8ffcfca3b58a1e9570a23c5da5d904943ac9ea73 100644
(file)
--- a/
youtube_dl/extractor/funnyordie.py
+++ b/
youtube_dl/extractor/funnyordie.py
@@
-8,7
+8,7
@@
from ..utils import ExtractorError
class FunnyOrDieIE(InfoExtractor):
- _VALID_URL = r'https?://(?:www\.)?funnyordie\.com/(?P<type>embed|videos)/(?P<id>[0-9a-f]+)(?:$|[?#/])'
+ _VALID_URL = r'https?://(?:www\.)?funnyordie\.com/(?P<type>embed|
articles|
videos)/(?P<id>[0-9a-f]+)(?:$|[?#/])'
_TESTS = [{
'url': 'http://www.funnyordie.com/videos/0732f586d7/heart-shaped-box-literal-video-version',
'md5': 'bcd81e0c4f26189ee09be362ad6e6ba9',