Reworked the World List stuff to be more usable and better coded

8 files changed, 133 insertions, 68 deletions

diff --git a/portato/backend/package.py b/portato/backend/package.py
index 8a80fd5..c085816 100644
--- a/portato/backend/package.py
+++ b/portato/backend/package.py
@@ -371,16 +371,6 @@ class Package (_Package):
         
         raise NotImplementedError
 
-    def compare_version(self, other):
-        """Compares this package's version to another's CPV; returns -1, 0, 1.
-        
-        @param other: the other package
-        @type other: Package
-        @returns: -1, 0 or 1
-        @rtype: int"""
-
-        raise NotImplementedError
-
     def matches (self, criterion):
         """This checks, whether this package matches a specific versioning criterion - e.g.: "<=net-im/foobar-1.2".
         
diff --git a/portato/backend/portage/package.py b/portato/backend/portage/package.py
index 2b40e41..79af79b 100644
--- a/portato/backend/portage/package.py
+++ b/portato/backend/portage/package.py
@@ -294,18 +294,8 @@ class PortagePackage (Package):
             return self.get_package_settings("USE", installed = True).split()
         else: return []
 
-    def compare_version(self,other):
-        v1 = self._scpv
-        v2 = portage.catpkgsplit(other.get_cpv())
-        # if category is different
-        if v1[0] != v2[0]:
-            return cmp(v1[0],v2[0])
-        # if name is different
-        elif v1[1] != v2[1]:
-            return cmp(v1[1],v2[1])
-        # Compare versions
-        else:
-            return portage.pkgcmp(v1[1:],v2[1:])
+    def __cmp__ (self, other):
+        return system.compare_versions(self.get_cpv(), other.get_cpv())
 
     def matches (self, criterion):
         # cpv_matches needs explicit slot info
diff --git a/portato/backend/portage/system.py b/portato/backend/portage/system.py
index d7c7806..83eb37a 100644
--- a/portato/backend/portage/system.py
+++ b/portato/backend/portage/system.py
@@ -120,6 +120,20 @@ class PortageSystem (SystemInterface):
         else:
             return True
 
+    def compare_versions(self, v1, v2):
+        v1 = self.split_cpv(v1)
+        v2 = self.split_cpv(v2)
+
+        # if category is different
+        if v1[0] != v2[0]:
+            return cmp(v1[0],v2[0])
+        # if name is different
+        elif v1[1] != v2[1]:
+            return cmp(v1[1],v2[1])
+        # Compare versions
+        else:
+            return portage.pkgcmp(v1[1:],v2[1:])
+
     def with_bdeps(self):
         """Returns whether the "--with-bdeps" option is set to true.
 
@@ -218,8 +232,11 @@ class PortageSystem (SystemInterface):
         cpv = portage.dep_getcpv(cpv)
         return portage.catpkgsplit(cpv)
 
-    def sort_package_list(self, pkglist):
-        pkglist.sort(PortagePackage.compare_version) # XXX: waaah ... direct package naming... =/
+    def sort_package_list(self, pkglist, only_cpv = False):
+        if only_cpv:
+            pkglist.sort(self.compare_versions)
+        else:
+            pkglist.sort()
         return pkglist
 
     def reload_settings (self):
diff --git a/portato/backend/system_interface.py b/portato/backend/system_interface.py
index be79de2..f0bfdf6 100644
--- a/portato/backend/system_interface.py
+++ b/portato/backend/system_interface.py
@@ -68,6 +68,18 @@ class SystemInterface (object):
         """
 
         raise NotImplementedError
+
+    def compare_versions(self, v1, v2):
+        """Compares two CPVs; returns -1, 0, 1.
+        
+        @param v1: one CPV
+        @type v1: cpv
+        @param v2: the second CPV
+        @type v2: cpv
+        @returns: -1, 0 or 1
+        @rtype: int"""
+
+        raise NotImplementedError
     
     def find_best(self, list, only_cpv = False):
         """Returns the best package out of a list of packages.
@@ -134,11 +146,13 @@ class SystemInterface (object):
 
         raise NotImplementedError
 
-    def sort_package_list(self, pkglist):
+    def sort_package_list(self, pkglist, only_cpv = False):
         """Sorts a package list in the same manner portage does.
         
         @param pkglist: list to sort
-        @type pkglist: Packages[]
+        @type pkglist: Packages[] or cpv[]
+        @param only_cpv: flags whether the passed list consists of Packages or of CPVs
+        @type: bool
         """
 
         raise NotImplementedError
diff --git a/portato/gui/queue.py b/portato/gui/queue.py
index e73891d..6d3d19d 100644
--- a/portato/gui/queue.py
+++ b/portato/gui/queue.py
@@ -144,7 +144,7 @@ class EmergeQueue:
                 old = system.find_packages(pkg.get_slot_cp(), system.SET_INSTALLED)
                 if old:
                     old = old[0] # assume we have only one there
-                    cmp = pkg.compare_version(old)
+                    cmp = pkg.__cmp__(old)
                     if cmp > 0:
                         update = True
                     elif cmp < 0:
diff --git a/portato/gui/templates/UpdateWindow.ui b/portato/gui/templates/PkgListWindow.ui
index ec8288e..fdcdb23 100644
--- a/portato/gui/templates/UpdateWindow.ui
+++ b/portato/gui/templates/PkgListWindow.ui
@@ -2,9 +2,8 @@
 <interface>
   <requires lib="gtk+" version="2.14"/>
   <!-- interface-naming-policy toplevel-contextual -->
-  <object class="GtkWindow" id="UpdateWindow">
+  <object class="GtkWindow" id="PkgListWindow">
     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-    <property name="title" translatable="yes">Updatable Packages</property>
     <property name="window_position">center-on-parent</property>
     <property name="destroy_with_parent">True</property>
     <property name="urgency_hint">True</property>
@@ -92,6 +91,22 @@
                 <property name="position">2</property>
               </packing>
             </child>
+            <child>
+              <object class="GtkButton" id="uninstallBtn">
+                <property name="label" translatable="yes">_Uninstall Selected</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                <property name="use_underline">True</property>
+                <signal name="clicked" handler="cb_uninstall_clicked"/>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">3</property>
+              </packing>
+            </child>
           </object>
           <packing>
             <property name="expand">False</property>
diff --git a/portato/gui/windows/main.py b/portato/gui/windows/main.py
index c99790c..5a149f8 100644
--- a/portato/gui/windows/main.py
+++ b/portato/gui/windows/main.py
@@ -50,7 +50,7 @@ from .about import AboutWindow
 from .plugin import PluginWindow
 from .preference import PreferenceWindow
 from .search import SearchWindow
-from .update import UpdateWindow, WorldListWindow
+from .pkglist import UpdateWindow, WorldListWindow
 
 class PackageTable:
     """A window with data about a specfic package."""
@@ -1594,41 +1594,52 @@ class MainWindow (Window):
 
         PluginWindow(self.window, plugins, self.queue)
         return True
-    
-    def cb_show_updates_clicked (self, *args):
-        """
-        Show the list of updateble packages.
-        """
 
-        def __update():
-            def cb_idle_show(packages):
-                """
-                Callback opening the menu when the calculation is finished.
+    def show_package_list (self, pkg_generator, klass, thread_name = "PkgList Update Thread"):
+        
+        def cb_idle_show(packages):
+            """
+            Callback opening the menu when the calculation is finished.
 
-                @returns: False to signal that it is finished
-                """
-                UpdateWindow(self.window, packages, self.queue, self.jump_to)
-                return False
-            
+            @returns: False to signal that it is finished
+            """
+            klass(self.window, packages, self.queue, self.jump_to)
+            return False
+        
+        def __update():
             watch = gtk.gdk.Cursor(gtk.gdk.WATCH)
             self.window.window.set_cursor(watch)
             
             packages = []
             try:
-                packages.extend(system.get_updated_packages())
+                packages.extend(pkg_generator())
             finally:
                 self.window.window.set_cursor(None)
 
             gobject.idle_add(cb_idle_show, packages)
         
-        GtkThread(name="Show Updates Thread", target = __update).start()
+        GtkThread(name = thread_name, target = __update).start()
+        return True
+    
+    def cb_show_updates_clicked (self, *args):
+        """
+        Show the list of updateble packages.
+        """
+
+        self.show_package_list(
+                lambda: (x.get_cpv() for x in system.get_updated_packages()),
+                UpdateWindow, "Show Updates Thread")
+
         return True
 
     def cb_show_world_clicked (self, *args):
         """
         Show the list of world packages.
         """
-        WorldListWindow(self.window, system.find_packages(pkgSet = "world"), self.queue, self.jump_to)
+        self.show_package_list(
+                lambda: system.find_packages(pkgSet = "world", only_cpv = True),
+                WorldListWindow)
+
         return True
 
     def cb_show_installed_toggled (self, *args):
diff --git a/portato/gui/windows/update.py b/portato/gui/windows/pkglist.py
index d77d257..90915cb 100644
--- a/portato/gui/windows/update.py
+++ b/portato/gui/windows/pkglist.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# File: portato/gui/windows/update.py
+# File: portato/gui/windows/pkglist.py
 # This file is part of the Portato-Project, a graphical portage-frontend.
 #
 # Copyright (C) 2006-2009 René 'Necoro' Neumann
@@ -19,15 +19,27 @@ from ...backend import system
 from ...backend.exceptions import PackageNotFoundException, BlockedException
 from ...helper import debug
 
-class UpdateWindow (AbstractDialog):
+class PkgListWindow (AbstractDialog):
 
-    def __init__ (self, parent, packages, queue, jump_to):
+    # need this, so it can be safely subclassed
+    __file__ = __window__ = "PkgListWindow"
+
+    def __init__ (self, title, parent, packages, queue, jump_to):
         AbstractDialog.__init__(self, parent)
+        self.window.set_title(title)
+
+        self.installBtn = self.tree.get_widget("installBtn")
+        self.uninstallBtn = self.tree.get_widget("uninstallBtn")
+
+        self.selectBtnLabels = {
+                False: _("Select _All"),
+                True: _("Unselect _All")}
+
+        self.all_selected = False
 
         self.queue = queue
         self.jump = jump_to
-
-        self.packages = system.sort_package_list(packages)
+        self.packages = system.sort_package_list(packages, only_cpv = True)
 
         self.build_list()
 
@@ -48,7 +60,7 @@ class UpdateWindow (AbstractDialog):
         self.view.append_column(gtk.TreeViewColumn(_("Package"), cell, text = 1))
 
         for p in self.packages:
-            store.append([False, p.get_cpv()])
+            store.append([False, p])
 
     def cb_set_size (self, *args):
         """
@@ -66,16 +78,20 @@ class UpdateWindow (AbstractDialog):
         self.window.set_geometry_hints(self.window, min_height = val)
 
     def cb_select_all_clicked (self, btn):
+        sel = self.all_selected = not self.all_selected
+
+        btn.set_label(self.selectBtnLabels[sel])
+
         model = self.view.get_model()
         iter = model.get_iter_first()
         
         while iter:
-            model.set_value(iter, 0, True)
+            model.set_value(iter, 0, sel)
             iter = model.iter_next(iter)
 
         return True
 
-    def cb_install_clicked (self, btn):
+    def install_uninstall (self, type):
         model = self.view.get_model()
         iter = model.get_iter_first()
         if iter is None: return
@@ -86,20 +102,30 @@ class UpdateWindow (AbstractDialog):
                 items.append(model.get_value(iter, 1))
             iter = model.iter_next(iter)
         
-        for item in items:
-            try:
+        if type == "install":
+            for item in items:
                 try:
-                    self.queue.append(item, type = "install", oneshot = True)
-                except PackageNotFoundException, e:
-                    if unmask_dialog(e[0]) == gtk.RESPONSE_YES :
-                        self.queue.append(item, type = "install", unmask = True, oneshot = True)
-
-            except BlockedException, e:
-                blocked_dialog(e[0], e[1])
+                    try:
+                        self.queue.append(item, "install", oneshot = True)
+                    except PackageNotFoundException, e:
+                        if unmask_dialog(e[0]) == gtk.RESPONSE_YES :
+                            self.queue.append(item, "install", unmask = True, oneshot = True)
+
+                except BlockedException, e:
+                    blocked_dialog(e[0], e[1])
+        else:
+            for item in items:
+                self.queue.append(item, "uninstall")
 
         self.close()
         return True
 
+    def cb_install_clicked (self, btn):
+        return self.install_uninstall("install")
+
+    def cb_uninstall_clicked (self, btn):
+        return self.install_uninstall("uninstall")
+
     def cb_package_selected (self, view):
         sel = view.get_selection()
         store, it = sel.get_selected()
@@ -116,9 +142,11 @@ class UpdateWindow (AbstractDialog):
         store[path][0] = not store[path][0]
         return True
 
-class WorldListWindow (UpdateWindow):
-    __file__ = __window__ = "UpdateWindow"
+class UpdateWindow (PkgListWindow):
+    def __init__ (self, *args, **kwargs):
+        PkgListWindow.__init__(self, _("Updatable Packages"), *args, **kwargs)
 
+class WorldListWindow (UpdateWindow):
     def __init__ (self, *args, **kwargs):
-        UpdateWindow.__init__(self, *args, **kwargs)
-        self.window.set_title(_("World Packages"))
+        PkgListWindow.__init__(self, _("World Packages"), *args, **kwargs)
+        self.installBtn.hide()