Changeset 2684 for lliurex-up/trunk/fuentes/lliurex-up-gui

Timestamp:

Oct 26, 2016, 2:03:04 PM (4 years ago)

Author:

jrpelegrina

Message:

WIP in gui

File:

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

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

@@ -79 +79 @@
         
         def parse_installed_icon(self, icon_file):
+                
                         image=Gtk.Image()
                         image.set_from_file(icon_file)          
@@ -88 +89 @@
 
         def __init__(self):
-
 
                 self.start_gui()
@@ -237 +237 @@
                 self.t.daemon=True
                 self.t.start()
-                self.no_mirror=False
+                
 
                 self.package_list=[]
@@ -363 +363 @@
                 msg_gather="<span><b>"+_("Checking for new version of lliurex-up")+"</b></span>"
                 self.gather_label.set_markup(msg_gather)
-                time.sleep(2)
+
+
+                is_lliurexup_update=False #Call to the function to get the version of lliurex-up
+                time.sleep(1)
+
+                if not is_lliurexup_update:
+                        msg_gather="<span><b>"+_("Updating lliurex-up")+"</b></span>"
+                        self.gather_label.set_markup(msg_gather)
+                        is_lliurexup_updated=True # Call to the function to updates lliurex-up
+
+                        while not is_lliurexup_updated:
+                                pass
+
+                        return True
+
+                else:
+                        return True
+        
+        #def check_lliurexup_version
+
+        def check_mirror(self):
+                self.response=-1
+                msg_gather="<span><b>"+_("Checking if mirror exist and there is updated")+"</b></span>"
+                self.gather_label.set_markup(msg_gather)
+                
+                exist_mirror=False #Call to the function to check mirror
+                time.sleep(1)
+                if not exist_mirror:
+                        self.yes_button_box.show()
+                        self.no_button_box.show()
+                        msg_gather="<span><b>"+_("Do you want to create or update your mirror?")+"</b></span>"
+                        self.gather_label.set_markup(msg_gather)
+                
+                        while self.response==-1:
+                                pass
+
+                        self.yes_button_box.hide()
+                        self.no_button_box.hide()       
+
+                        if self.response==0:
+                                return True
+
+                        elif self.response==1:
+                                msg_gather="<span><b>"+_("Updating mirror")+"</b></span>"
+                                self.gather_label.set_markup(msg_gather)
+                        
+                                is_mirror_updated=True # Call to the function to update mirror
+                                time.sleep(1)
+
+                                while is_mirror_updated==False:
+                                        pass
+                
                 return True
-        
-        #def check_lliurexup_version
-
-        def check_mirror(self):
-                print "Checking mirror"
-                self.response=-1
-                t=0
-                self.yes_button_box.show()
-                self.no_button_box.show()
-                msg_gather="<span><b>"+_("Do you want to update your mirror?")+"</b></span>"
-                self.gather_label.set_markup(msg_gather)
-                
-                while self.response==-1:
-                        time.sleep(t)
-                        t=t+1
-
-                self.yes_button_box.hide()
-                self.no_button_box.hide()       
-                return True
 
         #def check_mirror
@@ -389 +421 @@
         def gather_info(self):
 
-                self.check_lliurexup_version()
-                self.check_mirror()
-                                
+                check_lliurexup=self.check_lliurexup_version()
+                check_mirror=self.check_mirror()
+                
+                while  (not check_lliurexup) & (not check_mirror):              
+                        pass
 
                 msg_gather="<span><b>"+_("Checking for new updates")+"</b></span>"
                 self.gather_label.set_markup(msg_gather)
                 
-                #p=subprocess.Popen([cmd],shell=True,stdout=subprocess.PIPE,stderr=subprocess.PIPE)     
-                #output=p.communicate() 
                 try:
                         p1=subprocess.Popen(["llxcfg-upgrade-version-scripts","details"],stdout=subprocess.PIPE,stderr=subprocess.PIPE)
@@ -498 +530 @@
                 )
 
-                self.update_installed_icon()
+                self.update_installed_icon("epoptes-client")
         
         #def execute            
                                 
         def install_packages(self,widget, event=None):
+
                 self.t=threading.Thread(target=self.execute,args=())
                 self.t.daemon=True
@@ -518 +551 @@
 
         def get_update_info(self):
+
                 self.version_available="16.160916"
                 self.version_update="16.160915"
@@ -538 +572 @@
 
         def pulsate_pbar(self):
+
                 if not self.t.is_alive():
                         self.pbar.pulse()
@@ -546 +581 @@
                         
         def view_packages_clicked(self,widget,event):
+
                 self.stack.set_transition_type(Gtk.StackTransitionType.SLIDE_LEFT)
                 self.stack.set_visible_child_name("packages")
@@ -554 +590 @@
         def no_button_clicked(self,widget,event):
                 
-                self.response=1 
+                self.response=0 
                 
         def yes_button_clicked(self,widget,event):
-                
-                msg_gather="<span><b>"+_("Updating mirror in progess?")+"</b></span>"
-                self.gather_label.set_markup(msg_gather)
-                self.yes_button_box.hide()
-                self.no_button_box.hide()
-                
-                command='/usr/share/lliurex-flavours-selector/lliurex-flavours-selector.py'
-                p=subprocess.Popen([command],shell=True,stdout=subprocess.PIPE,stderr=subprocess.PIPE)  
-                output=p.communicate()
-                self.thread_ret=p.returncode
-                self.flavour_error=output[1]
-                
-                
-                if self.thread_ret==0:
-                        self.response=1
+        
+                self.response=1
                 
         #def no_button_clicked  
 
         def arrow_clicked(self,widget,event):
+        
                 self.stack.set_transition_type(Gtk.StackTransitionType.SLIDE_RIGHT)
                 self.stack.set_visible_child_name("update")     
@@ -581 +605 @@
         #def arrow_clicked
 
-        def update_installed_icon(self):
+        def update_installed_icon(self,pkg_name):
+        
                 image=Gtk.Image()
-                image.set_from_file(ERROR_ICON)         
+                image.set_from_file(DONE_ICON)          
                 icon=image.get_pixbuf()
 
                 for item in self.packages_store:
-                        item[3]=icon
+                        name=item[1].split(">")[2]
+                        name=name.split("<")[0]
+                        if name==pkg_name:
+                                item[3]=icon
+                
                         
         #def update_installed_icon