python-lang-org
diff --git a/‎feincms/module/medialibrary/models.py‎
Lines changed: 1 addition & 1 deletion b/‎feincms/module/medialibrary/models.py‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎feincms/module/medialibrary/zip.py‎
Lines changed: 9 additions & 1 deletion b/‎feincms/module/medialibrary/zip.py‎
Lines changed: 9 additions & 1 deletion
diff --git a/‎feincms/templates/admin/medialibrary/mediafile/change_list.html‎
Lines changed: 4 additions & 0 deletions b/‎feincms/templates/admin/medialibrary/mediafile/change_list.html‎
Lines changed: 4 additions & 0 deletions
@@ -435,7 +435,7 @@ def bulk_upload(request):
 
         if request.method == 'POST' and 'data' in request.FILES:
             try:
-                count = import_zipfile(request.POST.get('category'), request.FILES['data'])
+                count = import_zipfile(request.POST.get('category'), request.POST.get('overwrite', False), request.FILES['data'])
                 messages.info(request, _("%d files imported") % count)
             except Exception, e:
                 messages.error(request, _("ZIP import failed: %s") % str(e))
 
@@ -26,7 +26,15 @@
 export_magic = 'feincms-export-01'
 
 # ------------------------------------------------------------------------
-def import_zipfile(category_id, data):
+def import_zipfile(category_id, overwrite, data):
+    """
+    Import a collection of media files from a zip file.
+
+    category_id: if set, the pk of a Category that all uploaded
+        files will have added (eg. cathegory "newly uploaded files")
+    overwrite: attempt to overwrite existing files. This might
+        not work with non-trivial storage handlers
+    """
     category = None
     if category_id:
         category = Category.objects.get(pk=int(category_id))
 
@@ -12,12 +12,16 @@
         <label for="data">{% trans "Bulk upload a ZIP file:" %}
             <input type="file" name="data">
         </label>
+        | {% trans "Category" %}
         <select name="category">
             <option value="">---</option>
             {% for cat in categories %}
                 <option value="{{ cat.id }}">{{ cat.path }}</option>
             {% endfor %}
         </select>
+        | {% trans "Overwrite" %}
+        <input type="checkbox" name="overwrite">
+        |
         <input type="submit" value="{% trans "Send" %}">
     </p>
     </form>