Code cleanup

filer/admin/videoadmin.py

@@ -7,47 +7,30 @@
 
 
 class VideoAdminFrom(forms.ModelForm):
-    #subject_location = forms.CharField(
-                    #max_length=64, required=False,
-                    #label=_('Subject location'),
-                    #help_text=_('Location of the main subject of the scene.'))
-
-    def sidebar_image_ratio(self):
-        if self.instance:
-            # this is very important. It forces the value to be returned as a
-            # string and always with a "." as seperator. If the conversion
-            # from float to string is done in the template, the locale will
-            # be used and in some cases there would be a "," instead of ".".
-            # javascript would parse that to an integer.
-            return  "%.6F" % self.instance.sidebar_image_ratio()
-        else:
-            return ''
-
     class Meta:
         model = Video
 
-    class Media:
-        css = {
-            #'all': (settings.MEDIA_URL + 'filer/css/focal_point.css',)
-        }
-        js = (
-            filer_settings.FILER_STATICMEDIA_PREFIX + 'js/raphael.js',
-            filer_settings.FILER_STATICMEDIA_PREFIX + 'js/focal_point.js',
-        )
+    #class Media:
+        #css = {
+            ##'all': (settings.MEDIA_URL + 'filer/css/focal_point.css',)
+        #}
+        #js = (
+            #filer_settings.FILER_STATICMEDIA_PREFIX + 'js/raphael.js',
+            #filer_settings.FILER_STATICMEDIA_PREFIX + 'js/focal_point.js',
+        #)
 
 
 class VideoAdmin(FileAdmin):
     form = VideoAdminFrom
     fieldsets = (
         FileAdmin.fieldsets[0],
         (_('Advanced'), {
-            'fields': ('status', 'file', 'sha1', 'output'),
-            #'fields': ('default_alt_text', 'default_caption',
-                       #'author', 'file', 'sha1',),
+            'fields': ('default_alt_text', 'default_caption',
+                       'author', 'file', 'sha1',),
             'classes': ('collapse',),
         }),
-        #('Subject Location', {
-            #'fields': ('subject_location',),
-            #'classes': ('collapse',),
-        #}),
+        (_('Conversion'), {
+            'fields': ('conversion_status', 'conversion_output',),
+            'classes': ('collapse',),
+        })
     )

filer/fields/multistorage_file.py

@@ -15,7 +15,7 @@
     'public': filer_settings.FILER_PUBLICMEDIA_THUMBNAIL_STORAGE,
     'private': filer_settings.FILER_PRIVATEMEDIA_THUMBNAIL_STORAGE,
 }
-FORMATS_STORAGES = {
+FORMAT_STORAGES = {
     'public': filer_settings.FILER_PUBLICMEDIA_FORMATS_STORAGE,
     'private': filer_settings.FILER_PRIVATEMEDIA_FORMATS_STORAGE,
 }
@@ -32,16 +32,35 @@ def generate_filename_multistorage(instance, filename):
         return upload_to
 
 
+class FormatNameMixin(object):
+    def get_format_name(self, ext):
+        path, source_filename = os.path.split(self.name)
+        filename, extension = os.path.splitext(source_filename)
+        if format_ext.starts_with('.'):
+            newfilename = '%s%s' % (filename, format_ext)
+        else:
+            newfilename = '%s.%s' % (filename, format_ext)
+        return os.path.join(path, newfilename)
+
+    def get_format_url(self, ext):
+        base_name = self.get_format_name(format_ext)
+        if self.format_storage.exists(base_name):
+            return os.path.join(self.format_storage.base_url, base_name)
+        else:
+            raise NameError
+
+
 class MultiStorageFieldFile(ThumbnailerNameMixin,
-                            easy_thumbnails_files.ThumbnailerFieldFile):
+                            easy_thumbnails_files.ThumbnailerFieldFile,
+                            FormatNameMixin):
     def __init__(self, instance, field, name):
         File.__init__(self, None, name)
         self.instance = instance
         self.field = field
         self._committed = True
         self.storages = self.field.storages
         self.thumbnail_storages = self.field.thumbnail_storages
-        self.formats_storages = self.field.formats_storages
+        self.formats_storage = self.field.format_storages
 
     @property
     def storage(self):
@@ -66,7 +85,7 @@ def thumbnail_storage(self):
 
 
     @property
-    def formats_storage(self):
+    def format_storage(self):
         if self.instance.is_public:
             return self.formats_storages['public']
         else:
@@ -81,11 +100,11 @@ class MultiStorageFileField(easy_thumbnails_fields.ThumbnailerField):
     attr_class = MultiStorageFieldFile
 
     def __init__(self, verbose_name=None, name=None, upload_to_dict=None,
-                 storages=None, thumbnail_storages=None, formats_storages=None,
+                 storages=None, thumbnail_storages=None, format_storages=None,
                  **kwargs):
         self.storages = storages or STORAGES
         self.thumbnail_storages = thumbnail_storages or THUMBNAIL_STORAGES
-        self.formats_storages = formats_storages or FORMATS_STORAGES
+        self.format_storages = format_storages or FORMAT_STORAGES
         super(easy_thumbnails_fields.ThumbnailerField, self).__init__(
                                       verbose_name=verbose_name, name=name,
                                       upload_to=generate_filename_multistorage,

filer/management/commands/convert_video.py

@@ -1,5 +1,5 @@
 from django.core.management.base import BaseCommand, CommandError
-from filer.models.videomodels import Video
+from filer.models import Video
 
 class Command(BaseCommand):
     args = ''

filer/models/__init__.py

@@ -3,4 +3,5 @@
 from filer.models.filemodels import *
 from filer.models.foldermodels import *
 from filer.models.imagemodels import *
+from filer.models.videomodels import *
 from filer.models.virtualitems import *