Manage auto-detection of multimedia type by extension - improvement on alternate multimedia widget

Conflicts:
	chimere/admin.py
	chimere/forms.py
	chimere/models.py
	chimere/templates/chimere/blocks/alternate_multimedia.html
	chimere/templatetags/chimere_tags.py

1 files changed, 14 insertions, 1 deletions

diff --git a/chimere/models.py b/chimere/models.py
index 03b5dce..6b7ffb9 100644
--- a/chimere/models.py
+++ b/chimere/models.py
@@ -607,7 +607,7 @@ IFRAME_LINKS = {
     'youtube':((re.compile(r'youtube.com\/watch\?v=([A-Za-z0-9_-]*)'),
                 re.compile(r'youtu.be\/([A-Za-z0-9_-]*)'),
                 re.compile(r'youtube.com\/embed\/([A-Za-z0-9_-]*)')),
-                "http://www.youtube.com/embed/%s"),
+                 "http://www.youtube.com/embed/%s"),
     'dailymotion':(
         (re.compile(r'dailymotion.com/video/([A-Za-z0-9]*)_[A-Za-z0-9_-]*'),
          re.compile(r'dailymotion.com/embed/video/([A-Za-z0-9]*)'),
@@ -618,6 +618,19 @@ IFRAME_LINKS = {
               "http://player.vimeo.com/video/%s")
 }
 
+class MultimediaExtension(models.Model):
+    name = models.CharField(_(u"Extension name"), max_length=6)
+    multimedia_type = models.ForeignKey(MultimediaType,
+                        verbose_name=_(u"Associated multimedia type"),
+                        related_name='extensions')
+
+    class Meta:
+        verbose_name = _(u"Multimedia extension")
+        verbose_name_plural = _(u"Multimedia extensions")
+
+    def __unicode__(self):
+        return self.name
+
 class MultimediaFile(models.Model):
     name = models.CharField(_(u"Name"), max_length=150)
     url = models.URLField(_(u"Url"), max_length=200)