Customizable storage backend for attachments. Proper error handling for illegal…

Customizable storage backend for attachments. Proper error handling for illegal file types on replace view.

wiki/plugins/attachments/models.py

@@ -73,7 +73,8 @@ class AttachmentRevision(BaseRevisionMixin, models.Model):
     attachment = models.ForeignKey('Attachment')
 
     file = models.FileField(upload_to=upload_path, #@ReservedAssignment
-                            verbose_name=_(u'file'))
+                            verbose_name=_(u'file'),
+                            storage=settings.STORAGE_BACKEND)
         
     description = models.TextField(blank=True)
     

wiki/plugins/attachments/settings.py

@@ -29,3 +29,5 @@ UPLOAD_PATH_OBSCURIFY = getattr(django_settings, 'WIKI_UPLOAD_PATH_OBSCURIFY', T
 # to allow. For your own safety.
 FILE_EXTENSIONS = getattr(django_settings, 'WIKI_FILE_EXTENSIONS', ['pdf', 'doc', 'odt', 'docx', 'txt'])
 
+from django.core.files.storage import default_storage
+STORAGE_BACKEND = getattr(django_settings, 'WIKI_STORAGE_BACKEND', default_storage)
\ No newline at end of file

wiki/plugins/attachments/views.py

@@ -34,7 +34,7 @@ class AttachmentView(ArticleMixin, FormView):
         return super(AttachmentView, self).dispatch(request, article, *args, **kwargs)
     
     # WARNING! The below decorator silences other exceptions that may occur!
-    #@transaction.commit_manually
+    @transaction.commit_manually
     def form_valid(self, form):
         if self.request.user.is_anonymous() and not settings.ANONYMOUS:
             return redirect(django_settings.LOGIN_URL)
@@ -53,11 +53,11 @@ class AttachmentView(ArticleMixin, FormView):
         except models.IllegalFileExtension, e:
             transaction.rollback()
             messages.error(self.request, _(u'Your file could not be saved: %s') % e)
-        #except Exception:
-        #    transaction.rollback()
-        #    messages.error(self.request, _(u'Your file could not be saved, probably because of a permission error on the web server.'))
+        except Exception:
+            transaction.rollback()
+            messages.error(self.request, _(u'Your file could not be saved, probably because of a permission error on the web server.'))
         
-        #transaction.commit()
+        transaction.commit()
         return redirect("wiki:attachments_index", path=self.urlpath.path, article_id=self.article.id)
     
     def get_context_data(self, **kwargs):
@@ -99,17 +99,32 @@ class AttachmentReplaceView(ArticleMixin, FormView):
             return redirect(wiki_settings.LOGIN_URL)
         return super(AttachmentReplaceView, self).dispatch(request, article, *args, **kwargs)
     
+    @transaction.commit_manually
     def form_valid(self, form):
         
-        attachment_revision = form.save(commit=False)
-        attachment_revision.attachment = self.attachment
-        attachment_revision.set_from_request(self.request)
-        attachment_revision.previous_revision = self.attachment.current_revision
-        attachment_revision.save()
-        self.attachment.current_revision = attachment_revision
-        self.attachment.save()
+        try:
+            attachment_revision = form.save(commit=False)
+            attachment_revision.attachment = self.attachment
+            attachment_revision.set_from_request(self.request)
+            attachment_revision.previous_revision = self.attachment.current_revision
+            attachment_revision.save()
+            self.attachment.current_revision = attachment_revision
+            self.attachment.save()
+            messages.success(self.request, _(u'%s uploaded and replaces old attachment.') % attachment_revision.get_filename())
+        except models.IllegalFileExtension, e:
+            transaction.rollback()
+            messages.error(self.request, _(u'Your file could not be saved: %s') % e)
+            transaction.commit()
+            return redirect("wiki:attachments_replace", attachment_id=self.attachment.id,
+                            path=self.urlpath.path, article_id=self.article.id)
+        except Exception:
+            transaction.rollback()
+            messages.error(self.request, _(u'Your file could not be saved, probably because of a permission error on the web server.'))
+            transaction.commit()
+            return redirect("wiki:attachments_replace", attachment_id=self.attachment.id,
+                            path=self.urlpath.path, article_id=self.article.id)
         
-        messages.success(self.request, _(u'%s uploaded and replaces old attachment.') % attachment_revision.get_filename())
+        transaction.commit()
         return redirect("wiki:attachments_index", path=self.urlpath.path, article_id=self.article.id)
     
     def get_form(self, form_class):

wiki/plugins/images/models.py

@@ -14,9 +14,9 @@ def upload_path(instance, filename):
     from os import path
     # Has to match original extension filename
         
-    upload_path = settings.UPLOAD_PATH
+    upload_path = settings.IMAGE_PATH
     upload_path = upload_path.replace('%aid', str(instance.plugin.image.article.id))
-    if settings.UPLOAD_PATH_OBSCURIFY:
+    if settings.IMAGE_PATH_OBSCURIFY:
         import random, hashlib
         m=hashlib.md5(str(random.randint(0,100000000000000)))
         upload_path = path.join(upload_path, m.hexdigest())

wiki/plugins/images/settings.py

 from django.conf import settings as django_settings
 
 # Where to store images
-UPLOAD_PATH = getattr(django_settings, 'WIKI_IMAGE_PATH', "wiki/images/%aid/")
+IMAGE_PATH = getattr(django_settings, 'WIKI_IMAGE_PATH', "wiki/images/%aid/")
 
 # Should the upload path be obscurified? If so, a random hash will be added to the path
 # such that someone can not guess the location of files (if you have
 # restricted permissions and the files are still located within the web server's
-UPLOAD_PATH_OBSCURIFY = getattr(django_settings, 'WIKI_UPLOAD_PATH_OBSCURIFY', True)
+IMAGE_PATH_OBSCURIFY = getattr(django_settings, 'WIKI_IMAGE_PATH_OBSCURIFY', True)
 
 # Allow anonymous users to upload (not nice on an open network)
 ANONYMOUS = getattr(django_settings, 'WIKI_ATTACHMENTS_ANONYMOUS', False)