Changeset 548

Timestamp:

03/23/06 23:09:34 (3 years ago)

Author:

pkropf

Message:

GraphvizPlugin:

Corrected the regular expression for embedded URLs. Added default values for the cache manager control values. Commented out the various self.log.debug messages. Log the version of graphviz when GraphvizMacro? is initialized.

Files:

• graphvizplugin/branches/v0.6/graphviz/graphviz.py (modified) (21 diffs)
• graphvizplugin/branches/v0.6/graphviz/__init__.py (modified) (1 diff)
• graphvizplugin/branches/v0.6/ReleaseNotes.txt (modified) (2 diffs)
• graphvizplugin/branches/v0.6/setup.py (modified) (1 diff)

graphvizplugin/branches/v0.6/graphviz/graphviz.py

@@ -10 +10 @@
-
-
-version__ 
+revision__
-__id__        = '$Id$'
-__headurl__   = '$HeadURL$'
-__docformat__ = 'restructuredtext'
+__version__   = '0.6.1'
-
-
@@ -46 +47 @@
-
-    def __init__(self):
-id: %s' % str(__id__
-
-
+version: %s - id: %s' % (__version__, str(__id__)
+#
+#
-
-
@@ -89 +90 @@
-        """
-
-
-
-
-
-
-
-
-
-
+#
+#
+#
+#
+#
+#
+#
+#
+#
-
-        # check and load the configuration
@@ -156 +157 @@
-            self.clean_cache()
-
-
+#
-            if URL_in_graph: # translate wiki TracLinks in URL
-
+
+
-
-            # Antialias PNGs with rsvg, if requested
@@ -164 +166 @@
-                # 1. SVG output
-                cmd = '"%s" %s -Tsvg -o%s.svg' % (proc_cmd, self.processor_options, img_path)
-
+#
-                out, err = self.launch(cmd, content)
-                if len(out) or len(err):
@@ -171 +173 @@
-                # 2. SVG to PNG rasterization
-                cmd = '"%s" --dpi-x=%d --dpi-y=%d %s.svg %s' % (self.rsvg_path, self.dpi, self.dpi, img_path, img_path)
-
+#
-                out, err = self.launch(cmd, None)
-                if len(out) or len(err):
@@ -179 +181 @@
-            else: # Render other image formats
-                cmd = '"%s" %s -T%s -o%s' % (proc_cmd, self.processor_options, self.out_format, img_path)
-
+#
-                out, err = self.launch(cmd, content)
-                if len(out) or len(err):
@@ -191 +193 @@
-                if not os.path.exists(map_path):
-                    cmd = '"%s" %s -Tcmap -o%s' % (proc_cmd, self.processor_options, map_path)
-
+#
-                    out, err = self.launch(cmd, content)
-                    if len(out) or len(err):
@@ -236 +238 @@
-
-    def expand_wiki_links(self, match):
-
+#
-        
-        wiki_url = match.groups()[0]                     # TracLink ([1], source:file/, ...)
@@ -243 +245 @@
-        
-        url      = 'URL="%s"' % href.groups()[0]
-
+#
-
-        return url
@@ -272 +274 @@
-                    buf = self.show_err(msg)
-                    trouble = True
-
+#
-
-            # check for the cmd_path entry
@@ -292 +294 @@
-                        trouble = True
-
-
+#
-
-            # check for the prefix_url entry
@@ -301 +303 @@
-            else:
-                self.prefix_url = self.config.get('graphviz', 'prefix_url')
-
+#
-
-
@@ -311 +313 @@
-            else:
-                self.out_format = GraphvizMacro.formats[0]
-
+#
-
-            # check for the default processor - processor
@@ -318 +320 @@
-            else:
-                self.processor = GraphvizMacro.processors[0]
-
+#
-
-            # check if png anti aliasing should be done - png_antialias
@@ -325 +327 @@
-            else:
-                self.png_anti_alias = False
-
+#
-
-            self.rsvg_path = '/usr/bin/rsvg'
@@ -336 +338 @@
-                    buf = self.show_err(err)
-                    trouble = True
-
+#
-
-            # get default graph/node/edge attributes
@@ -357 +359 @@
-                self.cache_manager = True
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-            else:
@@ -429 +446 @@
-
-            for name in os.listdir(self.cache_dir):
-
+#
-                entry_list[name] = os.stat(os.path.join(self.cache_dir, name))
-
@@ -441 +458 @@
-            atime_keys.sort()
-
-
-
-
+#
+#
+#
-        
-            # In the spirit of keeping the code fairly simple, the
@@ -454 +471 @@
-                    key = atime_keys.pop(0)
-                    for file in atime_list[key]:
-
+#
-                        os.unlink(os.path.join(self.cache_dir, file))
-                        count = count - 1
-                        size = size - entry_list[file][6]
-        else:
-
+
+

graphvizplugin/branches/v0.6/graphviz/__init__.py

@@ -9 +9 @@
-
-
-version__ 
+revision__
-__id__        = '$Id$'
-__headurl__   = '$HeadURL$'

graphvizplugin/branches/v0.6/ReleaseNotes.txt

@@ -1 +1 @@
-Trac Graphviz Plugin v0.6 Release Notes
-=======================================
-2
+3
-
-
+.1
-processor is a plugin for Trac that allows the the dynamic generation
-of diagrams by the various graphviz programs. The text of a wiki page
-can contain the source text for graphviz and the web browser will show
-the resulting image.
+
+
+Changes for release v0.6.1
+--------------------------
+
+* Applied patch from eblot to correct the regular expression for
+  embedded URLs. Resolves issue http://trac-hacks.org/ticket/161.
+
+* Renamed module variable __version__ to __revision__ to better
+  reflect the intent.
+
+* Moved the release version number from setup.py to
+  graphviz/graphviz.py. The version number is now logged when the
+  graphviz module is initialized.
+
+* Commented out the many self.log.debug messages. As pointed out in,
+  http://trac-hacks.org/ticket/238, the core seems to be mostly stable
+  and having lots and lots of debugging messages may no longer be
+  needed.
+
+* Added defaults for the cache management control values:
+
+  * cache_max_size = 10,000,000
+  * cache_min_size = 5,000,000
+  * cache_max_count = 2,000
+  * cache_min_count = 1,500
+
+  The resolves issue http://trac-hacks.org/ticket/160.
-
-
@@ -24 +52 @@
-
-Changes for release v0.5.1
-
+--
-
- * Corrected typo in graphviz.py where the wrong internal variable was

graphvizplugin/branches/v0.6/setup.py

@@ -16 +16 @@
-
-from setuptools import setup, find_packages
+import graphviz
-
-setup (
-    name = 'graphviz',
-"0.6"
+graphviz.graphviz.__version__
-    packages = find_packages(),
-    package_data = { 'graphviz' : ['examples/*',],