Changeset 2689 for lliurex-up/trunk

Timestamp:

Oct 26, 2016, 6:36:47 PM (4 years ago)

Author:

jrpelegrina

Message:

WIP in gui

File:

• lliurex-up/trunk/fuentes/lliurex-up-gui/lliurex-up (modified) (17 diffs)

lliurex-up/trunk/fuentes/lliurex-up-gui/lliurex-up

@@ -146 +146 @@
                 self.update_button_eb=builder.get_object("update_button_eventbox")
                 self.update_button_eb.add_events(Gdk.EventMask.BUTTON_RELEASE_MASK)
-                self.update_button_eb.connect("button-release-event", self.install_packages)
+                self.update_button_eb.connect("button-release-event", self.upgrade_process)
                 self.update_button_label=builder.get_object("update_button_label")
                 self.terminal_label=builder.get_object("terminal_label")
@@ -230 +230 @@
                 self.set_css_info()
                 
-
-
                 GLib.timeout_add(100,self.pulsate_gathering_info)
                 
@@ -238 +236 @@
                 self.t.start()
                 
-
                 self.package_list=[]
 
@@ -365 +362 @@
 
 
-                is_lliurexup_update=False #Call to the function to get the version of lliurex-up
+                is_lliurexup_update=True #Call to the function to get the version of lliurex-up
                 time.sleep(1)
 
@@ -375 +372 @@
                         while not is_lliurexup_updated:
                                 pass
-
+                        os.execl(sys.executable, sys.executable, *sys.argv)     
+                        self.updated_percentage(1.0)
                         return True
 
                 else:
+                        self.updated_percentage(1.0)
                         return True
         
@@ -384 +383 @@
 
         def check_mirror(self):
+
                 self.response=-1
                 msg_gather="<span><b>"+_("Checking if mirror exist and there is updated")+"</b></span>"
@@ -403 +403 @@
 
                         if self.response==0:
+                                self.updated_percentage(1.0)
                                 return True
 
@@ -414 +415 @@
                                 while is_mirror_updated==False:
                                         pass
-                
+                                        
+                self.updated_percentage(1.0)                    
+                 
                 return True
 
@@ -420 +423 @@
         
         def gather_info(self):
-
+                
+                self.total_process=3.0
+                self.pbar_rang=1.0
+                self.percentage=0.0
+                self.updated_percentage(0.01)
+                
                 check_lliurexup=self.check_lliurexup_version()
                 check_mirror=self.check_mirror()
@@ -431 +439 @@
                 
                 try:
+                        self.updated_percentage(0.25)
                         p1=subprocess.Popen(["llxcfg-upgrade-version-scripts","details"],stdout=subprocess.PIPE,stderr=subprocess.PIPE)
                         output=p1.communicate()[0]
@@ -437 +446 @@
                                 f.write(output)
                         f.close()
-        
+                        
                 except:
                         pass 
@@ -445 +454 @@
 
         def pulsate_gathering_info(self):
-                
-                self.pbar.pulse()
-                
+
+                        
                 if not self.t.is_alive():
                         
@@ -467 +475 @@
 
                 return self.t.is_alive()        
-
-        #def pulsate_gathering_ingo     
+        
+        #def pulsate_gathering          
+        
+        def get_update_info(self):
+
+                self.version_available="16.160916"
+                self.version_update="16.160915"
+                self.number_pkg="15"
+                self.size_update="100 Mb"
+                
+                msg_version_available=_("Version available: ")+"<span foreground='#3366cc'><b>"+self.version_available+"</b></span>"
+                msg_version_update=_("Version to update: ")+"<span foreground='#3366cc'><b>"+self.version_update+"</b></span>"
+
+                msg_number=_("Number packages: ")+"<span foreground='#3366cc'><b>"+self.number_pkg+"</b></span>"
+                msg_size=_("Size of update: ")+"<span foreground='#3366cc'><b>"+self.size_update+"</b></span>"
+                
+                self.version_available_label.set_markup(msg_version_available)
+                self.version_update_label.set_markup(msg_version_update)
+                self.number_packages_label.set_markup(msg_number)
+                self.size_update_label.set_markup(msg_size)
+                
+        #def get_update_info    
+                
+        def updated_percentage(self,completed):
+                
+                self.process_block=(self.pbar_rang/self.total_process)
+                print self.process_block
+                self.percentage=self.percentage+self.process_block*completed
+                        
+                print self.percentage
+                self.pbar.set_fraction(self.percentage)
+                
+                value=self.percentage*100
+                value=format(value,'.2f')
+                
+                msg_percentage="<span><b>"+value+"%"+"</b></span>"
+                self.pbar_label.set_markup(msg_percentage)
+                
+                
+        #def updated_percentage
                 
         def populate_packages_tv(self):
@@ -497 +543 @@
                         
                 else:
-                        #to be done later
+                        
                         pass    
 
@@ -518 +564 @@
         #def package_clicked                    
 
-        def execute(self):
+        def execute_scritps(self):
                 
                 self.vterminal.spawn_sync(
@@ -534 +580 @@
         #def execute            
                                 
-        def install_packages(self,widget, event=None):
-
-                self.t=threading.Thread(target=self.execute,args=())
+        def upgrade_process(self,widget, event=None):
+                self.total_process=1.0
+                self.pbar_rang=1.0
+                self.percentage=0.0
+                self.updated_percentage(0.01)
+
+                self.t=threading.Thread(target=self.execute_scripts,args=())
                 self.t.daemon=True
                 self.t.start()
@@ -550 +600 @@
         #def install_packages
 
-        def get_update_info(self):
-
-                self.version_available="16.160916"
-                self.version_update="16.160915"
-                self.number_pkg="15"
-                self.size_update="100 Mb"
-                
-                msg_version_available=_("Version available: ")+"<span foreground='#3366cc'><b>"+self.version_available+"</b></span>"
-                msg_version_update=_("Version to update: ")+"<span foreground='#3366cc'><b>"+self.version_update+"</b></span>"
-
-                msg_number=_("Number packages: ")+"<span foreground='#3366cc'><b>"+self.number_pkg+"</b></span>"
-                msg_size=_("Size of update: ")+"<span foreground='#3366cc'><b>"+self.size_update+"</b></span>"
-                
-                self.version_available_label.set_markup(msg_version_available)
-                self.version_update_label.set_markup(msg_version_update)
-                self.number_packages_label.set_markup(msg_number)
-                self.size_update_label.set_markup(msg_size)
-                
-        #def get_update_info    
-                
-
         def pulsate_pbar(self):
 
                 if not self.t.is_alive():
-                        self.pbar.pulse()
+                        self.updated_percentage(0.5)
                 else:
                         self.pbar.hide()