Changeset 944

Timestamp:

08/06/08 19:52:38 (4 months ago)

Author:

mariodebian

Message:

tcosmonitor (0.2.16~rc3)

• New class: TcosListView?.py:
  • Move some code from TcosActions?.py (code to work with list view mode)
• New class: TcosMenus?.py:
  • Move some code from TcosActions?.py to generate menus and capture events
• Delete deprecated and comented gtk.gdk.threads_*() calls
• Update template and spanish translation

Location:

trunk/tcosmonitor

Files:

• Initialize.py (modified) (4 diffs)
• LocalData.py (modified) (5 diffs)
• Makefile (modified) (2 diffs)
• TcosActions.py (modified) (37 diffs)
• TcosClassView.py (modified) (15 diffs)
• TcosCommon.py (modified) (4 diffs)
• TcosConf.py (modified) (2 diffs)
• TcosDBus.py (modified) (10 diffs)
• TcosIconView.py (modified) (6 diffs)
• TcosListView.py (added)
• TcosMenus.py (added)
• TcosPreferences.py (modified) (2 diffs)
• TcosXmlRpc.py (modified) (3 diffs)
• debian/changelog (modified) (1 diff)
• ping.py (modified) (5 diffs)
• po/FILES (modified) (3 diffs)
• po/Makefile (modified) (1 diff)
• po/ca.po (modified) (56 diffs)
• po/ca@valencia.po (modified) (57 diffs)
• po/es.po (modified) (57 diffs)
• po/pt_BR.po (modified) (71 diffs)
• po/tcosmonitor.pot (modified) (52 diffs)
• shared.py (modified) (3 diffs)
• tcos-devices-ng.py (modified) (3 diffs)
• tcos-volume-manager.py (modified) (1 diff)
• tcosmonitor.glade (modified) (4 diffs)
• tcosmonitor.py (modified) (8 diffs)
• tcospersonalize.py (modified) (3 diffs)

trunk/tcosmonitor/Initialize.py

@@ -54 +54 @@
 
 
-class Initialize:
-    #drop_targets = [ ( "text/plain", 0, TARGET_TYPE_TEXT ) ]
-    
+class Initialize(object):
+
     def __init__(self, main):
         print_debug ( "__init__() starting" )
@@ -72 +71 @@
         self.main.viewtabs=self.ui.get_widget('viewtabs')
         self.main.viewtabs.set_property('show-tabs', False)
-        #for m in dir(self.main.viewtabs):
-        #    if "page" in m: print m
-        #print "get_n_pages", self.main.viewtabs.get_n_pages()
-        #print "set_current_page", self.main.viewtabs.set_current_page(2))
+        self.main.viewtabs.connect("switch_page", self.on_viewtabs_change)
         
         self.ask_mode=None
         
+    def on_viewtabs_change(self, widget, pointer, tabnum):
+        if tabnum != 0:
+            self.main.searchbutton.set_sensitive(False)
+            self.main.searchtxt.set_sensitive(False)
+        else:
+            self.main.searchbutton.set_sensitive(True)
+            self.main.searchtxt.set_sensitive(True)
+    """
     def get_widget(self, wname):
         widgets = gtk.glade.XML( shared.GLADE_DIR + 'tcosmonitor.glade', wname )
         return widgets.get_widget( wname )
-        
+    """
+    
     def init_progressbar(self):
         self.main.progressbar=self.ui.get_widget('progressbar')
@@ -228 +233 @@
         return
     
-    
+    """
     def init_hostlist(self):
         print_debug ( "init_hostlist()" )
@@ -303 +308 @@
         print_debug("on_sel_click() ip=%s status=%s" %(model[path][COL_IP], model[path][col]))
         return True
+    """
 
 if __name__ == '__main__':

trunk/tcosmonitor/LocalData.py

@@ -319 +319 @@
                     return False
             return True
-        except:
+        except Exception, err:
+            print_debug("ipValid() Exception, error=%s"%err)
             return False
 
@@ -325 +326 @@
         try:
             return socket.getaddrinfo(hostname, None)[0][4][0]  
-        except:
+        except Exception, err:
+            print_debug("GetIpAddress() Exception, error=%s"%err)
             return None
         
@@ -353 +355 @@
             self.add_to_cache( ip, 1 , self.hostname )
             return self.hostname
-        except:
+        except Exception, err:
+            print_debug("GetHostname() Exception, error=%s"%err)
             pass
         
@@ -436 +439 @@
 
     def GetLast(self, ip, ingroup=None):
+        start=time()
         last=None
         data={}
@@ -498 +502 @@
             data={"pid":last.ut_pid, "user":last.ut_user, "host":last.ut_host.split(":")[0], "time":last.ut_tv[0], "timelogged":timelogged, "exclude":exclude}
             print_debug("IsLast() data=%s"%data)
+        crono(start, "GetLast()")
         return data
     

trunk/tcosmonitor/Makefile

@@ -99 +99 @@
         install -m 644 WakeOnLan.py        $(DESTDIR)/$(PREFIX)/share/$(PACKAGE)/
         install -m 644 TcosIconView.py     $(DESTDIR)/$(PREFIX)/share/$(PACKAGE)/
+        install -m 644 TcosClassView.py    $(DESTDIR)/$(PREFIX)/share/$(PACKAGE)/
+        install -m 644 TcosListView.py     $(DESTDIR)/$(PREFIX)/share/$(PACKAGE)/
 
         install -m 755 tcosmonitor.py           $(DESTDIR)/$(PREFIX)/bin/tcosmonitor
@@ -180 +182 @@
         sed -i 's/__VERSION__/$(VERSION)/g' TcosStaticHosts.py
         sed -i 's/__VERSION__/$(VERSION)/g' TcosIconView.py
+        sed -i 's/__VERSION__/$(VERSION)/g' TcosListView.py
+        sed -i 's/__VERSION__/$(VERSION)/g' TcosClassView.py
         sed -i 's/__VERSION__/$(VERSION)/g' tcos-devices-ng.py
         sed -i 's/__VERSION__/$(VERSION)/g' tcos-volume-manager.py

trunk/tcosmonitor/TcosActions.py

@@ -53 +53 @@
         print_debug ( "__init__()" )
         self.main=main
-        self.model=self.main.init.model
+        #self.model=self.main.init.model
         #self.main.progressstop_args={}
 
@@ -101 +101 @@
         print_debug ( "on_another_screenshot_button_click() __init__ ip=%s" %(ip) )
         self.main.worker=shared.Workers(self.main, target=self.get_screenshot, args=[ip])
-        self.main.worker.start()   
-    
-    def on_rightclickmenuone_click(self, menu, number):
-        print_debug ( "on_rightclickmenuone_click() => onehost_menuitems[%d]=%s" \
-                        % (number, shared.onehost_menuitems[number][0]) )
-        self.menu_event_one(number)
+        self.main.worker.start()
 
     def on_allhostbutton_click(self, widget):
@@ -113 +108 @@
         self.main.allmenu.popup( None, None, None, event.button, event.time)
         return True
-
-    def on_rightclickmenuall_click(self, menu, number):
-        print_debug ( "on_rightclickmenuall_click() => allhost_menuitems[%d]=%s" \
-                        % (number, shared.allhost_menuitems[number][0]) )
-        self.menu_event_all(number)
 
     def on_preferencesbutton_click(self,widget):
@@ -173 +163 @@
             if len(allclients) == 0:
                 self.main.write_into_statusbar ( _("Not connected hosts found.") )
-                # clean treeview
-                model=self.main.tabla.get_model()
-                model.clear()
+                # clean icons and files
+                self.main.listview.clear()
                 self.main.iconview.clear()
                 self.main.classview.clear()
@@ -230 +219 @@
         return self.main.updating
 
-
-    def on_hostlist_click(self, hostlist):
-        if self.main.worker_running:
-            return
-        
-        self.main.progressbar.hide()
-        (model, iter) = hostlist.get_selected()
-        if not iter:
-            return
-        self.main.selected_host=model.get_value(iter,COL_HOST)
-        self.main.selected_ip=model.get_value(iter, COL_IP)
-        
-        print_debug ( "on_hostlist_clic() selectedhost=%s selectedip=%s" \
-            %(self.main.selected_host, self.main.selected_ip) )
-            
-        # call to read remote info
-        #self.main.localdata.newhost(self.main.selected_ip)
-        self.main.xmlrpc.newhost(self.main.selected_ip)
-        self.main.xmlrpc.ip=self.main.selected_ip
-        if not self.main.xmlrpc.isPortListening(self.main.selected_ip, self.main.xmlrpc.lastport):
-            print_debug ( "on_host_list_click() XMLRPC not running in %s" %(self.main.selected_ip) )
-            self.main.write_into_statusbar ( _("Error connecting to tcosxmlrpc in %s") %(self.main.selected_ip) )
-            return
-        
-        print_debug ( "on_host_list_click() AUTH OK" )
-        
-        self.main.write_into_statusbar ( "" )
-        print_debug ( "on_hostlist_click() callig worker to populate in Thread" )
-        
-        self.main.worker=shared.Workers( self.main,\
-                     target=self.populate_datatxt, args=([self.main.selected_ip]) ).start()
-        
-        return
         
     def askwindow_close(self, widget, event):
@@ -514 +470 @@
         
         # print into statusbar
-        #gtk.gdk.threads_enter()
         self.main.common.threads_enter("TcosActions:populate_datatxt show progressbar")
         
-        if shared.disable_textview_on_update: self.main.tabla.set_sensitive(False)
+        if shared.disable_textview_on_update and self.main.iconview.isactive():
+            self.main.tabla.set_sensitive(True)
         
         #self.main.write_into_statusbar( _("Connecting with %s to retrieve some info..."  ) %(ip) )
@@ -524 +480 @@
         #self.main.progressbutton.show()
         self.set_progressbar( _("Connecting with %s to retrieve some info..."  ) %(ip) , 0 ,show_percent=False)
-        #gtk.gdk.threads_leave()
+        
         self.main.common.threads_leave("TcosActions:populate_datatxt show progressbar")
         
@@ -758 +714 @@
                     try:
                         (key,value)=data.split('=')
-                    except:
+                    except Exception, err:
+                        print_debug("populate_datatxt() Exception spliting data=%s, err=%s"%(data,err))
                         key=data
                         value=""
@@ -844 +801 @@
                     try:
                         value=float(value)
-                    except:
+                    except Exception, err:
+                        print_debug("populate_datatxt() Exception getting volume=%s, err=%s"%(value,err) )
                         value=0.0
                     
@@ -945 +903 @@
                 self.datatxt.insert_block ( _("Sound server is not running"), image=shared.IMG_DIR + "info_sound_ko.png")
         
-        #gtk.gdk.threads_enter()
         self.main.common.threads_enter("TcosActions:populate_datatxt end")
         self.datatxt.display()
@@ -951 +908 @@
         self.main.progressbar.hide()
         
-        if shared.disable_textview_on_update: self.main.tabla.set_sensitive(True)
-        
-        #gtk.gdk.threads_leave()
+        if shared.disable_textview_on_update and self.main.iconview.isactive():
+            self.main.tabla.set_sensitive(True)
+        
         self.main.common.threads_leave("TcosActions:populate_datatxt end")
         
@@ -999 +956 @@
         print_debug ( "populate_hostlist() clear list and start progressbar!!!" )
         
-        #gtk.gdk.threads_enter()
         self.main.common.threads_enter("TcosActions:populate_hostlist show progressbar")
         
-        if shared.disable_textview_on_update: self.main.tabla.set_sensitive(False)
+        if shared.disable_textview_on_update and self.main.iconview.isactive():
+            self.main.tabla.set_sensitive(True)
 
         #disable refresh button
@@ -1009 +966 @@
         self.main.progressbutton.show()
         self.set_progressbar( _("Searching info of hosts..."), 0)
-        self.model.clear()
+        if self.main.listview.isenabled():
+            self.main.listview.clear()
         if self.main.iconview.isenabled():
-                self.main.iconview.clear()
+            self.main.iconview.clear()
         if self.main.classview.isenabled():
-                self.main.classview.clear()
-        #gtk.gdk.threads_leave()
+            self.main.classview.clear()
         self.main.common.threads_leave("TcosActions:populate_hostlist show progressbar")
         
@@ -1036 +993 @@
                     print_debug ( "populate_hostlist() WORKER IS STOPPED" )
                     break
-            except:
+            except Exception, err:
+                print_debug("populate_hostlist() can't read worker status, error=%s"%err)
                 pass
             i += 1
-            #gtk.gdk.threads_enter()
             self.main.common.threads_enter("TcosActions:populate_hostlist show connecting")
             self.main.progressbar.show()
-            self.set_progressbar( _("Connecting to %s...") \
-                            %(host), float(i)/float(len(clients)) )
-            #gtk.gdk.threads_leave()
+            self.set_progressbar( _("Connecting to %s...") %(host), float(i)/float(len(clients)) )
             self.main.common.threads_leave("TcosActions:populate_hostlist show connecting")
             
@@ -1051 +1006 @@
             self.main.xmlrpc.newhost (host)
             
-            ip=host
-            standalone=False
-            logged=False
+            data={}
+            data['host']=host
+            data['ip']=host
+            data['standalone']=False
+            data['logged']=False
             print_debug("populate_hostlist() => get username")
-            username=self.main.localdata.GetUsername(ip)
+            data['username']=self.main.localdata.GetUsername(data['ip'])
             
             if shared.dont_show_users_in_group != None:
-                if self.main.xmlrpc.IsStandalone(ip):
+                if self.main.xmlrpc.IsStandalone(data['ip']):
                     groupexclude=self.main.xmlrpc.GetStandalone("get_exclude", shared.dont_show_users_in_group)
                 else:
-                    groupexclude=self.main.localdata.isExclude(ip, shared.dont_show_users_in_group)
+                    groupexclude=self.main.localdata.isExclude(data['ip'], shared.dont_show_users_in_group)
             
                 if groupexclude: 
-                    print_debug("Host %s excluded, blacklisted by group" %ip)
+                    print_debug("Host %s excluded, blacklisted by group" %data['ip'])
                     continue
             
             print_debug("populate_hostlist() => get hostname")
-            hostname=self.main.localdata.GetHostname(ip)
-            
-            if username.startswith('error: tcos-last'):
-                username="---"
+            data['hostname']=self.main.localdata.GetHostname(data['ip'])
+            
+            if data['username'].startswith('error: tcos-last'):
+                data['username']="---"
             
             try:
                 print_debug("populate_hostlist() => get num process")
-                num_process=self.main.localdata.GetNumProcess(ip)
-            except:
-                num_process="---"
+                data['num_process']=self.main.localdata.GetNumProcess(data['ip'])
+            except Exception, err:
+                print_debug("populate_hostlist() Exception getting num process, error=%s"%err)
+                data['num_process']="---"
             
             print_debug("populate_hostlist() => get time logged")
-            if self.main.xmlrpc.IsStandalone(ip):
-                time_logged=self.main.xmlrpc.GetStandalone("get_time")
-                standalone=True
+            if self.main.xmlrpc.IsStandalone(data['ip']):
+                data['time_logged']=self.main.xmlrpc.GetStandalone("get_time")
+                data['standalone']=True
             else:
-                time_logged=self.main.localdata.GetTimeLogged(ip)
-                standalone=False
-            
-            if not time_logged or time_logged == "" or time_logged.startswith('error: tcos-last'):
-                time_logged="---"
+                data['time_logged']=self.main.localdata.GetTimeLogged(data['ip'])
+                data['standalone']=False
+            
+            if not data['time_logged'] or data['time_logged'] == "" or data['time_logged'].startswith('error: tcos-last'):
+                data['time_logged']="---"
             
             print_debug("populate_hostlist() => get active connection")
-            if self.main.localdata.IsActive(ip):
+            if self.main.localdata.IsActive(data['ip']):
+                data['active']=True
                 if self.main.xmlrpc.sslconnection:
-                    image_active=active_ssl_image
+                    data['image_active']=active_ssl_image
                 else:
-                    image_active=active_image
+                    data['image_active']=active_image
             else:
-                image_active=inactive_image
+                data['image_active']=inactive_image
+                data['active']=False
             
             print_debug("populate_hostlist() => get is logged")
-            if self.main.localdata.IsLogged(ip):
-                image_logged=logged_image
-                logged=True
+            if self.main.localdata.IsLogged(data['ip']):
+                data['image_logged']=logged_image
+                data['logged']=True
             else:
-                image_logged=unlogged_image
-                logged=False
+                data['image_logged']=unlogged_image
+                data['logged']=False
             
             print_debug("populate_hostlist() => get is blocked")
-            if self.main.localdata.IsBlocked(host):
-                blocked_screen=True
+            if self.main.localdata.IsBlocked(data['ip']):
+                data['blocked_screen']=True
             else:
-                blocked_screen=False
+                data['blocked_screen']=False
             
             print_debug("populate_hostlist() => get is blocked net")
-            if self.main.localdata.IsBlockedNet(host,username):
-                blocked_net=True
+            if self.main.localdata.IsBlockedNet(host,data['username']):
+                data['blocked_net']=True
             else:
-                blocked_net=False
-                
-            if blocked_screen and blocked_net:
-                image_blocked=locked_net_screen_image
-            elif blocked_screen == False and blocked_net:
-                image_blocked=locked_net_image
-            elif blocked_screen and blocked_net == False:
-                image_blocked=locked_image
+                data['blocked_net']=False
+                
+            if data['blocked_screen'] and data['blocked_net']:
+                data['image_blocked']=locked_net_screen_image
+            elif data['blocked_screen'] == False and data['blocked_net']:
+                data['image_blocked']=locked_net_image
+            elif data['blocked_screen'] and data['blocked_net'] == False:
+                data['image_blocked']=locked_image
             else:
-                image_blocked=unlocked_image
-            
-            data={'ip':ip, 'hostname':hostname, 'host':host, 
-                      'standalone':standalone, 'username':username,
-                      'blocked_screen':blocked_screen, 'blocked_net': blocked_net,
-                      'logged':logged, 'time_logged':time_logged}
+                data['image_blocked']=unlocked_image
+            
+            
+            if self.main.listview.isactive():
+                self.main.common.threads_enter("TcosActions:populate_hostlist LIST generate_icon")
+                self.main.listview.generate_file(data)
+                self.main.common.threads_leave("TcosActions:populate_hostlist LIST generate_icon")
             
             if self.main.iconview.isactive():
@@ -1137 +1098 @@
                 self.main.iconview.generate_icon(data)
                 self.main.common.threads_leave("TcosActions:populate_hostlist ICON generate_icon")
-                
+            
             if self.main.classview.isactive():
                 self.main.common.threads_enter("TcosActions:populate_hostlist CLASS generate_icon")
@@ -1143 +1104 @@
                 self.main.common.threads_leave("TcosActions:populate_hostlist CLASS generate_icon")
             
-            #gtk.gdk.threads_enter()
-            self.main.common.threads_enter("TcosActions:populate_hostlist print data")
-            self.iter = self.model.append (None)
-            self.model.set_value (self.iter, COL_HOST, hostname )
-            self.model.set_value (self.iter, COL_IP, host )
-            self.model.set_value (self.iter, COL_USERNAME, username )
-            self.model.set_value (self.iter, COL_ACTIVE, image_active )
-            self.model.set_value (self.iter, COL_LOGGED, image_logged)
-            self.model.set_value (self.iter, COL_BLOCKED, image_blocked)
-            self.model.set_value (self.iter, COL_PROCESS, num_process )
-            self.model.set_value (self.iter, COL_TIME, time_logged)
-            #gtk.gdk.threads_leave()
-            self.main.common.threads_leave("TcosActions:populate_hostlist print data")
-            
-            crono(start2, "populate_host_list(%s)" %(ip) )
-        
-        #gtk.gdk.threads_enter()
+            
+            crono(start2, "populate_host_list(%s)" %(data['ip']) )
+        
         self.main.common.threads_enter("TcosActions:populate_hostlist END")
         self.main.progressbar.hide()
@@ -1166 +1113 @@
         self.main.progressbutton.set_sensitive(True)
         
-        if shared.disable_textview_on_update: self.main.tabla.set_sensitive(True)
-        
-        #gtk.gdk.threads_leave()
+        if shared.disable_textview_on_update and self.main.iconview.isactive():
+            self.main.tabla.set_sensitive(True)
+        
         self.main.common.threads_leave("TcosActions:populate_hostlist END")
         
         try:
             self.main.worker.set_finished()
-        except:
+        except Exception, err:
+            print_debug("populate_hostlist() Exception setting worker status, err=%s" %err)
             pass
         crono(start1, "populate_host_list(ALL)" )
@@ -1204 +1152 @@
             self.main.selected_host=self.main.classview.get_host(self.main.selected_ip)
         else:
-            (model, iter) = self.main.tabla.get_selection().get_selected()
-            if iter == None:
-                print_debug( "menu_event_one() not selected thin client !!!" )
-                return
-            self.main.selected_host=model.get_value(iter,COL_HOST)
-            self.main.selected_ip=model.get_value(iter, COL_IP)
+            self.main.selected_ip=self.main.listview.get_selected()
+            self.main.selected_host=self.main.listview.get_host(self.main.selected_ip)
+            #(model, iter) = self.main.tabla.get_selection().get_selected()
+            #if iter == None:
+            #    print_debug( "menu_event_one() not selected thin client !!!" )
+            #    return
+            #self.main.selected_host=model.get_value(iter,COL_HOST)
+            #self.main.selected_ip=model.get_value(iter, COL_IP)
+        
+        if not self.main.selected_ip:
+            # show a msg
+            shared.error_msg ( _("Error: no IP!") )
+            return
         
         if not self.doaction_onthisclient(action, self.main.selected_ip):
@@ -1677 +1632 @@
                 
             if self.main.config.GetVar("selectedhosts") == 1:
-                allclients=[]
-                model=self.main.tabla.get_model()
-                rows = []
-                model.foreach(lambda model, path, iter: rows.append(path))
-                for host in rows:
-                    iter=model.get_iter(host)
-                    if model.get_value(iter, COL_SEL_ST):
-                        allclients.append(model.get_value(iter, COL_IP))
+                #allclients=[]
+                #model=self.main.tabla.get_model()
+                #rows = []
+                #model.foreach(lambda model, path, iter: rows.append(path))
+                #for host in rows:
+                #    iter=model.get_iter(host)
+                #    if model.get_value(iter, COL_SEL_ST):
+                #        allclients.append(model.get_value(iter, COL_IP))