jro_apps/bk_manager Commit - r87:88 · Jicamarca Repository

***

ralonso -

r87:88

parent child

bk_manager/trunk/functions/functions.py +1 -1

             def make_dir(var_dir,  self):
                 var_output = commands.getstatusoutput('mkdir '+var_dir)
                 if var_output[0] != 0:
-                    self.txtInfo.append("Error deleting directory: "+var_dir+", output_error:" + str(var_output[0]))
+                    self.txtInfo.append("Error making directory: "+var_dir+", output_error:" + str(var_output[0]))
                     return False
                 return True

bk_manager/trunk/functions/functions2.py +2 -17

             #----------------------------------- devuelve una lista con las carpetas en las cuales estan montados los dispositivos --------------------------------------------
             def mounted_devices():
-                var_type = "tmpfs"
+                var_type = "iso9660"
                 var_output=commands.getstatusoutput('df -hT | grep '+ var_type)
                 if var_output[0] != 0:
                     return list_dirs
             #----------------------------------- listado de los dispositivos de grabacion seleccionados --------------------------------------------
             def selected_devices(self):
                 self.actionChange_Parameters.setEnabled(False)
-            def enabled_items3(var_bool, self):
-                self.btnRestart.setEnabled(not(var_bool))
-                self.btnStartburn.setEnabled(not(var_bool))
-                self.btnStopburn.setEnabled(var_bool)
-                self.chkCheck.setEnabled(not(var_bool))
-                self.chkCheck.setChecked(False)
-                self.actionChange_Parameters.setEnabled(False)
-                self.actionChange_Parameters.setEnabled(False)
-                self.actionChange_Parameters.setEnabled(False)
             #---------------------------------------------- Actualiza estado en los labels -------------------------------------------------------

bk_manager/trunk/ui/MainWindow.py +32 -18

                         self.var_real_burn = False
                         self.var_real_check = False
                         self.var_real_eject = False
-                        self.var_real_manual_check = False
+                        self.var_real_manual_check = True
                         self.var_real_show_cmd = True
                     if self.var_real_detect_devices == True:
                         functions2.update_message(2, "ERROR",  self,  index=self.var_n_check_dirs)
                     #borrar el contenido de tmpdata
-                    var_tmpdata=self.var_Rpath+"/tmpdata"
+                    var_tmpdata=self.var_TDpath+"/tmpdata"
                     bool_return = functions.remove_dir(var_tmpdata,  self)
                     if not(bool_return):
                         self.bool_state_burning = False
                         return
-                    bool_return = functions.make_dir(var_tmpdata,  self)
-                    if not(bool_return):
-                        self.txtInfo.append("Error creating directory:"+ var_tmpdata)
+                    self.var_n_check_dirs +=1
-                        self.bool_state_burning = False
-                        return
+                    if self.var_n_check_dirs  >= len(self.list_check_dirs) :
-                    if self.var_n_check_dirs >= len(self.list_check_dirs) :
                         self.bool_state_manual_check = False
-                        return
+                        self.function_manual_check_final()
+                        return
-                    self.var_n_check_dirs +=1
-                    self.manual_check()
+                    self.function_manual_check()
             #==============================================================================
                     self.btnTDpath.setEnabled(False) #Deshabilito el boton que permite cambiar la ruta de verificacion
                     self.btnCHstart.setText("STOP") #Cambio el texto del boton
+                    self.txtInfo.append(self.btnCHstart.text())
                     self.function_manual_check()
                     #Verificacion de los discos
                     if self.bool_state_manual_check == True:
-                        self.txtInfo.append("-----------manually checking disc: "+self.var_n_check_dirs
+                        self.txtInfo.append("-----------manually checking disc: "+str(self.var_n_check_dirs + 1)
-                                            +" data"+self.list_check_dirs[self.var_n_check_dirs])
+                                            +" directory: "+self.list_check_dirs[self.var_n_check_dirs])
                         functions2.update_message(2, "CHECKING",  self,  index=self.var_n_check_dirs)
+                        #Crea la carpeta tmpdata dentro de la ruta elegida
+                        var_tmpdata=self.var_TDpath+"/tmpdata"
+                        bool_return = functions.make_dir(var_tmpdata,  self)
+                        if not(bool_return):
+                            self.txtInfo.append("Error creating directory:"+ var_tmpdata)
+                            self.bool_state_burning = False
+                            return
                         var_data_dir = self.list_check_dirs[self.var_n_check_dirs] #Carpeta donde esta montado el disco actual
-                        var_cmd = functions.cmd_manual_check(var_data_dir,  self.var_TDpath)
+                        var_cmd = functions.cmd_manual_check(var_data_dir,  var_tmpdata)
                         if self.var_real_show_cmd == True:
                             self.txtInfo.append("CMD: "+var_cmd)
                             var_cmd="echo 'function_manual_check'"
                         self.process_manual_check.start(var_cmd)
+                def function_manual_check_final(self):
+                    self.txtInfo.append("Manual check process is complete")
+                    self.btnCHstart.setText("START") #Cambio el texto del boton

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages