Merge branch 'search'

* search:
  search pass three
  search pass two
  search module, wip

realms/lib/hook.py

@@ -7,12 +7,15 @@ def hook_func(name, fn):
     @wraps(fn)
     def wrapper(self, *args, **kwargs):
         for hook, a, kw in self.__class__._pre_hooks.get(name) or []:
-            hook(*a, **kw)
+            hook(*args, **kwargs)
 
         rv = fn(self, *args, **kwargs)
 
+        # Attach return value for post hooks
+        kwargs.update(dict(rv=rv))
+
         for hook, a, kw in self.__class__._post_hooks.get(name) or []:
-            hook(*a, **kw)
+            hook(*args, **kwargs)
 
         return rv
     return wrapper

realms/lib/util.py

@@ -97,6 +97,25 @@ def to_canonical(s):
     s = s.lower()
     return s
 
+def cname_to_filename(cname):
+    """ Convert canonical name to filename
+
+    :param cname: Canonical name
+    :return: str -- Filename
+
+    """
+    return cname + ".md"
+
+
+def filename_to_cname(filename):
+    """Convert filename to canonical name.
+
+    .. note::
+
+    It's assumed filename is already canonical format
+
+    """
+    return os.path.splitext(filename)[0]
 
 def gravatar_url(email):
     return "//www.gravatar.com/avatar/" + hashlib.md5(email).hexdigest()