Add user defined url patterns.

mythmon · Jun 9, 2011 · 3022b40 · 3022b40
1 parent 07dfcb4
commit 3022b40
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/wok/engine.py b/wok/engine.py
@@ -18,6 +18,7 @@ class Engine(object):
         'output_dir'  : 'output',
         'media_dir'   : 'media',
         'site_title'  : 'Some random Wok site',
+        'url_pattern' : '/{category}/{slug}.html',
     }
 
     def __init__(self, output_lvl = 1):

diff --git a/wok/page.py b/wok/page.py
@@ -156,13 +156,11 @@ def build_meta(self):
         # Guarantee: tags exists, is a list
 
         if not 'url' in self.meta:
-            # /category/subcategory/slug.html
-            util.out.debug('building the url', self.categories)
-            self.meta['url'] = '/'
-            for cat in self.category:
-                self.meta['url']= os.path.join(self.meta['url'], cat)
-            self.meta['url'] = os.path.join(self.meta['url'],
-                    self.slug + '.html')
+            parts = {
+                'slug' : self.slug,
+                'category' : '/'.join(self.category),
+            }
+            self.meta['url'] = self.options['url_pattern'].format(**parts);
 
     def render(self, templ_vars=None):
         """
@@ -193,6 +191,7 @@ def write(self):
             # Probably that the dir already exists, so thats ok.
             # TODO: double check this. Permission errors are something to worry
             # about
+        util.out.info('Page.write', 'writing to {0}'.format(path))
 
         f = open(path, 'w')
         f.write(self.html)