From: pishposhmcgee <pishposh.mcgee@gmail.com>
Date: Wed, 24 Jul 2013 21:55:28 +0000 (-0500)
Subject: Added an option 'e' to go with 'video' or 'embed'
X-Git-Url: http://git.oshgnacknak.de/?a=commitdiff_plain;h=e93aa81aa60fc9b44e10feba565586e82e56ba18;p=youtube-dl

Added an option 'e' to go with 'video' or 'embed'

Based on links that I've seen, /e/<videoid> also occurs in the wild, and making this substitution yields effective results.
---

diff --git a/youtube_dl/extractor/collegehumor.py b/youtube_dl/extractor/collegehumor.py
index 4a0b0af5a..5badde03a 100644
--- a/youtube_dl/extractor/collegehumor.py
+++ b/youtube_dl/extractor/collegehumor.py
@@ -10,7 +10,7 @@ from ..utils import (
 
 
 class CollegeHumorIE(InfoExtractor):
-    _VALID_URL = r'^(?:https?://)?(?:www\.)?collegehumor\.com/(video|embed)/(?P<videoid>[0-9]+)/(?P<shorttitle>.*)$'
+    _VALID_URL = r'^(?:https?://)?(?:www\.)?collegehumor\.com/(video|embed|e)/(?P<videoid>[0-9]+)/(?P<shorttitle>.*)$'
 
     _TEST = {
         u'url': u'http://www.collegehumor.com/video/6902724/comic-con-cosplay-catastrophe',