Changeset 781

Timestamp:

Jul 25, 2009, 3:10:17 AM (15 years ago)

Author:

joergs

Message:

getaddr checks for existing directories

File:

• baculafs/trunk/baculafs.py (modified) (7 diffs)

baculafs/trunk/baculafs.py

@@ -47 +47 @@
         #logging.debug('BC init done')
 
-
-    def ls(self, path):
-
+    def cd(self, path):
         path = path + "/"
         logging.debug( "(" + path + ")" )
@@ -63 +61 @@
             # path ok, now wait for prompt
             self.bconsole.expect( BCONSOLE_RESTORE_PROMPT )
+            return True
         elif index == 1:
             #print "wrong path"
+            return False
+        elif index == 2:
+            logging.error( "EOF bconsole" )
+            #raise?
+            return False
+        elif index == 3:
+            logging.error( "TIMEOUT  bconsole" )
+            return False
+
+    def ls(self, path):
+        logging.debug( "(" + path + ")" )
+
+        if self.cd( path ):
+            self.bconsole.sendline( 'ls' )
+            self.bconsole.expect( BCONSOLE_RESTORE_PROMPT )
+            lines = self.bconsole.before.splitlines()
+            #logging.debug( str(lines) )
+            return lines
+        else:
             return
-        elif index == 2:
-            print "error EOF"
-            raise
-        elif index == 3:
-            print "error TIMEOUT"
-            return
-
-        self.bconsole.sendline( 'ls' )
-        self.bconsole.expect( BCONSOLE_RESTORE_PROMPT )
-        lines = self.bconsole.before.splitlines()
-        #logging.debug( str(lines) )
-        return lines
 
 ###############
@@ -95 +101 @@
         #logging.debug('init finished')
 
+
+    def _getattr(self,path):
+        # TODO: may cause problems with filenames that ends with "/"
+        path = path.rstrip( '/' )
+        logging.debug( '"' + path + '"' )
+
+        if (path in self.files):
+            #logging.debug( "(" + path + ")=" + str(self.files[path]) )
+            return self.files[path]
+
+        if Bconsole().cd(path):
+            # don't define files, because these have not been checked
+            self.files[path] = { 'type': self.TYPE_DIR, 'dirs': [ ".", ".." ] }
+
+        return self.files[path]
+
+
+
+
     def _getdir(self, path):
 
@@ -103 +128 @@
         if (path in self.files):
             #logging.debug( "(" + path + ")=" + str(self.files[path]) )
-            if self.files[path]['type'] == self.TYPE_FILE:
-                logging.debug( '"' + path + '"=file (cached)' )
+            if self.files[path]['type'] == self.TYPE_NONE:
+                logging.info( '"' + path + '" does not exist (cached)' )
+                return self.files[path]
+            elif self.files[path]['type'] == self.TYPE_FILE:
+                logging.info( '"' + path + '"=file (cached)' )
                 return self.files[path]
             elif ((self.files[path]['type'] == self.TYPE_DIR) and ('files' in self.files[path])):
-                logging.debug( '"' + path + '"=dir (cached)' )
+                logging.info( '"' + path + '"=dir (cached)' )
                 return self.files[path]
 
         try:
             files = Bconsole().ls(path)
-            #logging.debug( "  files: " + str( files ) )
+            logging.debug( "  files: " + str( files ) )
 
             # setting initial empty directory. Add entires later in this function
@@ -144 +172 @@
         logging.debug( '"' + path + '"' )
 
+        st = fuse.Stat()
+
+        if not (path in self.files):
+            self._getattr(path)
+
+        if not (path in self.files):
+            return -errno.ENOENT
+
         file = self.files[path]
-        st = fuse.Stat()
-
-        #file = self._getdir( path )
 
         if file['type'] == self.TYPE_FILE:
@@ -153 +186 @@
             st.st_nlink = 1
             st.st_size  = 0
+            return st
         elif file['type'] == self.TYPE_DIR:
             st.st_mode = stat.S_IFDIR | 0755
@@ -159 +193 @@
             else:
                 st.st_nlink = 2
-        else:
-            return -errno.ENOENT
-        return st
+            return st
+
+        # TODO: check for existens
+        return -errno.ENOENT
+