Changeset 784

Timestamp:

Aug 26, 2009, 12:30:54 AM (15 years ago)

Author:

joergs

Message:

initial support for different clients

File:

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

baculafs/trunk/baculafs.py

@@ -12 +12 @@
 import pexpect
 import sys
+import re
 
 fuse.fuse_python_api = (0, 2)
@@ -32 +33 @@
 
 BCONSOLE_CMD_PROMPT='\*'
-BCONSOLE_SELECT_PROMPT='Select item:.*'
+BCONSOLE_SELECT_PROMPT='Select .*:.*'
 BCONSOLE_RESTORE_PROMPT='\$ '
 
@@ -40 +41 @@
     def __init__(self, client=BACULA_CLIENT):
         #logging.debug('BC init')
+
+        self.cwd = "/"
+
         self.bconsole = pexpect.spawn( BACULA_CMD, logfile=file(LOG_BCONSOLE_DUMP, 'w'), timeout=10 )
         self.bconsole.setecho( False )
         self.bconsole.expect( BCONSOLE_CMD_PROMPT )
         self.bconsole.sendline( 'restore' )
-        #self.bconsole.expect( BCONSOLE_SELECT_PROMPT )
+        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 )
+
+
+
+        #self.bconsole.sendline( BACULA_CLIENT )
+        #self.bconsole.expect( BCONSOLE_RESTORE_PROMPT )
         #logging.debug( "BC alive: " + str(self.bconsole.isalive()) )
         #logging.debug('BC init done')
 
-    def cd(self, path):
-        path = path + "/"
+    def _normalize_dir( self, path ):
+        # guaranty, 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):
+        re_select_items = re.compile('\s*[0-9]+:\s*.+')
+        return filter( re_select_items.match, lines )
+
+    def _get_item_dict( self,lines ):
+        dictionary = {}
+        for line in self._get_select_items(lines):
+            number,item = line.split( ":", 1 )
+            item = item.strip()
+            number = number.strip()
+            dictionary[item]=number
+        return dictionary
+
+
+    def cd(self,path):
+        path = self._normalize_dir( path )
         logging.debug( "(" + path + ")" )
+
+        if path = "":
+            return True
+
+        try:
+            index = self.bconsole.expect( [ BCONSOLE_SELECT_PROMPT, BCONSOLE_RESTORE_PROMPT ] )
+            if index == 0:
+                # SELECT_PROMPT
+                return self.cd_select( path )
+            elif index == 1:
+                # RESTORE_PROMPT
+                return self.cd_restore( path )
+        except pexpect.EOF:
+            logging.error( "EOF bconsole" )
+        except pexpect.TIMEOUT:
+            logging.error( "TIMEOUT  bconsole" )
+
+
+    def cd_select(self, path):
+        logging.debug( "(" + path + ")" )
+
+        lines = self.bconsole.before.splitlines()
+        items = self._get_item_dict(lines)
+        logging.debug( str( items ) )
+
+
+        directory,sep,path=path.lstrip( "/" ).partition( "/" )
+        logging.debug( "directory: " + directory )
+
+        if items[directory]:
+            logging.debug( "directory: " + directory  + " (" + items[directory] + ")" )
+            self.bconsole.sendline( items[directory] )
+            self.cd( path )
+            return True
+
+        return False
+
+
+
+    def cd_restore(self, path):
+        #path = path + "/"
+        logging.debug( "(" + path + ")" )
+
+        # TODO:
+        #  parse for BCONSOLE_SELECT_PROMPT or BCONSOLE_RESTORE_PROMPT
+        #    BCONSOLE_SELECT_PROMPT: take first part of path and try to match. send number. iterate
+        #    BCONSOLE_RESTORE_PROMPT: cd to directory (as before)
 
         self.bconsole.sendline( 'cd ' + path )
@@ -165 +241 @@
             logging.error( "no access to path " + path )
             self.files[path] = { 'type': TYPE_NONE }
+
         logging.debug( '"' + path + '"=' + str( self.files[path] )  )
         return self.files[path]