Ticket #2561: attachment-search-2.patch

trac/attachment.py

@@ -32 +32 @@
 from trac.mimeview import *
 from trac.perm import PermissionError, PermissionSystem, IPermissionPolicy
 from trac.resource import *
+from trac.search import search_to_sql, shorten_result
 from trac.util import get_reporter_id, create_unique_file, content_disposition
 from trac.util.datefmt import to_timestamp, utc
 from trac.util.text import unicode_quote, unicode_unquote, pretty_size
@@ -476 +477 @@
             return format_to_oneliner(self.env, context(attachment.parent),
                                       descr)
    
+    def get_search_results(self, req, resource_realm, terms):
+        """Return a search result generator suitable for ISearchSource.
+        
+        Search results are attachments on resources of the given 
+        `resource_realm.realm` whose filename, description or author match 
+        the given terms.
+        """
+        db = self.env.get_db_cnx()
+        sql_query, args = search_to_sql(db, ['filename', 'description', 
+                                        'author'], terms)
+        cursor = db.cursor()
+        cursor.execute("SELECT id,time,filename,description,author "
+                       "FROM attachment "
+                       "WHERE type = %s "
+                       "AND " + sql_query, (resource_realm.realm, ) + args)
+        
+        for id, time, filename, desc, author in cursor:
+            attachment = resource_realm(id=id).child('attachment', filename)
+            if 'ATTACHMENT_VIEW' in req.perm(attachment):
+                yield (get_resource_url(self.env, attachment, req.href),
+                       "%s: %s" % (get_resource_shortname(self.env, 
+                                                          attachment.parent),
+                                   filename),
+                       datetime.fromtimestamp(time, utc), author,
+                       shorten_result(desc, terms))
+    
     # IResourceManager methods
     
     def get_resource_realms(self):

trac/ticket/web_ui.py

@@ -197 +197 @@
                                                        resolution, type)),
                        datetime.fromtimestamp(ts, utc), author,
                        shorten_result(desc, terms))
+        
+        # Attachments
+        for result in AttachmentModule(self.env).get_search_results(
+            req, ticket_realm, terms):
+            yield result        
 
     # ITimelineEventProvider methods
 

trac/wiki/web_ui.py

@@ -617 +617 @@
                        '%s: %s' % (name, shorten_line(text)),
                        datetime.fromtimestamp(ts, utc), author,
                        shorten_result(text, terms))
+        
+        # Attachments
+        for result in AttachmentModule(self.env).get_search_results(
+            req, wiki_realm, terms):
+            yield result