Ticket #2583: patch_view_repository.diff

DiaView.py

@@ -9 +9 @@
-from trac.wiki.macros import ImageMacro
-from trac.util.html import escape, html, Markup
-
+
-class DiaViewMacro(WikiMacroBase):
+    def insert_attachment(self, att_path):
+        """att_path MUST exist in the filesystem"""
+        att_fn = att_path[att_path.rfind("/")+1:] #get filename without path
+        from trac.attachment import Attachment
+        try:
+            attachment = Attachment(self.env, self.module, self.id, att_fn)
+        except Exception:
+            db = self.env.get_db_cnx()
+            handle_ta = True
+            size = 0
+            time = 0
+            cursor = db.cursor()
+            cursor.execute("INSERT INTO attachment "
+                         "VALUES (%s, %s, %s, %s, %s, %s, %s, %s)",
+                         (self.module, self.id, att_fn,
+                          size, time, 'PNG render of a DIA file', self.req.remote_user,
+                          self.req.remote_addr))
+            if handle_ta:
+                db.commit()
+            attachment = Attachment(self.env, "wiki", self.id, att_fn)
+        url = attachment.href(self.req)
+        att_url = attachment.href(self.req, format='raw')
+        return attachment
+
+    def dia2png(self, dia_path, png_path):
+        try:
+            diacmd = 'dia -l --filter=png --export='+png_path+' '+dia_path
+            self.env.log.info('Running Dia : %s',diacmd)
+            f = popen2.Popen4(diacmd)
+            lines = []
+            while (f.poll() == -1):
+                lines += f.fromchild.readlines()
+                f.wait()      
+            self.env.log.info('Exiting Dia')
+        except Exception, e:
+            self.env.log.info('Dia failed with exception= %s',e)
+            raise Exception('Dia execution failed.')
-
-    def render_macro(self, req, name, content):
+        self.req = req
-        # args will be null if the macro is called without parenthesis.
-        if not content:
-            return ''
@@ -52 +91 @@
-                    style['border'] = ' %dpx solid' % int(val);
-                else:
-                    attr[str(key)] = val # will be used as a __call__ keyword
-
-        # parse filespec argument to get module and id if contained.
-        parts = filespec.split(':')
-        url = None
@@ -69 +107 @@
-            except Exception:
-                browser_links = []
-            if parts[0] in browser_links:   # source:path
-
+
+
+
-                rev = None
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                desc = filespec
-            else: # #ticket:attachment or WikiPage:attachment
-                # FIXME: do something generic about shorthand forms...
@@ -90 +144 @@
-                else:
-                    module = 'wiki'
-        elif len(parts) == 1:               # attachment
-            # determine current object
-            # FIXME: should be retrieved from the formatter...
-            # ...and the formatter should be provided to the macro
-            file = filespec
-            module, id = 'wiki', 'WikiStart'
-            path_info = req.path_info.split('/',2)
@@ -108 +159 @@
-            from trac.attachment import Attachment
-            attachment = Attachment(self.env, module, id, file)
-            url = attachment.href(req)
-
-            dia_url = attachment.href(req, format='raw')
-       
-       
+        
+        
-            img_url = dia_url.replace(".dia",".png")
-
-
-
+
+
-            self.env.log.info('Getting file modification times.')
-            #get file modification times
-            try:
-
+  
-            except Exception:
-
-
+
-            try:
-
+  
-            except Exception:
-
-
+
-            self.env.log.info('Comparing dia and png file modification times : %s, %s',dia_mtime,img_mtime)
-
-            # if diagram is newer than image, then regenerate image
-            if (dia_mtime > img_mtime):
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-            try:
-       
-       
-
-
-
-
-
-
+          
+        
+  
+  
+  
+  
+  
+  
-                             "VALUES (%s,%s,%s,%s,%s,%s,%s,%s)",
-                             (attachment.parent_type, attachment.parent_id, img_filename,
-                              attachment.size, attachment.time, 'PNG render of a DIA file', attachment.author,
-                              attachment.ipnr))
-
+  
-
-
+  
-
-
-
+  
+  
-
-            desc = 'JPG render of a DIA file.'
-        for key in ['title', 'alt']:
@@ -176 +205 @@
-            attr['style'] = '; '.join(['%s:%s' % (k, escape(v))
-                                       for k, v in style.iteritems()])
-        result = Markup(html.IMG(src=img_url, **attr)).sanitize()
-        #if not nolink:
-        #    result = html.A(result, href=url, style='padding:0; border:none')
-        return result