Merge lp:~mhall119/summit/support-short-broadcast-url into lp:summit

[Michael Hall]

Add broadcast_url form field parsing for youtube's short url

Add broadcast_url form field parsing for youtube's short url

[Adnane Belmadiaf (daker)]

+1 from me

review: Approve

=== modified file 'summit/schedule/forms.py'
--- summit/schedule/forms.py	2013-03-01 21:01:51 +0000
+++ summit/schedule/forms.py	2013-03-04 21:50:25 +0000
@@ -190,16 +190,20 @@
 import re
 YOUTUBE_EMBED_HTML = re.compile(r'\<iframe width="\d+" height="\d+" src="https?:\/\/www.youtube.com\/embed\/(?P<youtube_id>.*)" frameborder="0" allowfullscreen\>\<\/iframe\>')
 YOUTUBE_PAGE_URL = re.compile(r'https?:\/\/www.youtube.com\/watch\?v=(?P<youtube_id>[^&]*).*')
+YOUTUBE_SHORT_URL = re.compile(r'https?:\/\/youtu.be\/(?P<youtube_id>[^\?]*).*')
 
 class YouTubeEmbedURL(forms.URLField):
     
     def clean(self, value):
         match_html = YOUTUBE_EMBED_HTML.match(value)
         match_page = YOUTUBE_PAGE_URL.match(value)
+        match_short = YOUTUBE_SHORT_URL.match(value)
         if match_html:
             value = 'http://www.youtube.com/embed/' + match_html.group('youtube_id')
         elif match_page:
             value = 'http://www.youtube.com/embed/' + match_page.group('youtube_id')
+        elif match_short:
+            value = 'http://www.youtube.com/embed/' + match_short.group('youtube_id')
         else:
             pass
         return value