Commit: 6df449b5a97903d2fe31711f67b9afb49f369081 - allura (git)

allura

Commit MetaInfo

• Révision: 6df449b5a97903d2fe31711f67b9afb49f369081 (tree)
• l'heure: 2012-05-15 00:09:12
• Auteur: bolkimen <bolkimen@yaho...>
• Commiter: Yaroslav Luzin

Message de Log

ticket:45 add file stats

Change Summary

• modified: Allura/allura/controllers/discuss.py
• modified: Allura/allura/model/discuss.py
• modified: Allura/allura/model/notification.py

Modification

--- a/Allura/allura/controllers/discuss.py
+++ b/Allura/allura/controllers/discuss.py
@@ -183,7 +183,7 @@ class ThreadController(BaseController):
         if not kw['text']:
             flash('Your post was not saved. You must provide content.', 'error')
             redirect(request.referer)
-        file_info = kw.pop('file_info', None)
+        file_info = kw.get('file_info', None)
         p = self.thread.add_post(**kw)
         if hasattr(file_info, 'file'):
             p.attach(

--- a/Allura/allura/model/discuss.py
+++ b/Allura/allura/model/discuss.py
@@ -194,7 +194,8 @@ class Thread(Artifact):
         post = self.post_class()(**kwargs)
         if ignore_security or has_access(self, 'unmoderated_post')():
             log.info('Auto-approving message from %s', c.user.username)
-            post.approve()
+            file_info = kw.get('file_info', None)
+            post.approve(file_info)
         else:
             self.notify_moderators(post)
         return post
@@ -461,7 +462,7 @@ class Post(Message, VersionedArtifact):
         super(Post, self).delete()
         self.thread.num_replies = max(0, self.thread.num_replies - 1)
 
-    def approve(self):
+    def approve(self, file_info=None):
         from allura.model.notification import Notification
         if self.status == 'ok': return
         self.status = 'ok'
@@ -478,7 +479,7 @@ class Post(Message, VersionedArtifact):
                 self.acl, author.project_role()._id, 'unmoderated_post')
         g.post_event('discussion.new_post', self.thread_id, self._id)
         artifact = self.thread.artifact or self.thread
-        n = Notification.post(artifact, 'message', post=self)
+        n = Notification.post(artifact, 'message', post=self, file_info=file_info)
         if hasattr(self.discussion,"monitoring_email") and self.discussion.monitoring_email:
             n.send_simple(self.discussion.monitoring_email)
         session(self).flush()

--- a/Allura/allura/model/notification.py
+++ b/Allura/allura/model/notification.py
@@ -115,6 +115,17 @@ class Notification(MappedClass):
             c.project.shortname, c.app.config.options.mount_point)
         if topic == 'message':
             post = kwargs.pop('post')
+            text = post.text
+            file_info = kwargs.pop('file_info', None)
+            if file_info is not None:
+                MAX_READ = 1024 * 32
+                bytecount= 0
+                while 1:
+                    data = file_info.file.read(MAX_READ)
+                    if not data: break
+                    bytecount += len(data)
+                text = "%s\n%s (%s bytes in %s)" % (text, file_info.filename, bytecount, file_info.type)
+
             subject = post.subject or ''
             if post.parent_id and not subject.lower().startswith('re:'):
                 subject = 'Re: ' + subject
@@ -125,7 +136,7 @@ class Notification(MappedClass):
                 reply_to_address='"%s" <%s>' % (
                     subject_prefix, getattr(artifact, 'email_address', '[e-mail]')),
                 subject=subject_prefix + subject,
-                text=post.text,
+                text=text,
                 in_reply_to=post.parent_id,
                 author_id=author._id,
                 pubdate=datetime.utcnow())