Replace None with a new NoEntry class.

[invirt/packages/python-routefs.git] / routefs / __init__.py

diff --git a/routefs/__init__.py b/routefs/__init__.py
index 9e2c6cc..61816b7 100644 (file)
--- a/routefs/__init__.py
+++ b/routefs/__init__.py
@@ -83,9 +83,13 @@ class RouteFS(fuse.Fuse):
         """
         match = self.map.match(path)
         if match is None:
-            return
+            return NoEntry()
         controller = match.pop('controller')
         result = getattr(self, controller)(**match)
+        if type(result) is str:
+            result = File(result)
+        if type(result) is list:
+            result = Directory(result)
         return result
     
     def readdir(self, path, offset):
@@ -108,7 +112,7 @@ class RouteFS(fuse.Fuse):
         predetermined based on which it is.
         """
         obj = self._get_file(path)
-        if obj is None:
+        if type(obj) is NoEntry:
             return -errno.ENOENT
         
         st = RouteStat()
@@ -132,7 +136,7 @@ class RouteFS(fuse.Fuse):
         of the file
         """
         obj = self._get_file(path)
-        if obj is None:
+        if type(obj) is NoEntry:
             return -errno.ENOENT
         elif type(obj) in (Directory, Symlink):
             return -errno.EINVAL
@@ -144,12 +148,20 @@ class RouteFS(fuse.Fuse):
         If the path specified is a symlink, return the target
         """
         obj = self._get_file(path)
-        if type(obj) is not Symlink:
+        if obj is None:
+            return -errno.ENOENT
+        elif type(obj) is not Symlink:
             return -errno.EINVAL
         else:
             return obj
 
-class TreeEntry(object):
+class TreeKey(object):
+    pass
+
+class NoEntry(TreeKey):
+    pass
+
+class TreeEntry(TreeKey):
     default_mode = 0444
     
     def __new__(cls, contents, mode=None):
@@ -189,7 +201,7 @@ def main(cls):
     server = cls(version="%prog " + fuse.__version__,
                  usage=fuse.Fuse.fusage,
                  dash_s_do='setsingle')
-    server.parse(errex=1)
+    server.parse(values=server, errex=1)
     server.main()
 
 from dictfs import DictFS