Merge in DB branch (even though it does not offer the change-db-in-prefs feature)

3 files changed, 37 insertions, 433 deletions

diff --git a/portato/gui/dialogs.py b/portato/gui/dialogs.py
index 3e1fdce..d7ac41b 100644
--- a/portato/gui/dialogs.py
+++ b/portato/gui/dialogs.py
@@ -118,3 +118,10 @@ def prereq_error_dialog (e):
     ret = dialog.run()
     dialog.destroy()
     return ret
+
+def no_versions_dialog (cp):
+    dialog = gtk.MessageDialog(None, gtk.DIALOG_MODAL, gtk.MESSAGE_WARNING, gtk.BUTTONS_OK, _("No versions of package '%s' found!") % cp)
+    ret = dialog.run()
+    dialog.destroy()
+    return ret
+
diff --git a/portato/gui/utils.py b/portato/gui/utils.py
index a779329..1ebefe8 100644
--- a/portato/gui/utils.py
+++ b/portato/gui/utils.py
@@ -13,29 +13,17 @@
 from __future__ import absolute_import, with_statement
 
 # some stuff needed
-import re
-import sys, os
+import sys
 import logging
 import gettext
-from collections import defaultdict
-from threading import Thread, RLock
-from functools import wraps
+from threading import Thread
 
 import gtk
 
 # some backend things
-from ..backend import flags, system, set_system
+from ..backend import flags, set_system
 from ..helper import debug, info, set_log_level
-from ..constants import APP, LOCALE_DIR, USE_SQL, SESSION_DIR
-
-if USE_SQL:
-    try:
-        import sqlite3 as sql
-    except ImportError:
-        from pysqlite2 import dbapi2 as sql
-    
-    import anydbm
-    import hashlib
+from ..constants import APP, LOCALE_DIR
 
 # parser
 from ..config_parser import ConfigParser
@@ -156,411 +144,3 @@ class Config (ConfigParser):
         """Writes to the config file and modify any external configs."""
         ConfigParser.write(self)
         self.modify_external_configs()
-
-class PkgData (object):
-    __slots__ = ("cat", "pkg", "inst")
-
-    def __init__ (self, cat, pkg, inst):
-        self.cat = cat
-        self.pkg = pkg
-        self.inst = inst
-
-    def __iter__ (self):
-        return iter((self.cat, self.pkg, self.inst))
-
-    def __cmp__ (self, other):
-        return cmp(self.pkg.lower(), other.pkg.lower())
-
-    def __repr__ (self):
-        return "<Package (%(cat)s, %(pkg)s, %(inst)s)>" % {"cat" : self.cat, "pkg" : self.pkg, "inst" : self.inst}
-
-class DictDatabase (object):
-    """An internal database which holds a simple dictionary cat -> [package_list]."""
-
-    ALL = _("ALL")
-
-    def __init__ (self):
-        """Constructor."""
-        self.__initialize()
-        self._lock = RLock()
-        self.populate()
-
-    def lock (f):
-        @wraps(f)
-        def wrapper (self, *args, **kwargs):
-            with self._lock:
-                r = f(self, *args, **kwargs)
-            return r
-        
-        return wrapper
-
-    def __initialize (self):
-        self._db = defaultdict(list)
-        self.inst_cats = set([self.ALL])
-        self._restrict = None
-
-    def __sort_key (self, x):
-        return x.pkg.lower()
-
-    @lock
-    def populate (self, category = None):
-        """Populates the database.
-        
-        @param category: An optional category - so only packages of this category are inserted.
-        @type category: string
-        """
-        
-        # get the lists
-        packages = system.find_packages(category, with_version = False)
-        installed = system.find_packages(category, system.SET_INSTALLED, with_version = False)
-        
-        # cycle through packages
-        for p in packages:
-            cat, pkg = p.split("/")
-            inst = p in installed
-            t = PkgData(cat, pkg, inst)
-            self._db[cat].append(t)
-            self._db[self.ALL].append(t)
-
-            if inst:
-                self.inst_cats.add(cat)
-
-        for key in self._db: # sort alphabetically
-            self._db[key].sort(key = self.__sort_key)
-
-    @lock
-    def get_cat (self, cat = None, byName = True):
-        """Returns the packages in the category.
-        
-        @param cat: category to return the packages from; if None it defaults to "ALL"
-        @type cat: string
-        @param byName: selects whether to return the list sorted by name or by installation
-        @type byName: boolean
-        @return: an iterator over a list of tuples: (category, name, is_installed) or []
-        @rtype: (string, string, boolean)<iterator>
-        """
-        
-        if not cat:
-            cat = self.ALL
-
-        def get_pkgs():
-            if byName:
-                for pkg in self._db[cat]:
-                    yield pkg
-            else:
-                ninst = []
-                for pkg in self._db[cat]:
-                    if pkg.inst:
-                        yield pkg
-                    else:
-                        ninst.append(pkg)
-
-                for pkg in ninst:
-                    yield pkg
-
-        try:
-            if self.restrict:
-                return (pkg for pkg in get_pkgs() if self.restrict.search(pkg.pkg))#if pkg[1].find(self.restrict) != -1)
-            else:
-                return get_pkgs()
-
-        except KeyError: # cat is in category list - but not in portage
-            info(_("Catched KeyError => %s seems not to be an available category. Have you played with rsync-excludes?"), cat)
-
-    @lock
-    def get_categories (self, installed = False):
-        """Returns all categories.
-        
-        @param installed: Only return these with at least one installed package.
-        @type installed: boolean
-        @returns: the list of categories
-        @rtype: string<iterator>
-        """
-
-        if not self.restrict:
-            if installed:
-                cats = self.inst_cats
-            else:
-                cats = self._db.iterkeys()
-
-        else:
-            if installed:
-                cats = set((pkg.cat for pkg in self.get_cat(self.ALL) if pkg.inst))
-            else:
-                cats = set((pkg.cat for pkg in self.get_cat(self.ALL)))
-
-            if len(cats)>1:
-                cats.add(self.ALL)
-
-        return (cat for cat in cats)
-
-    @lock
-    def reload (self, cat = None):
-        """Reloads the given category.
-        
-        @param cat: category
-        @type cat: string
-        """
-
-        if cat:
-            del self._db[cat]
-            try:
-                self.inst_cats.remove(cat)
-            except KeyError: # not in inst_cats - can be ignored
-                pass
-            
-            self._db[self.ALL] = filter(lambda x: x.cat != cat, self._db[self.ALL])
-            self.populate(cat+"/*")
-        else:
-            self.__initialize()
-            self.populate()
-
-    def get_restrict (self):
-        return self._restrict
-
-    @lock
-    def set_restrict (self, restrict):
-        if not restrict:
-            self._restrict = None
-        else:
-            try:
-                regex = re.compile(restrict, re.I)
-            except re.error, e:
-                info(_("Error while compiling search expression: '%s'."), str(e))
-            else: # only set self._restrict if no error occurred
-                self._restrict = regex
-
-    restrict = property(get_restrict, set_restrict)
-
-class SQLDatabase (object):
-    
-    ALL = _("ALL")
-    FORBIDDEN = (".bzr", ".svn", ".git", "CVS", ".hg", "_darcs")
-
-    def __init__ (self):
-        """Constructor."""
-        self._restrict = ""
-        self._lock = RLock()
-        
-        pkgdb = os.path.join(SESSION_DIR, "package.db")
-        pkgdb_existed = os.path.exists(pkgdb)
-
-        if pkgdb_existed:
-            debug("package.db already existant")
-        else:
-            debug("package.db not existant")
-
-        pkg_conn = sql.connect(os.path.join(SESSION_DIR, "package.db"))
-        pkg_conn.row_factory = sql.Row
-        pkg_conn.execute("""
-        CREATE TABLE IF NOT EXISTS packages
-        (
-            name TEXT,
-            cat TEXT,
-            inst INTEGER
-        )""")
-
-        pkg_conn.commit()
-        
-        self.was_updated = self.updated()
-        if self.was_updated or not pkgdb_existed:
-            info(_("Cleaning database..."))
-            pkg_conn.execute("DELETE FROM packages") # empty db at beginning
-            info(_("Populating database..."))
-            self.populate(connection = pkg_conn)
-            
-        pkg_conn.close()
-
-        descr_conn = sql.connect(os.path.join(SESSION_DIR, "descr.db"))
-        descr_conn.execute("""
-        CREATE TABLE IF NOT EXISTS descriptions
-        (
-            cp TEXT,
-            descr TEXT
-        )""")
-        descr_conn.close()
-
-    def updated (self):
-        changed = False
-
-        def walk (path):
-            debug("Walking %s", path)
-            
-            for root, dirs, files in os.walk(path):
-                for f in files:
-                    path = os.path.join(root, f)
-                    yield "%s %s" % (f, os.stat(path).st_mtime)
-                
-                for forbidden in self.FORBIDDEN:
-                    if forbidden in dirs:
-                        dirs.remove(forbidden)
-
-        overlays = system.get_global_settings("PORTDIR_OVERLAY").split()
-        hashes = {}
-        for overlay in overlays:
-            hashes[overlay] = hashlib.md5("".join(walk(overlay))).hexdigest()
-        
-        timestamp = os.path.join(system.get_global_settings("PORTDIR"), "metadata/timestamp")
-        hashes["ROOT"] = hashlib.md5("%s %s" % (timestamp, os.stat(timestamp).st_mtime)).hexdigest()
-    
-        dbpath = os.path.join(SESSION_DIR, "portdirs.db")
-        db_existed = os.path.exists(dbpath)
-        db = anydbm.open(dbpath, "c")
-        try:
-            if db_existed:
-                debug("portdirs.db already existant")
-                for key in set(db.keys())- set(hashes.keys()):
-                    debug("Overlay '%s' has been removed", key)
-                    del db[key]
-                    changed = True
-                
-                for key in hashes.iterkeys():
-
-                    if key not in db.keys():
-                        debug("Overlay '%s' has been added.", key)
-                        changed = True
-
-                    elif db[key] != hashes[key]:
-                        debug("Overlay '%s' has been changed.", key)
-                        changed = True
-                
-                    db[key] = hashes[key]
-            else:
-                debug("portdirs.db not existant")
-                for key in hashes.iterkeys():
-                    db[key] = hashes[key]
-
-        finally:
-            db.close()
-
-        return changed
-
-    def lock (f):
-        @wraps(f)
-        def wrapper (self, *args, **kwargs):
-            with self._lock:
-                r = f(self, *args, **kwargs)
-                
-            return r
-        
-        return wrapper
-
-    def con (f):
-        @wraps(f)
-        def wrapper (*args, **kwargs):
-            if not "connection" in kwargs:
-                con= sql.connect(os.path.join(SESSION_DIR, "package.db"))
-                con.row_factory = sql.Row
-                kwargs["connection"] = con
-
-            return f(*args, **kwargs)
-        
-        return wrapper
-
-    @lock
-    @con
-    def populate (self, category = None, connection = None):
-        """Populates the database.
-        
-        @param category: An optional category - so only packages of this category are inserted.
-        @type category: string
-        """
-
-        def _get():
-            # get the lists
-            inst = system.find_packages(pkgSet = system.SET_INSTALLED, key=category, with_version = False)
-            for p in system.find_packages(key = category, with_version = False):
-                cat, pkg = p.split("/")
-
-                yield (cat, pkg, p in inst)
-
-        connection.executemany("INSERT INTO packages (cat, name, inst) VALUES (?, ?, ?)", _get())
-        connection.commit()
-
-    @lock
-    @con
-    def get_cat (self, category = None, byName = True, connection = None):
-        """Returns the packages in the category.
-        
-        @param cat: category to return the packages from; if None it defaults to "ALL"
-        @type cat: string
-        @param byName: selects whether to return the list sorted by name or by installation
-        @type byName: boolean
-        @return: an iterator over a list of tuples: (category, name, is_installed) or []
-        @rtype: L{PkgData}<iterator>
-        """
-
-        sort = "ORDER BY name"
-        if not byName:
-            sort = "ORDER BY inst DESC, name"
-
-        if not category or category == self.ALL:
-            c = connection.execute("SELECT cat, name, inst FROM packages WHERE 1=1 %s %s" % (self.restrict, sort))
-        else:
-            c = connection.execute("SELECT cat, name, inst FROM packages WHERE cat = ? %s %s" % (self.restrict ,sort), (category,))
-        
-        for pkg in c:
-            yield PkgData(pkg["cat"], pkg["name"], pkg["inst"])
-        c.close()
-
-    @lock
-    @con
-    def get_categories (self, installed = False, connection = None):
-        """Returns all categories.
-        
-        @param installed: Only return these with at least one installed package.
-        @type installed: boolean
-        @returns: the list of categories
-        @rtype: string<iterator>
-        """
-
-        if installed:
-            where = "inst = 1"
-        else:
-            where = "1 = 1"
-
-        c = connection.execute("SELECT cat FROM packages WHERE %s %s GROUP BY cat" % (where, self.restrict))
-
-        l = c.fetchall()
-        c.close()
-
-        if len(l) > 1:
-            yield self.ALL
-        
-        for cat in l:
-            yield cat["cat"]
-
-    @lock
-    @con
-    def reload (self, cat = None, connection = None):
-        """Reloads the given category.
-        
-        @param cat: category
-        @type cat: string
-        """
-
-        if cat:
-            connection.execute("DELETE FROM packages WHERE cat = ?", (cat,))
-            connection.commit()
-            self.populate(cat+"/*", connection = connection)
-        else:
-            connection.execute("DELETE FROM packages")
-            connection.commit()
-            self.populate(connection = connection)
-
-    def get_restrict (self):
-        return self._restrict
-
-    @lock
-    def set_restrict (self, restrict):
-        if not restrict:
-            self._restrict = ""
-        else:
-            self._restrict = "AND name LIKE '%%%s%%'" % restrict
-
-    restrict = property(get_restrict, set_restrict)
-
-if USE_SQL:
-    Database = SQLDatabase
-else:
-    Database = DictDatabase
diff --git a/portato/gui/windows/main.py b/portato/gui/windows/main.py
index 87a13dc..8d5e5ae 100644
--- a/portato/gui/windows/main.py
+++ b/portato/gui/windows/main.py
@@ -26,18 +26,20 @@ from ...backend import flags, system # must be the first to avoid circular deps
 from ... import get_listener, plugin
 from ...helper import debug, warning, error, info, unique_array
 from ...session import Session
+from ...db import Database
 from ...constants import CONFIG_LOCATION, VERSION, APP_ICON, ICON_DIR
-from ...backend.exceptions import PackageNotFoundException, BlockedException
+from ...backend.exceptions import PackageNotFoundException, BlockedException, VersionsNotFoundException
 
 # more GUI stuff
-from ..utils import Database, Config, GtkThread, get_color
+from ..utils import Config, GtkThread, get_color
 from ..queue import EmergeQueue
 from ..session import SESSION_VERSION, SessionException, OldSessionException, NewSessionException
 from ..wrapper import GtkTree, GtkConsole
 from ..views import LogView, HighlightView, InstalledOnlyView, LazyStoreView
 from ..dialogs import (blocked_dialog, changed_flags_dialog, io_ex_dialog,
         nothing_found_dialog, queue_not_empty_dialog, remove_deps_dialog,
-        remove_queue_dialog, remove_updates_dialog, unmask_dialog)
+        remove_queue_dialog, remove_updates_dialog, unmask_dialog,
+        no_versions_dialog)
 from ..exceptions import PreReqError
 
 # even more GUI stuff
@@ -748,14 +750,18 @@ class MainWindow (Window):
         store.clear()
 
         if name:
-            for cat, pkg, is_inst in self.db.get_cat(name, self.sortPkgListByName):
-                if is_inst:
+            for pkg in self.db.get_cat(name, self.sortPkgListByName):
+                if pkg.disabled:
+                    warning(_("Package '%s/%s' is disabled."), pkg.cat, pkg.pkg)
+                    continue
+
+                if pkg.inst:
                     icon = self.icons["installed"]
                 elif not self.showAll:
                     continue # ignore not installed packages
                 else:
                     icon = None
-                store.append([icon, pkg, cat])
+                store.append([icon, pkg.pkg, pkg.cat])
 
     def build_version_list (self):
         store = gtk.ListStore(gtk.gdk.Pixbuf, str, str)
@@ -809,6 +815,8 @@ class MainWindow (Window):
             self.slotcol.set_visible(False)
 
         packages = system.sort_package_list(system.find_packages(cp, masked=True))
+        if not packages:
+            raise VersionsNotFoundException(cp)
         
         # append versions
         for vers, inst, slot in ((x.get_version(), x.is_installed(), get_slot(x)) for x in packages):
@@ -1344,8 +1352,17 @@ class MainWindow (Window):
         """
         store, it = selection.get_selected()
         if it:
+            oldcp = self.selCP
+
             self.selCP = "%s/%s" % (store.get_value(it, 2), store.get_value(it, 1))
-            self.fill_version_list(self.selCP)
+            try:
+                self.fill_version_list(self.selCP)
+            except VersionsNotFoundException, e:
+                warning(_("No versions of package '%s' found!.") % self.selCP)
+                no_versions_dialog(self.selCP)
+                self.db.disable(self.selCP)
+                self.selCP = oldcp
+
         return True
 
     def cb_pkg_list_header_clicked(self, col):
@@ -1832,8 +1849,8 @@ class MainWindow (Window):
                 self.__save_queue = (ret == gtk.RESPONSE_YES)
                 self.queue.kill_emerge()
 
-        # write session
-        self.session.save()
+        # write sessions
+        Session.close()
         
         return False