Changeset 785

Timestamp:

Aug 27, 2009, 5:34:26 PM (15 years ago)

Author:

joergs

Message:

cleanup

File:

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

baculafs/trunk/baculafs.py

@@ -28 +28 @@
 #BACULA_CMD = 'strace -f -o /tmp/bconsole.strace /usr/sbin/bconsole -n'
 BACULA_CMD = '/usr/sbin/bconsole -n'
-# .clients
-# 5: ting-fd
-BACULA_CLIENT='5'
 
 BCONSOLE_CMD_PROMPT='\*'
@@ -37 +34 @@
 
 
+class BconsoleState:
+    UNKNOWN = ''
+    SELECT_PROMPT  = BCONSOLE_SELECT_PROMPT
+    RESTORE_PROMPT = BCONSOLE_RESTORE_PROMPT
+    ERROR          = "error"
+
+
 class Bconsole:
 
-    def __init__(self, client=BACULA_CLIENT):
+    def __init__(self):
         #logging.debug('BC init')
 
         self.cwd = "/"
+        self.state = BconsoleState.UNKNOWN
 
         self.bconsole = pexpect.spawn( BACULA_CMD, logfile=file(LOG_BCONSOLE_DUMP, 'w'), timeout=10 )
@@ -51 +56 @@
         self.bconsole.sendline( "5" )
         #self.bconsole.expect( BCONSOLE_SELECT_PROMPT )
-
-
 
         #self.bconsole.sendline( BACULA_CLIENT )
@@ -81 +84 @@
 
 
-    def cd(self,path):
-        path = self._normalize_dir( path )
-        logging.debug( "(" + path + ")" )
-
-        if path = "":
-            return True
+
+    def wait_for_prompt(self):
+
+        # set to error state. 
+        # Only set back to valid state,
+        # if a valid prompt is received
+        self.state=BconsoleState.ERROR
 
         try:
@@ -92 +96 @@
             if index == 0:
                 # SELECT_PROMPT
-                return self.cd_select( path )
+                self.state=BconsoleState.SELECT_PROMPT
+                return BCONSOLE_SELECT_PROMPT
             elif index == 1:
                 # RESTORE_PROMPT
-                return self.cd_restore( path )
+                self.state=BconsoleState.RESTORE_PROMPT
+                return BCONSOLE_RESTORE_PROMPT
+            else:
+                logging.error( "unexpected result" )
         except pexpect.EOF:
             logging.error( "EOF bconsole" )
         except pexpect.TIMEOUT:
             logging.error( "TIMEOUT  bconsole" )
+
+        return self.state
+
+
+    def cd(self,path):
+        path = self._normalize_dir( path )
+        logging.debug( "(" + path + ")" )
+
+        if not path:
+            return True
+
+        state = self.wait_for_prompt()
+        if state == BconsoleState.SELECT_PROMPT:
+            return self.cd_select( path )
+        elif state == BconsoleState.RESTORE_PROMPT:
+            return self.cd_restore( path )
+        # else error
+        return False