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 871774e..61816b7 100644 (file)
--- a/routefs/__init__.py
+++ b/routefs/__init__.py
@@ -15,7 +15,6 @@ import fuse
 import routes
 import errno
 import stat
-from dictfs import DictFS
 
 fuse.fuse_python_api = (0, 2)
 
@@ -84,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):
@@ -109,19 +112,19 @@ 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()
         if type(obj) is Directory:
-            st.st_mode = stat.S_IFDIR | 0755
+            st.st_mode = stat.S_IFDIR | obj.mode
             st.st_nlink = 2
         elif type(obj) is Symlink:
-            st.st_mode = stat.S_IFLNK | 0777
+            st.st_mode = stat.S_IFLNK | obj.mode
             st.st_nlink = 1
             st.st_size = len(obj)
         else:
-            st.st_mode = stat.S_IFREG | 0444
+            st.st_mode = stat.S_IFREG | obj.mode
             st.st_nlink = 1
             st.st_size = len(obj)
         
@@ -133,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
@@ -145,23 +148,51 @@ 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 Directory(list):
+class TreeKey(object):
+    pass
+
+class NoEntry(TreeKey):
+    pass
+
+class TreeEntry(TreeKey):
+    default_mode = 0444
+    
+    def __new__(cls, contents, mode=None):
+        return super(TreeEntry, cls).__new__(cls, contents)
+    
+    def __init__(self, contents, mode=None):
+        if mode is None:
+            self.mode = self.default_mode
+        else:
+            self.mode = mode
+        
+        super(TreeEntry, self).__init__(contents)
+
+class Directory(TreeEntry, list):
     """
     A dummy class representing a filesystem entry that should be a
     directory
     """
-    pass
+    default_mode = 0555
 
-class Symlink(str):
+class Symlink(TreeEntry, str):
     """
     A dummy class representing something that should be a symlink
     """
-    pass
+    default_mode = 0777
+
+class File(TreeEntry, str):
+    """
+    A dummy class representing something that should be a file
+    """
+    default_mode = 0444
 
 def main(cls):
     """
@@ -170,7 +201,9 @@ 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()
 
-__all__ = ['RouteFS', 'DictFS', 'Symlink', 'Directory', 'main']
+from dictfs import DictFS
+
+__all__ = ['RouteFS', 'DictFS', 'Symlink', 'Directory', 'File', 'main']