# SVN changeset patch
# User ralonso
# Date 2010-05-17 05:58:25.953949
# Revision 45
Empezando con la funcion mas grande, y creacion de archivo de conf
Index: bk_manager/trunk/functions/func_doc.py
===================================================================
diff --git a/bk_manager/trunk/functions/func_doc.py b/bk_manager/trunk/functions/func_doc.py
new file mode 10644
--- /dev/null (revision 0)
+++ b/bk_manager/trunk/functions/func_doc.py (revision 45)
@@ -0,0 +1,6 @@
+#Usando el modulo "subprocess", eric4 pide seleccion del tipo de subproceso (padre o hijo)
+#por ello se prefiere usar el modulo "commands"
+#p1= Popen(['find', var_Dpath, '-name', '*.r'], stdout=PIPE)
+#p2= Popen(['awk', '-F/', '{print substr($NF,2,7)}'], stdin=p1.stdout, stdout=PIPE)
+#output_p2= p2.communicate()[0]
+#self.txtInfo.setText(output_p2)
Index: bk_manager/trunk/functions/functions.py
===================================================================
diff --git a/bk_manager/trunk/functions/functions.py b/bk_manager/trunk/functions/functions.py
--- a/bk_manager/trunk/functions/functions.py (revision 44)
+++ b/bk_manager/trunk/functions/functions.py (revision 45)
@@ -59,8 +59,9 @@
#Si no se encuentra ningun archivo
if len(output) == 0:
- self.btnGbkp.setEnabled(False)
- return
+ self.txtInfo.append("No se encontraron archivos")
+ self.btnGbkp.setEnabled(False)
+ return
#Se cargan las listas para seleccionar StartDay y StopDay (QComboBox)
for i in range(0, (len(output)+1)/8):
@@ -72,5 +73,20 @@
self.lstStopDay.setCurrentIndex(self.lstStartDay.count()-1)
self.btnGbkp.setEnabled(True)
+
+
+#Verifica que los parametros
+def validate_parameters(self):
+ #Verifica que las rutas sean validas
+ if self.statusRpath == False:
+ self.txtInfo.append("Ruta de proyecto no valida")
+ return False
+ #Verifica la etiqueta
+ if len(self.var_Elabel) == 0:
+ self.txtInfo.append("Debe ingresar el nombre de la etiqueta")
+ return False
+
+ return True
+
Index: bk_manager/trunk/ui/MainWindow.py
===================================================================
diff --git a/bk_manager/trunk/ui/MainWindow.py b/bk_manager/trunk/ui/MainWindow.py
--- a/bk_manager/trunk/ui/MainWindow.py (revision 44)
+++ b/bk_manager/trunk/ui/MainWindow.py (revision 45)
@@ -37,6 +37,7 @@
self.var_Dtype = self.txtDtype.text()
self.var_Elabel = self.txtElabel.text()
self.var_Copys = self.txtCopys.value()
+ self.var_Dcapacity = self.txtDcapacity.value()
self.var_n_files=0
self.var_list=[]
@@ -115,13 +116,24 @@
@pyqtSignature("")
def on_txtDtype_editingFinished(self):
- """
- Se activa cuando el tipo de archivo es ingresado manualmente
- """
self.var_Dtype=self.txtDtype.text()
- #llamada a funcion
- self.on_txtDpath_editingFinished()
-
+ functions.load_days(self) #llamada a funcion
+
+
+ @pyqtSignature("")
+ def on_txtElabel_editingFinished(self):
+ self.var_Elabel = self.txtElabel.text()
+
+
+ @pyqtSignature("")
+ def on_txtCopys_editingFinished(self):
+ self.var_Copys = self.txtCopys.value()
+
+
+ @pyqtSignature("")
+ def on_txtDcapacity_editingFinished(self):
+ self.var_Dcapacity = self.txtDcapacity.value()
+
@pyqtSignature("int") #CLOSED
def on_lstStartDay_activated(self, index):
@@ -167,10 +179,10 @@
var_size=0.7
if index != 4:
- self.txtDcapacity.setText(str(var_size*10**9/1024**2))
+ self.txtDcapacity.setValue(var_size*10**9/1024**2)
self.txtDcapacity.setReadOnly(True)
else:
- self.txtDcapacity.setText('')
+ self.txtDcapacity.setValue(100.0)
self.txtDcapacity.setReadOnly(False)
@@ -180,23 +192,15 @@
Cuando se presiona el boton btnGbkp
"""
- #Verifica que las rutas sean validas
- if self.statusDpath == False or self.statusRpath == False:
- if self.statusDpath == False:
- self.txtInfo.append("Ruta de datos no valida")
- if self.statusRpath == False:
- self.txtInfo.append("Ruta de proyecto no valida")
+ if functions.validate_parameters(self) == False:
return
#Crea las carpetas en la ruta del proyecto y verifica que se crearon correctamente
- var_Rpath=self.txtRpath.text()
list_dirs=['gpath', 'iso', 'ppath']
- functions.make_dirs(var_Rpath, list_dirs, self)
+ functions.make_dirs(self.var_Rpath, list_dirs, self)
#Cargando variables con los parametros
- var_Dpath=self.txtDpath.text()
- var_Rpath=self.txtRpath.text()
- var_Rpath_ppath=var_Rpath+"/ppath" #Ruta de los archivos a grabar
+ var_Rpath_ppath=self.var_Rpath+"/ppath" #Ruta de los archivos a grabar
var_sublist=[]
for i in self.var_list[self.lstStartDay.currentIndex():self.lstStartDay.currentIndex() + self.lstStopDay.currentIndex()+1]:
var_sublist.append(i)
@@ -212,7 +216,7 @@
#Busca los archivos con los parametros de busqueda
var_files_list=[]
for var_doy in var_sublist:
- var_cmd="find " + str(var_Dpath) + " -name ?"+var_doy+"???."+ str(var_Dtype) + " |sort"
+ var_cmd="find " + str(self.var_Dpath) + " -name ?"+var_doy+"???."+ str(var_Dtype) + " |sort"
var_output=commands.getstatusoutput(var_cmd)[1]
for var_file in var_output.split():
var_files_list.append(var_file) #Almacena cada archivo en la lista
@@ -235,7 +239,7 @@
var_file = open(var_Rpath_ppath+"/"+self.txtElabel.text()+"_"+functions.i2s(var_n)+".dat","w")
#Se añade la lista de archivos a grabar en el DVD al archivo .dat
for line in var_files_list_2:
- var_tmp_path=(line.split(var_Dpath)[1]).split('/')
+ var_tmp_path=(line.split(self.var_Dpath)[1]).split('/')
var_tmp_path2="/"
for l in range(0, len(var_tmp_path)-1):
var_tmp_path2=var_tmp_path2+str(var_tmp_path[l])+"/"
@@ -252,7 +256,7 @@
var_file = open(var_Rpath_ppath+"/"+self.txtElabel.text()+"_"+functions.i2s(var_n)+".dat","w")
#Se añade la lista de archivos a grabar en el DVD al archivo .dat
for line in var_files_list_2:
- var_tmp_path=(line.split(var_Dpath)[1]).split('/')
+ var_tmp_path=(line.split(self.var_Dpath)[1]).split('/')
var_tmp_path2="/"
for l in range(0, len(var_tmp_path)-1):
var_tmp_path2=var_tmp_path2+str(var_tmp_path[l])+"/"
@@ -324,7 +328,10 @@
#Se deshabilita el Tab Parameters y el boton btnGbkp
self.tabParameters.setEnabled(False)
- self.btnGbkp.setEnabled(False)
+ self.lstDcapacity.setEnabled(False)
+ self.txtDcapacity.setEnabled(False)
+ self.btnGbkp.setEnabled(False)
+ self.btnRestart.setEnabled(True)
@pyqtSignature("")
@@ -333,7 +340,10 @@
Slot documentation goes here.
"""
self.tabParameters.setEnabled(True)
+ self.lstDcapacity.setEnabled(True)
+ self.txtDcapacity.setEnabled(True)
self.btnGbkp.setEnabled(True)
+ self.btnRestart.setEnabled(False)
@pyqtSignature("")
@@ -404,3 +414,5 @@
var_dev = str(self.txtDeviceD.text())
var_cmd = 'eject ' + var_dev + '; eject -t ' + var_dev
commands.getstatusoutput(var_cmd)
+
+
Index: bk_manager/trunk/ui/MainWindow.ui
===================================================================
diff --git a/bk_manager/trunk/ui/MainWindow.ui b/bk_manager/trunk/ui/MainWindow.ui
--- a/bk_manager/trunk/ui/MainWindow.ui (revision 44)
+++ b/bk_manager/trunk/ui/MainWindow.ui (revision 45)
@@ -500,7 +500,7 @@
- Device Capacity
+ Device Capacity (MB)
@@ -557,12 +557,24 @@
-
-
-
- 4482.26928711
+
+
+
+ 0
+ 0
+
true
+
+
+ 100.000000000000000
+
+
+ 99999.990000000005239
+
+
+ 4482.270000000000437
@@ -832,7 +844,6 @@
chkSequentially
chkSalert
lstDcapacity
- txtDcapacity
chkPSgraphic
lineEdit_17
txtSTATUSa
Index: bk_manager/trunk/ui/Ui_MainWindow.py
===================================================================
diff --git a/bk_manager/trunk/ui/Ui_MainWindow.py b/bk_manager/trunk/ui/Ui_MainWindow.py
--- a/bk_manager/trunk/ui/Ui_MainWindow.py (revision 44)
+++ b/bk_manager/trunk/ui/Ui_MainWindow.py (revision 45)
@@ -2,7 +2,7 @@
# Form implementation generated from reading ui file '/home/ricardoar/JRO_SVN/eric4/jro_backup_manager/ui/MainWindow.ui'
#
-# Created: Sun May 16 22:58:10 2010
+# Created: Mon May 17 00:37:27 2010
# by: PyQt4 UI code generator 4.7.2
#
# WARNING! All changes made in this file will be lost!
@@ -312,8 +312,16 @@
self.lstDcapacity.addItem("")
self.lstDcapacity.addItem("")
self.horizontalLayout_10.addWidget(self.lstDcapacity)
- self.txtDcapacity = QtGui.QLineEdit(self.tabDconfig)
+ self.txtDcapacity = QtGui.QDoubleSpinBox(self.tabDconfig)
+ sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Fixed)
+ sizePolicy.setHorizontalStretch(0)
+ sizePolicy.setVerticalStretch(0)
+ sizePolicy.setHeightForWidth(self.txtDcapacity.sizePolicy().hasHeightForWidth())
+ self.txtDcapacity.setSizePolicy(sizePolicy)
self.txtDcapacity.setReadOnly(True)
+ self.txtDcapacity.setMinimum(100.0)
+ self.txtDcapacity.setMaximum(99999.99)
+ self.txtDcapacity.setProperty("value", 4482.27)
self.txtDcapacity.setObjectName("txtDcapacity")
self.horizontalLayout_10.addWidget(self.txtDcapacity)
self.chkPSgraphic = QtGui.QCheckBox(self.tabDconfig)
@@ -482,8 +490,7 @@
MainWindow.setTabOrder(self.chkSimultaneously, self.chkSequentially)
MainWindow.setTabOrder(self.chkSequentially, self.chkSalert)
MainWindow.setTabOrder(self.chkSalert, self.lstDcapacity)
- MainWindow.setTabOrder(self.lstDcapacity, self.txtDcapacity)
- MainWindow.setTabOrder(self.txtDcapacity, self.chkPSgraphic)
+ MainWindow.setTabOrder(self.lstDcapacity, self.chkPSgraphic)
MainWindow.setTabOrder(self.chkPSgraphic, self.lineEdit_17)
MainWindow.setTabOrder(self.lineEdit_17, self.txtSTATUSa)
MainWindow.setTabOrder(self.txtSTATUSa, self.txtSTATUSb)
@@ -542,14 +549,13 @@
self.lblBprocess.setText(QtGui.QApplication.translate("MainWindow", "Burning process", None, QtGui.QApplication.UnicodeUTF8))
self.chkSimultaneously.setText(QtGui.QApplication.translate("MainWindow", "Simultaneously", None, QtGui.QApplication.UnicodeUTF8))
self.chkSequentially.setText(QtGui.QApplication.translate("MainWindow", "Sequentially", None, QtGui.QApplication.UnicodeUTF8))
- self.lblDcapacity.setText(QtGui.QApplication.translate("MainWindow", "Device Capacity", None, QtGui.QApplication.UnicodeUTF8))
+ self.lblDcapacity.setText(QtGui.QApplication.translate("MainWindow", "Device Capacity (MB)", None, QtGui.QApplication.UnicodeUTF8))
self.chkSalert.setText(QtGui.QApplication.translate("MainWindow", "Sound Alert", None, QtGui.QApplication.UnicodeUTF8))
self.lstDcapacity.setItemText(0, QtGui.QApplication.translate("MainWindow", "BluRay [25.0 GB]", None, QtGui.QApplication.UnicodeUTF8))
self.lstDcapacity.setItemText(1, QtGui.QApplication.translate("MainWindow", "DVD2 [8.5 GB]", None, QtGui.QApplication.UnicodeUTF8))
self.lstDcapacity.setItemText(2, QtGui.QApplication.translate("MainWindow", "DVD1 [4.7 GB]", None, QtGui.QApplication.UnicodeUTF8))
self.lstDcapacity.setItemText(3, QtGui.QApplication.translate("MainWindow", "CD [0.7 GB]", None, QtGui.QApplication.UnicodeUTF8))
self.lstDcapacity.setItemText(4, QtGui.QApplication.translate("MainWindow", "Other [? GB]", None, QtGui.QApplication.UnicodeUTF8))
- self.txtDcapacity.setText(QtGui.QApplication.translate("MainWindow", "4482.26928711", None, QtGui.QApplication.UnicodeUTF8))
self.chkPSgraphic.setText(QtGui.QApplication.translate("MainWindow", "PS Graphic", None, QtGui.QApplication.UnicodeUTF8))
self.tabWidget.setTabText(self.tabWidget.indexOf(self.tabDconfig), QtGui.QApplication.translate("MainWindow", "Device Config.", None, QtGui.QApplication.UnicodeUTF8))
self.lblSTATUS.setText(QtGui.QApplication.translate("MainWindow", "STATUS", None, QtGui.QApplication.UnicodeUTF8))