Fix Youtube links

2 files changed, 3 insertions, 194 deletions

diff --git a/chimere/migrations/0014_auto__add_field_area_default.py b/chimere/migrations/0014_auto__add_field_area_default.py
deleted file mode 100644
index 4c4b705..0000000
--- a/chimere/migrations/0014_auto__add_field_area_default.py
+++ /dev/null
@@ -1,191 +0,0 @@
-# encoding: utf-8
-import datetime
-from south.db import db
-from south.v2 import SchemaMigration
-from django.db import models
-
-class Migration(SchemaMigration):
-
-    def forwards(self, orm):
-        
-        # Adding field 'Area.default'
-        db.add_column('chimere_area', 'default', self.gf('django.db.models.fields.NullBooleanField')(null=True, blank=True), keep_default=False)
-
-
-    def backwards(self, orm):
-        
-        # Deleting field 'Area.default'
-        db.delete_column('chimere_area', 'default')
-
-
-    models = {
-        'chimere.area': {
-            'Meta': {'ordering': "('order', 'name')", 'object_name': 'Area'},
-            'available': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'default': ('django.db.models.fields.NullBooleanField', [], {'null': 'True', 'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'lower_right_corner': ('django.contrib.gis.db.models.fields.PointField', [], {'default': "'POINT(0 0)'"}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '150'}),
-            'order': ('django.db.models.fields.IntegerField', [], {}),
-            'upper_left_corner': ('django.contrib.gis.db.models.fields.PointField', [], {'default': "'POINT(0 0)'"}),
-            'urn': ('django.db.models.fields.SlugField', [], {'db_index': 'True', 'unique': 'True', 'max_length': '50', 'blank': 'True'})
-        },
-        'chimere.category': {
-            'Meta': {'ordering': "['order']", 'object_name': 'Category'},
-            'available': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'description': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '150'}),
-            'order': ('django.db.models.fields.IntegerField', [], {})
-        },
-        'chimere.color': {
-            'Meta': {'ordering': "['order']", 'object_name': 'Color'},
-            'code': ('django.db.models.fields.CharField', [], {'max_length': '6'}),
-            'color_theme': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['chimere.ColorTheme']"}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'order': ('django.db.models.fields.IntegerField', [], {})
-        },
-        'chimere.colortheme': {
-            'Meta': {'object_name': 'ColorTheme'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '150'})
-        },
-        'chimere.icon': {
-            'Meta': {'object_name': 'Icon'},
-            'height': ('django.db.models.fields.IntegerField', [], {}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'image': ('django.db.models.fields.files.ImageField', [], {'max_length': '100'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '150'}),
-            'width': ('django.db.models.fields.IntegerField', [], {})
-        },
-        'chimere.importer': {
-            'Meta': {'object_name': 'Importer'},
-            'categories': ('chimere.widgets.SelectMultipleField', [], {'to': "orm['chimere.SubCategory']", 'symmetrical': 'False'}),
-            'filtr': ('django.db.models.fields.CharField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'importer_type': ('django.db.models.fields.CharField', [], {'max_length': '4'}),
-            'source': ('django.db.models.fields.CharField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
-            'state': ('django.db.models.fields.CharField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'})
-        },
-        'chimere.marker': {
-            'Meta': {'ordering': "('status', 'name')", 'object_name': 'Marker'},
-            'available_date': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
-            'categories': ('chimere.widgets.SelectMultipleField', [], {'to': "orm['chimere.SubCategory']", 'symmetrical': 'False'}),
-            'description': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
-            'end_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'import_key': ('django.db.models.fields.CharField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
-            'import_source': ('django.db.models.fields.CharField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
-            'import_version': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}),
-            'multimedia_files': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'marker'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['chimere.MultimediaFile']"}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '150'}),
-            'pictures': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'marker'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['chimere.PictureFile']"}),
-            'point': ('chimere.widgets.PointField', [], {}),
-            'ref_item': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'submited_marker'", 'null': 'True', 'to': "orm['chimere.Marker']"}),
-            'route': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'associated_marker'", 'null': 'True', 'to': "orm['chimere.Route']"}),
-            'start_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}),
-            'status': ('django.db.models.fields.CharField', [], {'max_length': '1'}),
-            'submiter_comment': ('django.db.models.fields.CharField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
-            'submiter_email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'null': 'True', 'blank': 'True'}),
-            'submiter_session_key': ('django.db.models.fields.CharField', [], {'max_length': '40', 'null': 'True', 'blank': 'True'})
-        },
-        'chimere.multimediafile': {
-            'Meta': {'object_name': 'MultimediaFile'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'miniature': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'multimedia_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['chimere.MultimediaType']"}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '150'}),
-            'order': ('django.db.models.fields.IntegerField', [], {'default': '1'}),
-            'url': ('django.db.models.fields.URLField', [], {'max_length': '200'})
-        },
-        'chimere.multimediatype': {
-            'Meta': {'object_name': 'MultimediaType'},
-            'available': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'iframe': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'media_type': ('django.db.models.fields.CharField', [], {'max_length': '1'}),
-            'mime_type': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '150'})
-        },
-        'chimere.news': {
-            'Meta': {'object_name': 'News'},
-            'available': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'content': ('django.db.models.fields.TextField', [], {}),
-            'date': ('django.db.models.fields.DateField', [], {'auto_now_add': 'True', 'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'title': ('django.db.models.fields.CharField', [], {'max_length': '150'})
-        },
-        'chimere.picturefile': {
-            'Meta': {'object_name': 'PictureFile'},
-            'height': ('django.db.models.fields.IntegerField', [], {}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'miniature': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '150'}),
-            'order': ('django.db.models.fields.IntegerField', [], {'default': '1'}),
-            'picture': ('django.db.models.fields.files.ImageField', [], {'max_length': '100'}),
-            'width': ('django.db.models.fields.IntegerField', [], {})
-        },
-        'chimere.property': {
-            'Meta': {'object_name': 'Property'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'marker': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['chimere.Marker']"}),
-            'propertymodel': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['chimere.PropertyModel']"}),
-            'value': ('django.db.models.fields.TextField', [], {})
-        },
-        'chimere.propertymodel': {
-            'Meta': {'ordering': "('order',)", 'object_name': 'PropertyModel'},
-            'available': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '150'}),
-            'order': ('django.db.models.fields.IntegerField', [], {}),
-            'type': ('django.db.models.fields.CharField', [], {'max_length': '1'})
-        },
-        'chimere.route': {
-            'Meta': {'ordering': "('status', 'name')", 'object_name': 'Route'},
-            'associated_file': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['chimere.RouteFile']", 'null': 'True', 'blank': 'True'}),
-            'categories': ('chimere.widgets.SelectMultipleField', [], {'to': "orm['chimere.SubCategory']", 'symmetrical': 'False'}),
-            'end_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}),
-            'height': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'import_key': ('django.db.models.fields.CharField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
-            'import_source': ('django.db.models.fields.CharField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
-            'import_version': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '150'}),
-            'picture': ('django.db.models.fields.files.ImageField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}),
-            'ref_item': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'submited_route'", 'null': 'True', 'to': "orm['chimere.Route']"}),
-            'route': ('chimere.widgets.RouteField', [], {}),
-            'start_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}),
-            'status': ('django.db.models.fields.CharField', [], {'max_length': '1'}),
-            'submiter_comment': ('django.db.models.fields.CharField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
-            'submiter_email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'null': 'True', 'blank': 'True'}),
-            'submiter_session_key': ('django.db.models.fields.CharField', [], {'max_length': '40', 'null': 'True', 'blank': 'True'}),
-            'width': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'})
-        },
-        'chimere.routefile': {
-            'Meta': {'ordering': "('name',)", 'object_name': 'RouteFile'},
-            'file_type': ('django.db.models.fields.CharField', [], {'max_length': '1'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '150'}),
-            'raw_file': ('django.db.models.fields.files.FileField', [], {'max_length': '100'}),
-            'simplified_file': ('django.db.models.fields.files.FileField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'})
-        },
-        'chimere.subcategory': {
-            'Meta': {'ordering': "['category', 'order']", 'object_name': 'SubCategory'},
-            'areas': ('chimere.widgets.SelectMultipleField', [], {'symmetrical': 'False', 'related_name': "'areas'", 'blank': 'True', 'to': "orm['chimere.Area']"}),
-            'available': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'category': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['chimere.Category']"}),
-            'color_theme': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['chimere.ColorTheme']", 'null': 'True', 'blank': 'True'}),
-            'icon': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['chimere.Icon']"}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'item_type': ('django.db.models.fields.CharField', [], {'max_length': '1'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '150'}),
-            'order': ('django.db.models.fields.IntegerField', [], {})
-        },
-        'chimere.tinyurl': {
-            'Meta': {'object_name': 'TinyUrl'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'parameters': ('django.db.models.fields.CharField', [], {'max_length': '500'})
-        }
-    }
-
-    complete_apps = ['chimere']
diff --git a/chimere/models.py b/chimere/models.py
index d4f5ef2..18ea394 100644
--- a/chimere/models.py
+++ b/chimere/models.py
@@ -449,9 +449,9 @@ class MultimediaType(models.Model):
         return tuples
 
 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]*)')),
+    '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"),
     'dailymotion':(
         (re.compile(r'dailymotion.com/video/([A-Za-z0-9]*)_[A-Za-z0-9_-]*'),