From 44870c14f415da2c20b7e4fd407459b724589a63 Mon Sep 17 00:00:00 2001
From: Guillaume Pellerin <yomguy@parisson.com>
Date: Thu, 22 Oct 2015 17:36:54 +0200
Subject: [PATCH] fix import command, add mp4 to video mime types

---
 telemeta/locale                                           | 2 +-
 .../commands/telemeta-import-collections-from-crem.py     | 8 ++++----
 telemeta/models/core.py                                   | 1 +
 telemeta/pages                                            | 2 +-
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/telemeta/locale b/telemeta/locale
index c5786d32..4534a3d4 160000
--- a/telemeta/locale
+++ b/telemeta/locale
@@ -1 +1 @@
-Subproject commit c5786d32a14a841469db2588092390073b8d0688
+Subproject commit 4534a3d47e7909554637e87a637b1959db277941
diff --git a/telemeta/management/commands/telemeta-import-collections-from-crem.py b/telemeta/management/commands/telemeta-import-collections-from-crem.py
index 510e3bb3..cfec15b5 100644
--- a/telemeta/management/commands/telemeta-import-collections-from-crem.py
+++ b/telemeta/management/commands/telemeta-import-collections-from-crem.py
@@ -23,7 +23,7 @@ from optparse import make_option
 from django.conf import settings
 from django.core.management.base import BaseCommand, CommandError
 from django.contrib.auth.models import User
-from django.core.management import setup_environ
+#from django.core.management import setup_environ
 from django.core.files.base import ContentFile
 from django.contrib.auth.models import User
 from django.contrib.sites.models import Site
@@ -82,6 +82,7 @@ class Command(BaseCommand):
 
     def write_file(self, item, media):
         filename = media.split(os.sep)[-1]
+        print 'importing ' + filename
         if os.path.exists(media):
             if not item.file or self.force:
                 if not self.media_root in self.source_dir:
@@ -90,14 +91,13 @@ class Command(BaseCommand):
                     if not self.dry_run:
                         file_content = ContentFile(f.read())
                         item.file.save(filename, file_content)
-                        item.save()
                     f.close()
                 else:
                     print "file in MEDIA_ROOT, linking..."
-                    path = media[len(self.media_root)+1:]
+                    path = media[len(self.media_root):]
                     if not self.dry_run:
                         item.file = path
-                        item.save()
+                item.save()
                 if self.user:
                     item.set_revision(self.user)
             else:
diff --git a/telemeta/models/core.py b/telemeta/models/core.py
index 8605fde9..8530310c 100644
--- a/telemeta/models/core.py
+++ b/telemeta/models/core.py
@@ -65,6 +65,7 @@ PUBLIC_ACCESS_CHOICES = (('none', _('none')), ('metadata', _('metadata')),
 
 public_extra_types = {
     '.webm': 'video/webm',
+    '.mp4': 'video/mp4',
 }
 
 private_extra_types = {
diff --git a/telemeta/pages b/telemeta/pages
index f8324093..ff2bfd95 160000
--- a/telemeta/pages
+++ b/telemeta/pages
@@ -1 +1 @@
-Subproject commit f8324093174d077b674ac2c52eb0db6eaf815ab5
+Subproject commit ff2bfd95504603e16b17134aa774b392bf693ec0
-- 
2.39.5