jro_apps/bk_manager Commit - r84:85 · Jicamarca Repository

#Falta terminar el proceso de revision manual

ralonso -

r84:85

parent child

bk_manager/trunk/functions/functions.py +5 0

                     var_cmd = "cp -rfv "+var_output[1] .split()[-1]+"/ "+var_Rpath_tmpdata+"/"
                     return var_cmd
+            def cmd_manual_check(var_data_dir,  var_TDpath):
+                var_cmd = "cp -rfv "+var_data_dir+"/ "+var_TDpath+"/"
+                return var_cmd
             def remove_iso(self):
                 var_Rpath_iso=self.var_Rpath+"/iso"

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

@@ -80,6 +80,23
80	return var_dev_sr	80	return var_dev_sr
81		81
82		82
		83	#----------------------------------- expulsa los dispositivos de grabacion --------------------------------------------
		84	def mounted_devices():
		85	var_output=commands.getstatusoutput('df -hT \| grep tmpfs')
		86
		87	if var_output[0] != 0:
		88	return "FATAL ERROR"
		89
		90	else:
		91	if len(var_output[1]) == 0:
		92	return "FATAL ERROR"
		93
		94	list_dirs = []
		95	for var_dir in var_output[1].split('\n'):
		96	list_dirs.append(var_dir.split()[-1])
		97
		98	return list_dirs
		99
83		100
84	#----------------------------------- listado de los dispositivos de grabacion seleccionados --------------------------------------------	101	#----------------------------------- listado de los dispositivos de grabacion seleccionados --------------------------------------------
85		102
@@ -222,7 +239,7
222		239
223	#---------------------------------------------- Actualiza estado en los labels -------------------------------------------------------	240	#---------------------------------------------- Actualiza estado en los labels -------------------------------------------------------
224		241
225	def update_message(type, message, self, index=0, ):	242	def update_message(type, message, self, index=0):
226	if index == 0:	243	if index == 0:
227	var_index = ( ( (self.var_disc_n - 1) * self.var_Copys) + (self.var_copy_n - 1) - self.var_burned_discs ) % len(self.var_devices)	244	var_index = ( ( (self.var_disc_n - 1) * self.var_Copys) + (self.var_copy_n - 1) - self.var_burned_discs ) % len(self.var_devices)
228	else:	245	else:

bk_manager/trunk/ui/MainWindow.py +94 -2

@@ -43,6 +43,7
43	self.var_real_burn = True	43	self.var_real_burn = True
44	self.var_real_check = True	44	self.var_real_check = True
45	self.var_real_eject = True	45	self.var_real_eject = True
		46	self.var_real_manual_check = True
46	self.var_real_show_cmd = True	47	self.var_real_show_cmd = True
47		48
48	else:	49	else:
@@ -50,8 +51,9
50	self.var_real_detect_devices = False	51	self.var_real_detect_devices = False
51	self.var_real_iso = False	52	self.var_real_iso = False
52	self.var_real_burn = False	53	self.var_real_burn = False
53	self.var_real_check = ~~Tru~~e	54	self.var_real_check = False
54	self.var_real_eject = False	55	self.var_real_eject = False
		56	self.var_real_manual_check = False
55	self.var_real_show_cmd = True	57	self.var_real_show_cmd = True
56		58
57	if self.var_real_detect_devices == True:	59	if self.var_real_detect_devices == True:
@@ -121,6 +123,10
121	self.connect(self.process_check, QtCore.SIGNAL('readyReadStandardError()'), self.readError_check)	123	self.connect(self.process_check, QtCore.SIGNAL('readyReadStandardError()'), self.readError_check)
122	self.connect(self.process_check, QtCore.SIGNAL('finished(int,QProcess::ExitStatus)'), self.finished_check)	124	self.connect(self.process_check, QtCore.SIGNAL('finished(int,QProcess::ExitStatus)'), self.finished_check)
123		125
		126	self.process_manual_check = QtCore.QProcess()
		127	self.connect(self.process_manual_check, QtCore.SIGNAL('readyReadStandardOutput()'), self.readOuput_manual_check)
		128	self.connect(self.process_manual_check, QtCore.SIGNAL('readyReadStandardError()'), self.readError_manual_check)
		129	self.connect(self.process_manual_check, QtCore.SIGNAL('finished(int,QProcess::ExitStatus)'), self.finished_manual_check)
124		130
125	def changeParameters(self):	131	def changeParameters(self):
126	dlg=QtGui.QDialog()	132	dlg=QtGui.QDialog()
@@ -485,6 +491,50
485		491
486	functions.is_last_disc_and_copy(self)	492	functions.is_last_disc_and_copy(self)
487		493
		494	#----------------------------------------------------- Funciones del proceso de verificacion manual ---------------------------------------------------------------
		495
		496	def readOuput_manual_check(self):
		497	self.txtProgress.setText("stdout check: " + QtCore.QString(self.process_manual_check.readAllStandardOutput()))
		498
		499	def readError_manual_check(self):
		500	self.txtProgress.setText("stderr check: " + QtCore.QString(self.process_manual_check.readAllStandardError()))
		501
		502	def finished_manual_check(self):
		503	self.txtProgress.clear()
		504
		505	if not(self.bool_state_manual_check):
		506	return
		507
		508	if self.process_manual_check.exitCode() == 0:
		509	self.txtInfo.append("--------Complete checking, disc: "+str(self.var_n_check_dirs + 1))
		510	functions2.update_message(2, "CHECKED", self, index=self.var_n_check_dirs)
		511
		512	else:
		513	self.txtInfo.append("#######Error checking, disc: "+str(self.var_n_check_dirs + 1)
		514	+", code "+QtCore.QString(self.process_manual_check.exitCode()))
		515	functions2.update_message(2, "ERROR", self, index=self.var_n_check_dirs)
		516
		517	#borrar el contenido de tmpdata
		518	var_tmpdata=self.var_Rpath+"/tmpdata"
		519
		520	bool_return = functions.remove_dir(var_tmpdata, self)
		521	if not(bool_return):
		522	self.txtInfo.append("Error deleting directory: "+var_tmpdata)
		523	self.bool_state_burning = False
		524	return
		525
		526	bool_return = functions.make_dir(var_tmpdata, self)
		527	if not(bool_return):
		528	self.txtInfo.append("Error creating directory:"+ var_tmpdata)
		529	self.bool_state_burning = False
		530	return
		531
		532	if self.var_n_check_dirs >= len(self.list_check_dirs) :
		533	self.bool_state_manual_check = False
		534	return
		535
		536	self.var_n_check_dirs +=1
		537	self.manual_check()
488		538
489		539
490	#==============================================================================	540	#==============================================================================
@@ -656,6 +706,8
656	self.var_TDpath= str(QtGui.QFileDialog.getExistingDirectory(self, 'Open Directory', './', QtGui.QFileDialog.ShowDirsOnly))	706	self.var_TDpath= str(QtGui.QFileDialog.getExistingDirectory(self, 'Open Directory', './', QtGui.QFileDialog.ShowDirsOnly))
657	self.txtTDpath.setText(self.var_TDpath)	707	self.txtTDpath.setText(self.var_TDpath)
658	self.statusTDpath = functions.dir_exists(self.var_TDpath, self)	708	self.statusTDpath = functions.dir_exists(self.var_TDpath, self)
		709	if self.statusTDpath:
		710	self.btnCHstart.setEnabled(True)
659		711
660		712
661	@pyqtSignature("")	713	@pyqtSignature("")
@@ -663,4 +715,44
663	"""	715	"""
664	Slot documentation goes here.	716	Slot documentation goes here.
665	"""	717	"""
666	pass	718	list_dirs = functions2.mounted_devices()
		719	if list_dirs == "FATAL ERROR":
		720	self.txtInfo.append("ERROR")
		721	return
		722
		723	for i in list_dirs:
		724	self.txtInfo.append(i)
		725
		726	self.list_check_dirs = list_dirs #contiene los directorios donde estan montados los discos a verificar
		727	self.var_n_check_dirs = 0
		728	self.bool_state_manual_check = True
		729
		730	self.btnTDpath.setEnabled(False) #Deshabilito el boton que permite cambiar la ruta de verificacion
		731	self.btnCHstart.setText("STOP") #Cambio el texto del boton
		732
		733	self.function_manual_check()
		734
		735
		736	def function_manual_check(self):
		737
		738	#Verificacion de los discos
		739	if self.bool_state_manual_check == True:
		740
		741	self.txtInfo.append("-----------manually checking disc: "+self.var_n_check_dirs
		742	+" data"+self.list_check_dirs[self.var_n_check_dirs])
		743
		744	functions2.update_message(2, "CHECKING", self, index=self.var_n_check_dirs)
		745
		746	var_data_dir = self.list_check_dirs[self.var_n_check_dirs] #Carpeta donde esta montado el disco actual
		747
		748	var_cmd = functions.cmd_manual_check(var_data_dir, self.var_TDpath)
		749
		750	if self.var_real_show_cmd == True:
		751	self.txtInfo.append("CMD: "+var_cmd)
		752
		753	if self.var_real_manual_check == False:
		754	self.txtInfo.append('**function_manual_check')
		755	var_cmd="echo 'function_manual_check'"
		756
		757	self.process_manual_check.start(var_cmd)
		758

bk_manager/trunk/ui/Ui_About.py +2 -2

             # Form implementation generated from reading ui file '/home/ricardoar/JRO_SVN/eric4/jro_backup_manager/ui/About.ui'
             #
-            # Created: Tue May 25 00:54:30 2010
+            # Created: Wed May 26 16:31:58 2010
-            #      by: PyQt4 UI code generator 4.7.2
+            #      by: PyQt4 UI code generator 4.6
             #
             # WARNING! All changes made in this file will be lost!

bk_manager/trunk/ui/Ui_MainWindow.py +6 -5

             # Form implementation generated from reading ui file '/home/ricardoar/JRO_SVN/eric4/jro_backup_manager/ui/MainWindow.ui'
             #
-            # Created: Tue May 25 00:54:29 2010
+            # Created: Wed May 26 16:31:57 2010
-            #      by: PyQt4 UI code generator 4.7.2
+            #      by: PyQt4 UI code generator 4.6
             #
             # WARNING! All changes made in this file will be lost!
             class Ui_MainWindow(object):
                 def setupUi(self, MainWindow):
                     MainWindow.setObjectName("MainWindow")
-                    MainWindow.resize(621, 717)
+                    MainWindow.resize(824, 717)
                     self.centralwidget = QtGui.QWidget(MainWindow)
                     self.centralwidget.setObjectName("centralwidget")
                     self.verticalLayout = QtGui.QVBoxLayout(self.centralwidget)
                     self.horizontalLayout_17.addItem(spacerItem13)
                     self.txtTDpath = QtGui.QLineEdit(self.tabStatus)
                     self.txtTDpath.setEnabled(False)
+                    self.txtTDpath.setReadOnly(True)
                     self.txtTDpath.setObjectName("txtTDpath")
                     self.horizontalLayout_17.addWidget(self.txtTDpath)
                     self.btnTDpath = QtGui.QPushButton(self.tabStatus)
                     self.verticalLayout.addLayout(self.horizontalLayout_2)
                     MainWindow.setCentralWidget(self.centralwidget)
                     self.menubar = QtGui.QMenuBar(MainWindow)
-                    self.menubar.setGeometry(QtCore.QRect(0, 0, 621, 21))
+                    self.menubar.setGeometry(QtCore.QRect(0, 0, 824, 25))
                     self.menubar.setObjectName("menubar")
                     self.menuFile = QtGui.QMenu(self.menubar)
                     self.menuFile.setObjectName("menuFile")
                     self.menubar.addAction(self.menuHelp.menuAction())
                     self.retranslateUi(MainWindow)
-                    self.tabWidget.setCurrentIndex(0)
+                    self.tabWidget.setCurrentIndex(2)
                     self.lstDcapacity.setCurrentIndex(2)
                     QtCore.QObject.connect(self.actionQuit, QtCore.SIGNAL("triggered()"), MainWindow.close)
                     QtCore.QObject.connect(self.chkCheck, QtCore.SIGNAL("toggled(bool)"), self.txtTDpath.setEnabled)

bk_manager/trunk/ui/Ui_Parameters.py +2 -2

             # Form implementation generated from reading ui file '/home/ricardoar/JRO_SVN/eric4/jro_backup_manager/ui/Parameters.ui'
             #
-            # Created: Tue May 25 00:54:30 2010
+            # Created: Wed May 26 16:31:58 2010
-            #      by: PyQt4 UI code generator 4.7.2
+            #      by: PyQt4 UI code generator 4.6
             #
             # WARNING! All changes made in this file will be lost!

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