Changeset 943

Timestamp:

08/04/06 12:51:40 (7 years ago)

Author:

mglb1

Message:

Add syntax highlighting support to the configuration file display.
Enscript is used for formatting. Each template may specify that syntax
highlighting scheme that it wishes to use by adding an attribute named
highlightFormat to itself. This may take any valid value that enscript
will accept. If the highlightFormat attribute is not present then sh
formatting is used.

File:

• ccsd/trunk/crcnetd/_utils/ccsd_cfengine.py (modified) (5 diffs)

ccsd/trunk/crcnetd/_utils/ccsd_cfengine.py

@@ -536 +536 @@
         start = time.time()
         log_debug("Started host generation thread for %s" % host)
+        session = getSessionE(networkData["session_id"])
         
         # Retrieve the list of templates to generate and flag the start 
@@ -566 +567 @@
                 files = t.writeTemplate(filename, template.multiFile)
                 tend = time.time()
+                # Set properties
+                format = getattr(t, "highlightFormat", "")
+                if format != "":
+                    for file in files:
+                        session.revision.propset(file, "ccs:format", format)
                 # Record how long the file took to generate
                 _statsLock.acquire()
@@ -631 +637 @@
         log_debug("Started template generation thread for %s" % template_id)
         tstart = time.time()
+        session = getSessionE(networkData["session_id"])
         # Instantiate a template
         template = _networkTemplates[template_id]
@@ -640 +647 @@
         files = t.writeTemplate(filename, template.multiFile)
         tend = time.time()
+        # Set properties
+        format = getattr(template, "highlightFormat", "")
+        if format != "":
+            for file in files:
+                session.revision.propset(file, "ccs:format", format)
         # Record how long the file took to generate
         _statsLock.acquire()
@@ -1047 +1059 @@
         entries[0]["props"] = props
         if doMarkup:
-            entries[0]["contents"] = markup(file)
-            
+            if "ccs:format" in props.keys():
+                entries[0]["contents"] = markup(file, props["ccs:format"])
+            else:
+                entries[0]["contents"] = markup(file)
+
     return entries
 
-def markup(file):
-    return file.split("\n")
+def markup(file, format="sh"):
+    """Passes the file through enscript for syntax highlighting"""
+    
+    # Generate the command line to pass to enscript
+    cmdline = config_get("cfengine", "enscript_path", "enscript")
+    cmdline += ' --color -h -q --language=html -p - -E' + format
+    log_debug("Enscript command line: %s" % cmdline)
+    
+    # Run enscript
+    (fdi, fdo) = os.popen2(cmdline)
+    fdi.write(file)
+    fdi.close()
+    odata = fdo.read()
+    rv = fdo.close()
+    if rv is not None:
+        log_warn("Could not run enscript to markup file!")
+        log_debug(odata)
+        return file.split("\n")
+
+    # Strip header and footer
+    i = odata.find('<PRE>')
+    beg = i > 0 and i + 6
+    i = odata.rfind('</PRE>')
+    end = i > 0 and i or len(odata)
+    odata = EnscriptDeuglifier().format(odata[beg:end])
+    return odata.splitlines()
+
+# Enscript Deuglifier code from Trac
+# 
+# Copyright (C) 2003-2006 Edgewall Software
+# All rights reserved.
+#
+# Licensed using the Modified BSD license
+class EnscriptDeuglifier(object):
+    def __new__(cls):
+        self = object.__new__(cls)
+        if not hasattr(cls, '_compiled_rules'):
+            cls._compiled_rules = re.compile('(?:'+'|'.join(cls.rules())+')')
+        self._compiled_rules = cls._compiled_rules
+        return self
+    
+    def format(self, indata):
+        return re.sub(self._compiled_rules, self.replace, indata)
+
+    def replace(self, fullmatch):
+        for mtype, match in fullmatch.groupdict().items():
+            if match:
+                if mtype == 'font':
+                    return '<span>'
+                elif mtype == 'endfont':
+                    return '</span>'
+                return '<span class="code-%s">' % mtype
+    
+    def rules(cls):
+        return [
+            r'(?P<comment><FONT COLOR="#B22222">)',
+            r'(?P<keyword><FONT COLOR="#5F9EA0">)',
+            r'(?P<type><FONT COLOR="#228B22">)',
+            r'(?P<string><FONT COLOR="#BC8F8F">)',
+            r'(?P<func><FONT COLOR="#0000FF">)',
+            r'(?P<prep><FONT COLOR="#B8860B">)',
+            r'(?P<lang><FONT COLOR="#A020F0">)',
+            r'(?P<var><FONT COLOR="#DA70D6">)',
+            r'(?P<font><FONT.*?>)',
+            r'(?P<endfont></FONT>)'
+        ]
+    rules = classmethod(rules)
 
 #####################################################################