Changeset 787 for baculafs/trunk/baculafs.py

Timestamp:

Aug 27, 2009, 11:54:48 PM (15 years ago)

Author:

joergs

Message:

initial version with working Client selection

File:

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

baculafs/trunk/baculafs.py

@@ -5 +5 @@
 # $Id$
 
+import fuse
 import logging
-import fuse
 import stat
 import errno
@@ -33 +33 @@
 BCONSOLE_RESTORE_PROMPT='\$ '
 
-
+# define the states bconsole can be in
 class BconsoleState:
-    UNKNOWN = ''
-    SELECT_PROMPT  = BCONSOLE_SELECT_PROMPT
-    RESTORE_PROMPT = BCONSOLE_RESTORE_PROMPT
-    ERROR          = "error"
-
-
+    UNKNOWN         = ''
+    CMD_PROMPT      = BCONSOLE_CMD_PROMPT
+    SELECT_PROMPT   = BCONSOLE_SELECT_PROMPT
+    RESTORE_PROMPT  = BCONSOLE_RESTORE_PROMPT
+    ERROR           = "error"
+
+# direct access to the program bconsole
 class Bconsole:
 
@@ -48 +49 @@
         self.cwd = "/"
         self.state = BconsoleState.UNKNOWN
+        self.last_items_dict = {}
 
         self.bconsole = pexpect.spawn( BACULA_CMD, logfile=file(LOG_BCONSOLE_DUMP, 'w'), timeout=10 )
@@ -55 +57 @@
         self.bconsole.expect( BCONSOLE_SELECT_PROMPT )
         self.bconsole.sendline( "5" )
-        #self.bconsole.expect( BCONSOLE_SELECT_PROMPT )
-
-        #self.bconsole.sendline( BACULA_CLIENT )
-        #self.bconsole.expect( BCONSOLE_RESTORE_PROMPT )
-        #logging.debug( "BC alive: " + str(self.bconsole.isalive()) )
-        #logging.debug('BC init done')
+        self.wait_for_prompt()
+
 
     def _normalize_dir( self, path ):
-        # guaranty, that directory path ends with (exactly one) "/"
+        # guarantee that directory path ends with (exactly one) "/"
         return path.rstrip('/') + "/"
-
-    #def _strip_select_item(self,line):
-        #re_remove = re.compile('\s*[0-9]+:\s*')
-        #return re_remove.sub( '', line )
 
     def _get_select_items(self,lines):
@@ -78 +72 @@
         for line in self._get_select_items(lines):
             number,item = line.split( ":", 1 )
-            item = item.strip()
+            item = self._normalize_dir( item.strip() )
             number = number.strip()
             dictionary[item]=number
@@ -97 +91 @@
                 # SELECT_PROMPT
                 self.state=BconsoleState.SELECT_PROMPT
-                return BCONSOLE_SELECT_PROMPT
+                lines = self.bconsole.before.splitlines()
+                self.last_items_dict = self._get_item_dict(lines)
+                logging.debug( str( self.last_items_dict ) )
             elif index == 1:
                 # RESTORE_PROMPT
                 self.state=BconsoleState.RESTORE_PROMPT
-                return BCONSOLE_RESTORE_PROMPT
             else:
                 logging.error( "unexpected result" )
@@ -112 +107 @@
 
 
+
     def cd(self,path):
         path = self._normalize_dir( path )
@@ -123 +119 @@
             return True
 
-        state = self.wait_for_prompt()
-        if state == BconsoleState.SELECT_PROMPT:
+        if path == "/":
+            return True
+
+        if self.state == BconsoleState.SELECT_PROMPT:
             return self.cd_select( path )
-        elif state == BconsoleState.RESTORE_PROMPT:
+        elif self.state == BconsoleState.RESTORE_PROMPT:
             return self.cd_restore( path )
         # else error
@@ -135 +133 @@
         logging.debug( "(" + path + ")" )
 
-        lines = self.bconsole.before.splitlines()
-        items = self._get_item_dict(lines)
-        logging.debug( str( items ) )
-
-
+        # get top level directory
         directory,sep,path=path.lstrip( "/" ).partition( "/" )
+        directory=self._normalize_dir(directory)
         logging.debug( "directory: " + directory )
 
-        if items[directory]:
-            logging.debug( "directory: " + directory  + " (" + items[directory] + ")" )
-            self.bconsole.sendline( items[directory] )
+        if self.last_items_dict[directory]:
+            logging.debug( "directory: " + directory  + " (" + self.last_items_dict[directory] + ")" )
+            self.bconsole.sendline( self.last_items_dict[directory] )
+            self.wait_for_prompt()
             self.cd( path )
             return True
@@ -182 +178 @@
 
         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
+            if self.state == BconsoleState.SELECT_PROMPT:
+                return self.last_items_dict.keys()
+            elif self.state == BconsoleState.RESTORE_PROMPT:
+                return self.ls_restore( path )
         else:
             return
+
+
+    def ls_restore( self, path ):
+        self.bconsole.sendline( 'ls' )
+        self.bconsole.expect( BCONSOLE_RESTORE_PROMPT )
+        lines = self.bconsole.before.splitlines()
+        #logging.debug( str(lines) )
+        return lines
+
 
 ###############
@@ -222 +226 @@
         return self.files[path]
 
+    # TODO: only works after readdir for the directory (eg. ls)
+    def getattr(self, path):
+
+        # TODO: may cause problems with filenames that ends with "/" 
+        path = path.rstrip( '/' )
+        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]
+
+        if file['type'] == self.TYPE_FILE:
+            st.st_mode = stat.S_IFREG | 0444
+            st.st_nlink = 1
+            st.st_size  = 0
+            return st
+        elif file['type'] == self.TYPE_DIR:
+            st.st_mode = stat.S_IFDIR | 0755
+            if 'dirs' in file:
+                st.st_nlink = len(file['dirs'])
+            else:
+                st.st_nlink = 2
+            return st
+
+        # TODO: check for existens
+        return -errno.ENOENT
 
 
@@ -264 +300 @@
             logging.exception(e)
             logging.error( "no access to path " + path )
-            self.files[path] = { 'type': TYPE_NONE }
+            self.files[path] = { 'type': self.TYPE_NONE }
 
         logging.debug( '"' + path + '"=' + str( self.files[path] )  )
         return self.files[path]
-
-
-
-    # TODO: only works after readdir for the directory (eg. ls)
-    def getattr(self, path):
-
-        # TODO: may cause problems with filenames that ends with "/" 
-        path = path.rstrip( '/' )
-        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]
-
-        if file['type'] == self.TYPE_FILE:
-            st.st_mode = stat.S_IFREG | 0444
-            st.st_nlink = 1
-            st.st_size  = 0
-            return st
-        elif file['type'] == self.TYPE_DIR:
-            st.st_mode = stat.S_IFDIR | 0755
-            if 'dirs' in file:
-                st.st_nlink = len(file['dirs'])
-            else:
-                st.st_nlink = 2
-            return st
-
-        # TODO: check for existens
-        return -errno.ENOENT
-