jro_apps/bk_manager Commit - r56:57 · Jicamarca Repository

redefiniendo parte grabacion

ralonso -

r56:57

parent child

bk_manager/trunk/functions/functions.py +7 -15

                         var_file = open(var_Rpath_ppath+"/"+self.var_Elabel+"_"+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(self.var_Dpath)[1]).split('/')
+                            var_tmp_path=line.split(self.var_Dpath)[1][:-13]
-                            var_tmp_path2="/"
+                            var_file.write(var_tmp_path+'='+line+'\n')
-                            for l in range(0, len(var_tmp_path)-1):
-                                var_tmp_path2=var_tmp_path2+str(var_tmp_path[l])+"/"
-                            var_file.write(var_tmp_path2+'=')
-                            var_file.write(line+'\n')
                         var_file.close()
                         var_tmp = var_size_i #Se asigna a la variable el tamaño del archivo actual
                 var_file = open(var_Rpath_ppath+"/"+self.var_Elabel+"_"+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(self.var_Dpath)[1]).split('/')
+                    var_tmp_path=line.split(self.var_Dpath)[1][:-13]
-                    var_tmp_path2="/"
+                    var_file.write(var_tmp_path+'='+line+'\n')
-                    for l in range(0, len(var_tmp_path)-1):
-                        var_tmp_path2=var_tmp_path2+str(var_tmp_path[l])+"/"
-                    var_file.write(var_tmp_path2+'=')
-                    var_file.write(line+'\n')
                 var_file.close()
                 return var_n
                             if var_first_folder == '/':
                                 var_folder = self.var_Elabel
                             else:
-                                var_folder = var_first_folder.split('/')[1]
+                                var_folder = var_first_folder.split('/')[-2]
                             var_file_print.write(var_first_file[-12:-8]+" "+var_first_file[-8:-5]+" "+var_folder +" "+var_first_file[-5:-2]+" "
                                     +var_last_file[-5:-2]+" "+var_date_first_file+" "+var_date_last_file+"\n")
                     if var_first_folder == '/':
                         var_folder = self.txtElabel.text()
                     else:
-                        var_folder = var_first_folder.split('/')[1]
+                        var_folder = var_first_folder.split('/')[-2]
                     var_file_print.write(var_first_file[-12:-8]+" "+var_first_file[-8:-5]+" "+var_folder +" "+var_first_file[-5:-2]+" "
                             +var_last_file[-5:-2]+" "+var_date_first_file+" "+var_date_last_file+"\n")

bk_manager/trunk/functions/functions2.py +38 -34

@@ -6,19 +6,7
6	import os	6	import os
7	import subprocess	7	import subprocess
8	import commands	8	import commands
9		9
10
11	def set_parameters(self):
12	"""
13	Se usa para inicializar ciertos parametros para pruebas
14	"""
15	self.txtDpath.setText('/home/ricardoar/optional/STORAGE/EW_DRIFTS')
16	self.txtRpath.setText('/home/ricardoar/optional/prueba1_jro_backup_manager')
17	self.txtElabel.setText('EW_DRIFTS_pruebas')
18	self.lstDcapacity.setCurrentIndex(4)
19	self.txtDcapacity.setValue(250.0)
20	self.txtDcapacity.setReadOnly(False)
21
22		10
23	def detect_devices(self):	11	def detect_devices(self):
24	"""	12	"""
@@ -60,18 +48,20
60	self.chkDevD.setChecked(False)	48	self.chkDevD.setChecked(False)
61	self.chkDevD.setEnabled(False)	49	self.chkDevD.setEnabled(False)
62		50
63	def enabled_items1(var_bool, self):	51	def set_parameters_test(self):
64	self.tabParameters.setEnabled(not(var_bool))	52	"""
65	self.lstDcapacity.setEnabled(not(var_bool))	53	Se usa para inicializar ciertos parametros para pruebas
66	self.txtDcapacity.setEnabled(not(var_bool))	54	"""
67	self.btnGbkp.setEnabled(not(var_bool))	55	self.txtDpath.setText('/home/ricardoar/optional/STORAGE/EW_DRIFTS')
68	self.btnRestart.setEnabled(var_bool)	56	self.txtRpath.setText('/home/ricardoar/optional/prueba1_jro_backup_manager')
69	self.btnStartburn.setEnabled(var_bool)	57	self.txtElabel.setText('EW_DRIFTS_pruebas')
		58	self.lstDcapacity.setCurrentIndex(4)
		59	self.txtDcapacity.setValue(250.0)
		60	self.txtDcapacity.setReadOnly(False)
70		61
71		62
72	def make_parameters_conf(self):	63	def make_parameters_conf(self):
73	var_file = open("parameters.conf","w")	64	var_file = open("parameters.conf","w")
74
75	var_file.write(self.var_Dpath+"\n") #0	65	var_file.write(self.var_Dpath+"\n") #0
76	var_file.write(self.var_Rpath+"\n") #1	66	var_file.write(self.var_Rpath+"\n") #1
77	var_file.write(str(self.var_lstDtype)+"\n") #2	67	var_file.write(str(self.var_lstDtype)+"\n") #2
@@ -80,14 +70,13
80	var_file.write(str(self.var_Copys)+"\n") #5	70	var_file.write(str(self.var_Copys)+"\n") #5
81	var_file.write(str(self.var_lstDcapacity)+"\n") #6	71	var_file.write(str(self.var_lstDcapacity)+"\n") #6
82	var_file.write(str(self.var_Dcapacity)+"\n") #7	72	var_file.write(str(self.var_Dcapacity)+"\n") #7
83		73	var_file.write(str(self.var_n_discs)) #8
84	var_file.close()	74	var_file.close()
85		75
86		76
87	def get_parameters_conf(self):	77	def get_parameters_conf(self):
88	var_file = open("parameters.conf","r")	78	var_file = open("parameters.conf","r")
89	lines = var_file.readlines()	79	lines = var_file.readlines()
90
91	self.txtDpath.setText(lines[0][:-1]) #0	80	self.txtDpath.setText(lines[0][:-1]) #0
92	self.txtRpath.setText(lines[1][:-1]) #1	81	self.txtRpath.setText(lines[1][:-1]) #1
93	self.lstDtype.setCurrentIndex(int(lines[2])) #2	82	self.lstDtype.setCurrentIndex(int(lines[2])) #2
@@ -95,17 +84,32
95	self.txtElabel.setText(lines[4][:-1]) #4	84	self.txtElabel.setText(lines[4][:-1]) #4
96	self.txtCopys.setValue(int(lines[5][:-1])) #5	85	self.txtCopys.setValue(int(lines[5][:-1])) #5
97	self.lstDcapacity.setCurrentIndex(int(lines[6])) #6	86	self.lstDcapacity.setCurrentIndex(int(lines[6])) #6
98	self.txtDcapacity.setValue(float(lines[7]))	87	self.txtDcapacity.setValue(float(lines[7])) #7
99		88	self.var_n_discs = int(lines[8]) # 8
100	var_file.close()	89	var_file.close()
101		90
		91
102	def set_vars(self):	92	def set_vars(self):
103	self.var_Dpath = self.txtDpath.text()	93	self.var_Dpath = self.txtDpath.text() #0
104	self.var_Rpath = self.txtRpath.text()	94	self.var_Rpath = self.txtRpath.text() #1
105	self.var_lstDtype = self.lstDtype.currentIndex()	95	self.var_lstDtype = self.lstDtype.currentIndex() #2
106	self.var_Dtype = self.txtDtype.text()	96	self.var_Dtype = self.txtDtype.text() #3
107	self.var_Elabel = self.txtElabel.text()	97	self.var_Elabel = self.txtElabel.text() #4
108	self.var_Copys = self.txtCopys.value()	98	self.var_Copys = self.txtCopys.value() #5
109	self.var_lstDcapacity = self.lstDcapacity.currentIndex()	99	self.var_lstDcapacity = self.lstDcapacity.currentIndex() #6
110	self.var_Dcapacity = self.txtDcapacity.value()	100	self.var_Dcapacity = self.txtDcapacity.value() #7
111		101
		102
		103	def enabled_items1(var_bool, self):
		104	self.tabParameters.setEnabled(not(var_bool))
		105	self.lstDcapacity.setEnabled(not(var_bool))
		106	self.txtDcapacity.setEnabled(not(var_bool))
		107	self.btnGbkp.setEnabled(not(var_bool))
		108	self.btnRestart.setEnabled(var_bool)
		109	self.btnStartburn.setEnabled(var_bool)
		110
		111
		112	def enabled_items2(var_bool, self):
		113	self.btnRestart.setEnabled(not(var_bool))
		114	self.btnStartburn.setEnabled(not(var_bool))
		115	self.btnStopburn.setEnabled(var_bool)

bk_manager/trunk/ui/MainWindow.py +21 -31

             from subprocess import *
             import sys
             import os
-            import subprocess
+            #import subprocess
             import commands
             from functions import functions
             from functions import functions2
                     functions2.detect_devices(self) #busca los dispositivos de grabacion
+                    self.var_n_discs=0
+                    self.var_list=[]
+                    self.var_sublist=[]
                     #Revisa si existe el archivo de confirguracion
                     if os.path.isfile("parameters.conf"):
                         self.txtInfo.append("Archivo de configuracion encontrado")
                         functions2.get_parameters_conf(self)
+                        self.txtInfo.append("El proyecto creara "+str(self.var_n_discs)+" DVDs")
                     else:
                         self.txtInfo.append("Elija los parametros de configuracion")
-                        functions2.set_parameters(self) #Establece ciertos parametros, para pruebas
+                        functions2.set_parameters_test(self) #Establece ciertos parametros, para pruebas
                     functions2.set_vars(self) #Carga las variables de la clase con los parametros seleccionados
                     self.statusDpath = functions.dir_exists(self.var_Dpath,  self)
                     self.statusRpath = functions.dir_exists(self.var_Rpath,  self)
-                    self.var_n_discs=0
-                    self.var_list=[]
-                    self.var_sublist=[]
                     functions.load_days(self)
                     self.var_process = QtCore.QProcess()
                     self.connect(self.var_process,  QtCore.SIGNAL('readyReadStandardError()'),  self.readError)
                     self.connect(self.var_process,  QtCore.SIGNAL('finished(int,QProcess::ExitStatus)'),  self.finished)
+                def write(self, txt):
+                    self.txtInfo.append(str(txt))
+            #----------------------------------------------------- Funciones del proceso ---------------------------------------------------------------
                 def readOuput(self):
                     self.txtSburn.insertPlainText("stdout: " + QtCore.QString(self.var_process.readAllStandardOutput()))
                 def readError(self):
                     self.txtSburn.insertPlainText("stderr: " + QtCore.QString(self.var_process.readAllStandardError()))
                 def finished(self):
-                    self.txtInfo.append("proceso terminado finished()")
+                    self.txtInfo.append("proceso terminado finished() "+QtCore.QString(self.var_process.exitCode()))
-                    print self.var_process.exitCode()
-                def write(self, txt):
-                    self.txtInfo.append(str(txt))
             #----------------------------------------------------- Obtencion de las ruta de los datos  ---------------------------------------------------------------
                     """
                     Se inicia el proceso de grabacion
                     """
-                    self.btnRestart.setEnabled(False)
+                    functions2.enabled_items2(True, self)
-                    self.btnStartburn.setEnabled(False)
-                    self.btnStopburn.setEnabled(True)
                     sys.stdout = self
                     #sys.stderr = self
                     print "stdout_!!!"
                     #Inicializando variables
                     var_Rpath_ppath=self.var_Rpath+"/ppath"
                     var_Rpath_iso=self.var_Rpath+"/iso"
                     var_cmd += ' -A '+self.var_Elabel+' -V '+self.var_Elabel
                     var_cmd += ' -graft-points -path-list '+ file_dat+' -o '+file_iso
-            #        self.process.start(var_cmd)
                     self.var_process.start(var_cmd)
-            #        self.var_process.waitForFinished()
                     self.txtInfo.append("ejecutandose")
             #            var_cmd += ' -graft-points -path-list '+ file_dat+' -o '+file_iso
             #            self.txtInfo.append(var_cmd)
             #
-            #            var_output=commands.getstatusoutput(str(var_cmd))[0]
-            #            self.txtInfo.append(str(var_output))
-                    #os.system(str(var_cmd))
-                    #p = subprocess.Popen(str('ls /'), shell=True,  stdout=self)
-                    #os.waitpid(p.pid, 0)
-                    ####self.txtInfo.append(str(p.pid))
             #----------------------------------------------------- Detener proceso de grabacion ---------------------------------------------------------------
                     """
                     Slot documentation goes here.
                     """
-                    self.var_process.terminate()
+                    self.var_process.terminate() #Termina el proceso, si puede
-                    self.btnRestart.setEnabled(True)
+                    functions2.enabled_items2(False, self)
-                    self.btnStartburn.setEnabled(True)
-                    self.btnStopburn.setEnabled(False)
             #----------------------------------------------------- Testeo de las unidades de grabacion ---------------------------------------------------------------

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