New EntrySet-based TCheetah from ritcey

git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@4433 ce84e21b-d406-0410-9b95-82705330c041

1 files changed, 21 insertions, 127 deletions

diff --git a/src/lib/Server/Plugins/TCheetah.py b/src/lib/Server/Plugins/TCheetah.py
index cab1377df..2968d134b 100644
--- a/src/lib/Server/Plugins/TCheetah.py
+++ b/src/lib/Server/Plugins/TCheetah.py
@@ -1,157 +1,51 @@
 '''This module implements a templating generator based on Cheetah'''
 __revision__ = '$Revision$'
 
-import logging, lxml.etree, posixpath, traceback, re, sys
 import Cheetah.Template, Cheetah.Parser
+import logging, sys, traceback
 import Bcfg2.Server.Plugin
 
 logger = logging.getLogger('Bcfg2.Plugins.TCheetah')
-info = re.compile('^owner:(\s)*(?P<owner>\w+)$|group:(\s)*(?P<group>\w+)$|' +
-                  'perms:(\s)*(?P<perms>\w+)$')
 
 class TemplateFile:
     '''Template file creates Cheetah template structures for the loaded file'''
-    def __init__(self, name, properties):
+    def __init__(self, name, properties, specific):
         self.name = name
         self.properties = properties
-        self.states = {'template': False, 'info': False}
-        self.metadata = {'owner': 'root', 'group': 'root', 'perms': '644'}
-
-    def HandleEvent(self, event):
+        self.specific = specific
+        self.template = None
+    
+    def handle_event(self, event):
         '''Handle all fs events for this template'''
-        if event.filename == 'template':
-            try:
-                self.template = Cheetah.Template.Template(open(self.name + \
-                                                               '/template').read())
-                self.template.properties = self.properties.properties
-            except Cheetah.Parser.ParseError, perror:
-                logger.error("Cheetah parse error for file %s" % (self.name))
-                logger.error(perror.report())
-        elif event.filename == 'info.xml':
-            if not hasattr(self, 'infoxml'):
-                fpath = self.name + '/info.xml'
-                self.infoxml = Bcfg2.Server.Plugin.XMLSrc(fpath, True)
-            self.infoxml.HandleEvent(event)
-        elif event.filename == 'info':
-            for line in open(self.name + '/info').readlines():
-                match = info.match(line)
-                if not match:
-                    logger.warning("Failed to match line: %s"%line)
-                    continue
-                else:
-                    mgd = match.groupdict()
-                    if mgd['owner']:
-                        self.metadata['owner'] = mgd['owner']
-                    elif mgd['group']:
-                        self.metadata['group'] = mgd['group']
-                    elif mgd['perms']:
-                        self.metadata['perms'] = mgd['perms']
-                        if len(self.metadata['perms']) == 3:
-                            self.metadata['perms'] = "0%s" % (self.metadata['perms'])              
+        if event.code2str() == 'deleted':
+            return
+        try:
+            self.template = Cheetah.Template.Template(open(self.name).read())
+            self.template.properties = self.properties.properties
+        except Cheetah.Parser.ParseError, perror:
+            logger.error("Cheetah parse error for file %s" % (self.name))
+            logger.error(perror.report())
     
-    def BuildFile(self, entry, metadata):
+    def bind_entry(self, entry, metadata):
         '''Build literal file information'''
         self.template.metadata = metadata
         self.template.path = entry.get('realname', entry.get('name'))
-        self.template.properties = self.properties.properties
+        
         try:
             entry.text = str(self.template)
         except:
-            (a,b,c) = sys.exc_info()
+            (a, b, c) = sys.exc_info()
             msg = traceback.format_exception(a, b, c, limit=2)[-1][:-1]
             logger.error(msg)
-            logger.error("Failed to template %s" % entry.get('name'))
+            logger.error("TCheetah template error for %s" % self.template.path)
             del a, b, c
             raise Bcfg2.Server.Plugin.PluginExecutionError
-        if hasattr(self, 'infoxml'):
-            mdata = {}
-            self.infoxml.pnode.Match(metadata, mdata)
-            [entry.attrib.__setitem__(key, value) \
-             for (key, value) in mdata['Info'][None].iteritems()]
-        else:
-            [entry.attrib.__setitem__(key, value) \
-             for (key, value) in self.metadata.iteritems()]
-
-class CheetahProperties(Bcfg2.Server.Plugin.SingleXMLFileBacked):
-    '''Class for Cheetah properties'''
-    def Index(self):
-        '''Build data into an elementtree object for templating usage'''
-        try:
-            self.properties = lxml.etree.XML(self.data)
-            del self.data
-        except lxml.etree.XMLSyntaxError:
-            logger.error("Failed to parse properties")
 
-class FakeProperties:
-    '''Dummy class used when properties dont exist'''
-    def __init__(self):
-        self.properties = lxml.etree.Element("Properties")
 
-class TCheetah(Bcfg2.Server.Plugin.Plugin):
+class TCheetah(Bcfg2.Server.Plugin.GroupSpool):
     '''The TCheetah generator implements a templating mechanism for configuration files'''
     __name__ = 'TCheetah'
     __version__ = '$Id$'
     __author__ = 'bcfg-dev@mcs.anl.gov'
-
-    def __init__(self, core, datastore):
-        Bcfg2.Server.Plugin.Plugin.__init__(self, core, datastore)
-        if self.data[-1] == '/':
-            self.data = self.data[:-1]
-        self.Entries['ConfigFile'] = {}
-        self.entries = {}
-        self.handles = {}
-        self.AddDirectoryMonitor('')
-        try:
-            self.properties = CheetahProperties('%s/../etc/properties.xml' \
-                                                % (self.data), self.core.fam)
-        except:
-            self.properties = FakeProperties()
-            self.logger.info("Failed to read properties file; TCheetah properties disabled")
-
-    def BuildEntry(self, entry, metadata):
-        '''Dispatch fetch calls to the correct object'''
-        metadata.repo = self.data
-        self.entries[entry.get('name')].BuildFile(entry, metadata)
-
-    def HandleEvent(self, event):
-        '''Unified FAM event handler for DirShadow'''
-        #print "got event %s %s %s" % ( event.code2str(), event.filename, event.requestID)
-        action = event.code2str()
-        if event.filename[0] == '/':
-            return
-        epath = "".join([self.data, self.handles[event.requestID], event.filename])
-        if event.filename in ['info', 'template', 'info.xml']:
-            identifier = self.handles[event.requestID][:-1]
-        else:
-            identifier = self.handles[event.requestID] + event.filename
-        if action in ['exists', 'created']:
-            if posixpath.isdir(epath):
-                self.AddDirectoryMonitor(epath[len(self.data):])
-            else:
-                if not self.entries.has_key(identifier):
-                    self.entries[identifier] = TemplateFile( \
-                        self.data + '/' + identifier, self.properties)
-                    self.Entries['ConfigFile'][identifier] = self.BuildEntry
-                self.entries[identifier].HandleEvent(event)
-        elif action == 'changed':
-            if self.entries.has_key(identifier):
-                self.entries[identifier].HandleEvent(event)
-        elif action == 'deleted':
-            # the template file is the sentinal that creates a real entry
-            if event.filename == 'template' and self.entries.has_key(identifier):
-                del self.entries[identifier]
-                del self.Entries['ConfigFile'][identifier]
-                                 
-    def AddDirectoryMonitor(self, relative):
-        '''Add new directory to FAM structures'''
-        if not relative:
-            relative = '/'
-        if relative[-1] != '/':
-            relative += '/'
-        name = self.data + relative
-        if relative not in self.handles.values():
-            if not posixpath.isdir(name):
-                print "Cheetah: Failed to open directory %s" % (name)
-                return
-            reqid = self.core.fam.AddMonitor(name, self)
-            self.handles[reqid] = relative
+    filename_pattern = 'template'
+    es_child_cls = TemplateFile