all uploadify settings in tag, widget

Author: smacker

uploadify/templates/uploadify/multi_file_upload.html

@@ -3,7 +3,9 @@
 <link rel="stylesheet" type="text/css" href="{{ uploadify_path }}uploadify.css" />
 <div id="uploadify" class="multi_file_upload">
 <input id="fileInput" name="fileInput" type="file" />
+{% if not uploadify_auto %}
 <input type="button" value="Upload" id="upload" />
+{% endif %}
 </div>
 <script type="text/javascript">// <![CDATA[
     $(document).ready(function() {
@@ -17,12 +19,12 @@
             'script': '{% url uploadify_upload %}{{ uploadify_query }}',
             'scriptData': {{ uploadify_data|safe }},
             'cancelImg': '{{ uploadify_path }}cancel.png',
-            'fileDataName': '{{ uploadify_filename }}',
             'removeCompleted': false,
             'multi': true,
             'onAllComplete': uploadify_allComplete,
             'onCancel': uploadify_cancelUpload,
-            'onComplete': uploadify_complete
+            'onComplete': uploadify_complete,
+            {{ uploadify_options|safe }}
         });
 
         $('#upload').click(function(){
@@ -45,7 +47,7 @@
 
             var file_percentage = file_div.find('.percentage');
             file_percentage.text(' -');
-            $(response.{{ uploadify_filename }}).each(function(){
+            $(response.{{ uploadify_filename|safe }}).each(function(){
                 file_percentage.text(file_percentage.text()+" "+this);
             });
 

uploadify/templatetags/uploadify_tags.py

@@ -7,25 +7,70 @@
 # -----------------------------------------------------------------------------
 #   multi_file_upload
 # -----------------------------------------------------------------------------
-@register.inclusion_tag('uploadify/multi_file_upload.html', takes_context=True)
-def multi_file_upload(context, sender=None, filename='Filename', unique_id=None):
+class MultiFileUpload(template.Node):
+    def __init__(self, sender='uploadify', unique_id=None, options={}, data={}):
+        self.sender = sender
+        self.unique_id = unique_id
+        self.options = {'fileDataName': 'Filedata'}
+        self.options.update(options)
+        self.data = {'fileDataName': self.options['fileDataName'],
+                     'sender': str(self.sender)}
+        self.data.update(data)
+
+    def render(self, context):
+        if self.unique_id is not None:
+            unique_id = "?unique_id=%s" % str(self.unique_id)
+        else:
+            unique_id = ""
+
+        js_options = ",".join(map(lambda k: "'%s': '%s'" % (k, self.options[k]),
+                                  self.options))
+
+        auto = False
+        if self.options.has_key('auto') and self.options['auto']:
+            auto = True
+
+        context.update({
+            'uploadify_query': unique_id,
+            'uploadify_data': simplejson.dumps(self.data),
+            'uploadify_path': settings.UPLOADIFY_PATH,
+            'uploadify_options': js_options,
+            'uploadify_filename': self.options['fileDataName'],
+            'uploadify_auto': auto,
+        })
+
+        t = template.loader.get_template('uploadify/multi_file_upload.html')
+        return t.render(context)
+
+
+@register.tag
+def multi_file_upload(parser, token):
     """
     Displays a Flash-based interface for uploading multiple files.
     For each POST request (after file upload) send GET query with `unique_id`.
+
+    {% multi_file_upload sender='SomeThing' fileDataName='Filename' %}
+
+    For all options see http://www.uploadify.com/documentation/
+
     """
-    data = {'fileDataName': filename}
-
-    if sender is not None:
-        data['sender'] = str(sender)
-
-    if unique_id is not None:
-        unique_id = "?unique_id=%s" % str(unique_id)
-    else:
-        unique_id = ""
-
-    return {
-        'uploadify_query' : unique_id,
-        'uploadify_data' : simplejson.dumps(data),
-        'uploadify_path' : settings.UPLOADIFY_PATH,
-        'uploadify_filename' : filename,
-    }
+    args = token.split_contents()
+    tag_name = args[0]
+    args = args[1:]
+
+    sender = 'uploadify'
+    unique_id = None
+    options = {}
+
+    for arg in args:
+        name, val = arg.split("=")
+        val = val.replace('\'', '').replace('"', '')
+        if name == 'sender':
+            sender = val
+        elif name == 'unique_id':
+            unique_id = val
+        else:
+            options[name] = val
+
+    return MultiFileUpload(sender, unique_id, options)
+

uploadify/widgets.py

@@ -2,44 +2,46 @@
 
 from uploadify import settings
 from django.contrib.admin.widgets import AdminFileWidget
-from django.template import RequestContext
-from django.utils import simplejson
-from django.template import loader
+from uploadify.templatetags.uploadify_tags import MultiFileUpload
 from django.utils.safestring import mark_safe
+from django.template import Context
 
 class UploadifyAdminWidget(AdminFileWidget):
+    """
+    Create uploadify widget. It receive:
+        'sender' - string (default = uploadify)
+        'unique_id'
+        'options' - http://www.uploadify.com/documentation/
+        'data' - POST data
+
+    Example:
+        self.fields['uploadify'].widget = UploadifyAdminWidget(
+                    attrs={'data': post_data, 'options': {'fileDataName': 'image'}})
+    """
+
     js = """
          <script type="text/javascript">
          $('#uploadify').bind('allUploadsComplete', function(data){
              window.location.reload();
          });
          </script>"""
+
     def __init__(self, *args, **kwargs):
+        self.sender = 'uploadify'
+        self.unique_id = None
+        self.options = {}
         self.data = {}
-        self.filename = 'Filename'
+
         if kwargs.has_key('attrs'):
-            if kwargs['attrs'].has_key('data'):
-                self.data = kwargs['attrs']['data']
-                del kwargs['attrs']['data']
-            if kwargs['attrs'].has_key('filename'):
-                self.filename = kwargs['attrs']['filename']
-                del kwargs['attrs']['filename']
+            for attr in kwargs['attrs']:
+                if attr in ('sender', 'unique_id', 'options', 'data'):
+                    setattr(self, attr, kwargs['attrs'][attr])
         super(UploadifyAdminWidget, self).__init__(*args, **kwargs)
 
     def render(self, name, value, attrs=None):
-
-        self.data['fileDataName'] = self.filename
-
-        output = {
-            'uploadify_data' : simplejson.dumps(self.data),
-            'uploadify_path' : settings.UPLOADIFY_PATH,
-            'uploadify_filename' : self.filename,
-        }
-
-        template = 'uploadify/multi_file_upload.html'
-
-        template_data = loader.render_to_string(template, output)
-
+        context = Context({})
+        uploader = MultiFileUpload(self.sender, self.unique_id, self.options, self.data)
+        template_data = uploader.render(context)
         template_data += self.js
 
         return mark_safe(template_data)