Some more refactor

Author: hirunatan

README.rst

@@ -19,7 +19,7 @@ and a list of valid mime types that will be allowed. The list of all mime types
 here: http://www.iana.org/assignments/media-types/index.html::
 
     from django.db import models
-    from validatedfile.models import ValidatedFileField
+    from validatedfile import ValidatedFileField
 
     class TestModel(models.Model):
         the_file = ValidatedFileField(
@@ -42,7 +42,7 @@ This example also checks the total size of all files uploaded by one user::
 
     from django.contrib.auth.models import User
     from django.db import models
-    from validatedfile.models import ValidatedFileField
+    from validatedfile import ValidatedFileField
 
     class TestModel(models.Model):
         user = models.ForeignKey(
@@ -60,7 +60,7 @@ This example also checks the total size of all files uploaded by one user::
     (in forms.py)
 
     from django import forms
-    from validatedfile.models import QuotaValidator
+    from validatedfile import QuotaValidator
     from models.py import TestModel
 
     class TestModelForm(models.ModelForm):

validatedfile/__init__.py

@@ -1 +1,72 @@
 __version__ = (0, 0, 1, "final", 0)
+
+from django.db import models
+from django import forms
+from django.template.defaultfilters import filesizeformat
+from django.utils.translation import ugettext as _
+
+import magic
+
+class ValidatedFileField(models.FileField):
+    def __init__(self, *args, **kwargs):
+        self.content_types = kwargs.pop("content_types", [])
+        self.max_upload_size = kwargs.pop("max_upload_size", 0)
+        super(ValidatedFileField, self).__init__(*args, **kwargs)
+
+    def clean(self, *args, **kwargs):        
+        data = super(ValidatedFileField, self).clean(*args, **kwargs)
+        file = data.file
+
+        if self.content_types:
+            content_type_headers = getattr(file, 'content_type', '')
+
+            mg = magic.Magic(mime = True)
+            content_type_magic = mg.from_buffer(file.read(1024))
+            file.seek(0)
+
+            if not content_type_headers in self.content_types or not content_type_magic in self.content_types:
+                raise forms.ValidationError(_('Filetype %s not supported.') % (content_type_magic))
+
+        if self.max_upload_size:
+            if file._size > self.max_upload_size:
+                raise forms.ValidationError(_('Please keep filesize under %s. Current filesize %s') %
+                                            (filesizeformat(self.max_upload_size), filesizeformat(file._size)))
+
+        return data
+
+
+class FileQuota(object):
+
+    def __init__(self, max_usage = -1):
+        self.current_usage = 0
+        self.max_usage = max_usage
+
+    def update(self, items, attr_name):
+        self.current_usage = 0
+        for item in items:
+            the_file = getattr(item, attr_name, None)
+            if the_file:
+                self.current_usage += the_file.size
+
+    def exceeds(self, size = 0):
+        if self.max_usage >= 0:
+            return (self.current_usage + size > self.max_usage)
+        else:
+            return False
+
+
+class QuotaValidator(object):
+
+    def __init__(self, max_usage):
+        self.quota = FileQuota(max_usage)
+
+    def update_quota(self, items, attr_name):
+        self.quota.update(items, attr_name)
+
+    def __call__(self, file):
+        file_size = file.size
+        if self.quota.exceeds(file_size):
+            raise forms.ValidationError(_('Please keep the total uploaded files under %s. With this file, the total would be %s' %
+                                   (filesizeformat(self.quota.max_usage),
+                                    filesizeformat(self.quota.current_usage + file_size))))
+ 

validatedfile/models.py

@@ -5,7 +5,7 @@
 
 import os.path
 
-from validatedfile.models import FileQuota
+from validatedfile import FileQuota
 
 from models import TestModel, TestModelNoValidate, TestContainer, TestElement
 from forms import TestModelForm, TestModelNoValidateForm, TestElementForm

validatedfile/tests/__init__.py

@@ -1,6 +1,6 @@
 from django import forms
 from models import TestModel, TestModelNoValidate, TestContainer, TestElement
-from validatedfile.models import QuotaValidator
+from validatedfile import QuotaValidator
 
 class TestModelForm(forms.ModelForm):
 

validatedfile/tests/forms.py

@@ -1,5 +1,5 @@
 from django.db import models
-from validatedfile.models import ValidatedFileField
+from validatedfile import ValidatedFileField
 
 class TestModel(models.Model):
     the_file = ValidatedFileField(