Changeset 42

Timestamp:

07/20/06 20:49:16 (2 years ago)

Author:

ploum

Message:

#7 : inform the user while searching

Big refactorization : all searches are now threaded

Files:

• conseil.py (modified) (9 diffs)
• definitions.py (added)
• retriever.py (added)

conseil.py

@@ -1 +1 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
-import sys
-import string
+import sys, time
+import string, threading
 #subfolders are added to the path
 sys.path[1:1]=["storage", "protocols"]
@@ -21 +21 @@
 from bug import bug
 from bookmarks_store import *
-from page import *
+from retriever import *
+from definitions import *
 
 class MainWindow :
@@ -49 +50 @@
                 #Wich BTS are we using ?
                 self.bts = protocol()
+                self.retriever = retriever(self.bts, self.bugs_tabs)
                 #bookmarks init
                 self.bookmarks = bookmarks_store(self.bts.btsName())
@@ -103 +105 @@
 
 
-        # This function initialize an empty result tree
-        def __treeInit__(self):
-                def callback_click(widget, event) :
-                        #middle click, open in background
-                        if event.button == 2 :
-                                print "TODO : open bug in background"
-                        #right click menu
-                        elif event.button == 3 :
-                                zetuple = widget.get_selection().get_selected()
-                                itera = zetuple[1]
-                                store = zetuple[0]
-                                def browser_callback(menuitem) :
-                                        #if we have not yet left clicked in the results
-                                        # itera will be None
-                                        # Fixme !
-                                        if itera != None :
-                                                bugnbr = store.get_value(itera,0)
-                                                gnome.url_show(self.bts.getBugUrl(bugnbr))
-                                browser = gtk.MenuItem("Open in a web browser")
-                                browser.connect("activate", browser_callback)
-                                browser.show()
-                                menu = gtk.Menu()
-                                menu.append(browser)
-                                menu.popup(None, None, None, event.button, event.time)
-                #We add an empty tree result first
-                listing = gtk.ListStore(gobject.TYPE_INT,gobject.TYPE_STRING)
-                tree = gtk.TreeView(listing)
-                tree.connect("button-press-event",callback_click)
-                renderer = gtk.CellRendererText()
-                column = gtk.TreeViewColumn("Bug #", renderer, text=0)
-                column.set_resizable(1)
-                column.set_sort_column_id(0)
-                column2 = gtk.TreeViewColumn("Product", renderer, text=1)
-                column2.set_resizable(1)
-                column2.set_sort_column_id(1)
-                column3 = gtk.TreeViewColumn("Titre", renderer, text=2)
-                column3.set_resizable(1)
-                column3.set_sort_column_id(2)
-                column4 = gtk.TreeViewColumn("Importance", renderer, text=3)
-                column4.set_resizable(1)
-                column4.set_sort_column_id(3)
-                column5 = gtk.TreeViewColumn("Status", renderer, text=4)
-                column5.set_resizable(1)
-                column5.set_sort_column_id(4)
-                tree.append_column(column)
-                tree.append_column(column2)
-                tree.append_column(column3)
-                tree.append_column(column4)
-                tree.append_column(column5)
-                tree.show()
-                return tree
+        
 
         def bookmarks_button_press(self,widget, event) :
@@ -200 +152 @@
 
         #open a page in the given widget using clicked, which is a bookmark object
-        def open_page(widget,clicked) :
+        def open_page(self,clicked) :
                 method = clicked.get_method()
                 dic = makedict()
@@ -208 +160 @@
                         bug_nbr = clicked.get_bug()
                         dic["bug"] = bug_nbr
-                        widget.__bugDisplay(widget.bts.retrieveBug(bug_nbr), dic)
+                        self.retriever.display(dic)
                 elif method == 2:
                         dic["method"] = 2
                         searchString = clicked.get_search()
                         dic["search"] = searchString
-                        widget.__searchDisplay(widget.bts.genericSearch(searchString),dic)
+                        self.retriever.display(dic)
                 elif method == 3:
                         dic["method"] = 3
@@ -220 +172 @@
                         search = clicked.get_search()
                         dic["search"] = search
-                        widget.__searchDisplay(widget.bts.packageSearch(product,search),dic)
+                        self.retriever.display(dic)
 
         #when the "add bookmark button is clicked
@@ -238 +190 @@
                         dic["method"] = 1
                         dic["bug"] = searchString
-                        self.__bugDisplay(self.bts.retrieveBug(int(searchString)),dic)
+                        self.retriever.display(dic)
                 # no, we have a search.
                 else :
@@ -245 +197 @@
                                 dic["method"]= 3
                                 dic["product"] = array[0]
-                                #this is only to avoid an error when searching on a lonely package
                                 if len(array) < 2 :
-                                        self.__searchDisplay(self.bts.packageSearch(array[0],None),dic)
+                                        dic["search"] = None
                                 else :
                                         dic["search"] = array[1]        
-                                        self.__searchDisplay(self.bts.packageSearch(array[0],array[1]),dic)
+                                self.retriever.display(dic)
                         else :
                                 dic["method"]= 2
                                 dic["search"] = searchString
-                                self.__searchDisplay(self.bts.genericSearch(searchString),dic)
-
-        #We did a simple search
-        def __searchDisplay(self, store,args):
-                #First, we ask for the result as it can takes some times
-                if len(store) == 0 :
-                        tab = gtk.Label("No result matching your search")
-                        tab.show()
-                else :
-                        tree=self.__treeInit__()
-                        tree.connect("row-activated", self.__row_clicked, tree.get_selection())
-                        tree.set_headers_clickable(1)
-                        tree.set_rules_hint(1)
-                        tree.set_model(store)
-                        tab = gtk.ScrolledWindow()
-                        tab.show()
-                        tab.add(tree)
-                zepage = page(tab, args)
-                self.insertTab(zepage)          
-
-        #Callback for the row_activated in a search view
-        def __row_clicked(widget, path, view_column, user_param1,data) :
-                zetuple = data.get_selected()
-                bug_nbr = zetuple[0].get_value(zetuple[1],0)
-                dic = makedict()
-                dic["method"] = 1
-                dic["bug"] = str(bug_nbr)
-                widget.__bugDisplay(widget.bts.retrieveBug(bug_nbr),dic)
-        
-
-        # This function takes a bug Object and then display it nicely
-        # (it will be nice one day, I swear...)
-        def __bugDisplay(self, zebug, descr) :
-                nbr = zebug.getNbr()
-                def callback_click(widget, event) :
-                        #middle click, open in background
-                        if event.button == 2 :
-                                print "What do you want to do with middle click ?"
-                        #right click menu
-                        elif event.button == 3 :
-                                def browser_callback(menuitem) :
-                                        gnome.url_show(self.bts.getBugUrl(nbr))
-                                browser = gtk.MenuItem("Open in a web browser")
-                                browser.connect("activate", browser_callback)
-                                browser.show()
-                                menu = gtk.Menu()
-                                menu.append(browser)
-                                menu.popup(None, None, None, event.button, event.time)  
-
-                def callback_postcom(widget,buff,nbr) :
-                        itera = buff.get_bounds()
-                        content = buff.get_text(itera[0],itera[1])
-                        if content.strip() != '' :
-                                #FIXME : support title in comments
-                                title="Dummy title"
-                                self.bts.postComment(nbr,title,content)
-        
-                if nbr < 0 :
-                        main_widget = gtk.Label("This specific bug doesnt exist")
-                        main_widget.show()
-                else :
-                        bugnbr=str(nbr)
-                        bugtemplate = "bug_template.glade"
-                        bugwidget = gtk.glade.XML(bugtemplate)
-                        widget_comments_nbr = bugwidget.get_widget("comments_nbr")
-                        textcom = bugwidget.get_widget("text_comment")
-                        postbutton = bugwidget.get_widget("post_button")
-                        postbutton.connect("clicked",callback_postcom, textcom.get_buffer(),bugnbr)
-                        # handle nicely plurals
-                        bugtotal = zebug.comNbr()
-                        if bugtotal > 1 :
-                                com_text = "%d comments : "%bugtotal
-                        else :
-                                com_text = "%d comment : "%bugtotal
-                        widget_comments_nbr.set_text(com_text)
-                        widget_comments = bugwidget.get_widget("com_frame")
-                        widget_nbr = bugwidget.get_widget("number") 
-                        title_bugnbr = "Bug #%s :" %bugnbr
-                        widget_nbr.set_text(title_bugnbr)
-                        widget_title = bugwidget.get_widget("title") 
-                        title_title = "%s" %zebug.getTitle()
-                        widget_title.set_text(title_title)
-                        widget_description = bugwidget.get_widget("description") 
-                        widget_description.set_text(zebug.getDescription())
-                        widget_status= bugwidget.get_widget("status")
-                        widget_status.set_text(zebug.getStatus())
-                        widget_importance= bugwidget.get_widget("importance")
-                        widget_importance.set_text(zebug.getImportance())
-                        widget_assignee= bugwidget.get_widget("assigned")
-                        widget_assignee.set_text(zebug.getAssignee())
-                        widget_package= bugwidget.get_widget("package")
-                        widget_package.set_text(zebug.getPackage())
-                        #inserting comments
-                        hbox = gtk.VBox(spacing=2)
-                        hbox.show()
-                        for i in zebug.getAllComments():
-                                comwidget = gtk.glade.XML("comment.glade")
-                                comwidget.get_widget("poster").set_text(i.getAuthor())
-                                comwidget.get_widget("title").set_text(i.getTitle())
-                                comwidget.get_widget("date").set_text(i.getDate())
-                                comwidget.get_widget("comment_body").set_text(i.getContent())
-                                hbox.add(comwidget.get_widget("comment"))
-
-                        to_remove = bugwidget.get_widget("dummy_label")
-                        widget_comments.remove(to_remove)
-                        widget_comments.add(hbox)
-                        #We take the vbox to insert it
-                        main_widget = bugwidget.get_widget("bug_main")
-                        main_widget.connect("button-press-event",callback_click)
+                                self.retriever.display(dic)
+        
                 
-                zepage = page(main_widget, descr)
-                self.insertTab(zepage)
-
-
-        # Adding a tab
-        # we receive as arguments an objet page
-        def insertTab(self, tab_page) :
-                #close tab button callback
-                tab = tab_page.get_widget()
-                name = tab_page.get_title()
-                def closeTab(widget, data):
-                        page = self.bugs_tabs.page_num(data)
-                        self.bugs_tabs.remove_page(page)
-                #this is ugly ! I don't want to use glade for this
-                label_widget=gtk.glade.XML("tab_label.glade")
-                dic = {"on_close_tab_clicked" : lambda close: closeTab(close, tab) }
-                label_widget.signal_autoconnect(dic)
-                label=label_widget.get_widget("label1")
-                label.set_text(name)
-                top=label_widget.get_widget("hbox1")
-                tabid = self.bugs_tabs.insert_page(tab, top)
-
-
-#make a search dictionnary
-#Those dict are passed as argument to __searchDisplay
-def makedict() :
-        return dict([["method",None],["search",None],["product",None],["bug",None]])
-                
 
 if __name__ == "__main__":
+        gobject.threads_init()
+        #gtk.gdk.threads_init()
         hwg = MainWindow()
+        #gtk.threads_enter()
         gtk.main()
+        #gtk.threads_leave()