@@ -5,7 +5,8 @@ THIS_DIR = os.path.abspath(os.path.dirname(__file__)) input_dir = os.path.join(THIS_DIR, 'input') #output_dir = os.path.join(THIS_DIR, 'htdocs') output_dir = '/Users/pradeep/Sites' -template = os.path.join(THIS_DIR, 'template.html') +template_dir = THIS_DIR +template = os.path.join(template_dir, 'template.html') ### Optional parameters options = { 'baseurl':'http://localhost/~pradeep', # if not set, relative URLs will be generated config.py @@ -63,7 +63,7 @@ def parse(fname): get_outp = lambda s:'.'.join(s.split('.')[:-1]) + '.html' -def get_template(template_dir, template): +def get_template(template): """Takes the directory where templates are located and the template name. Returns a blob containing the template.""" template = os.path.join(template_dir, template) @@ -75,15 +75,15 @@ def get_template(template_dir, template): def parse_directory(current_dir, files, output_dir): files = [f for f in files if ext(f) in options['extensions']] for f in files: - inp = os.path.join(current_dir,f) - outp = get_outp(os.path.join(output_dir,f)) + inp = os.path.join(current_dir, f) + outp = get_outp(os.path.join(output_dir, f)) headers, body = parse(inp) # Attempt to use the file specified template, if not fall back to default. - blob = get_template(template_dir, template) + blob = get_template(template) try: - blob = get_template(template_dir, headers['template']) + blob = get_template(headers['template']) except: pass webgen.py c423ec164f9f50da39cc9bf6137d0c5bf6f17b5f Pradeep Gowda pradeep@btbytes.com http://github.com/btbytes/webgen.py/commit/ec82d5074d74df7c5c39da3de3b59a491fc65cb7 ec82d5074d74df7c5c39da3de3b59a491fc65cb7 2009-01-01T12:12:37-08:00 2009-01-01T12:12:37-08:00 fixing template_dir reference 4a41a21c09f932a2f6d4371e347fbb4829c4ff5a Pradeep Gowda pradeep@btbytes.com