Make PackageSet to behave more like a real set, and change loading logic a bit to...

svn path=/main/trunk/; revision=7272

diff --git a/pym/portage/sets/__init__.py b/pym/portage/sets/__init__.py
index 4e1e68e4d96c5ad1d68884e0fea7db8f5cdfa857..51db6e2f0150a2d877b22a22f102e1b0877aca9d 100644 (file)
--- a/pym/portage/sets/__init__.py
+++ b/pym/portage/sets/__init__.py
@@ -13,7 +13,7 @@ DEFAULT_SETS = ["world", "system", "everything", "security"] \
        +["package_"+x for x in ["mask", "unmask", "use", "keywords"]]
 
 class PackageSet(object):
-       # That this to operations that are supported by this set class. While 
+       # Set this to operations that are supported by your subclass. While 
        # technically there is no difference between "merge" and "unmerge" regarding
        # package sets, the latter doesn't make sense for some sets like "system"
        # or "security" and therefore isn't supported by them.
@@ -21,8 +21,8 @@ class PackageSet(object):
 
        def __init__(self, name):
                self._name = name
-               self._atoms = []
-               self._loaded = False
+               self._atoms = set()
+               self._mtime = None
        
        def supportsOperation(self, op):
                if not op in OPERATIONS:
@@ -30,9 +30,8 @@ class PackageSet(object):
                return op in self._operations
        
        def getAtoms(self):
-               if not self._loaded:
+               if not self._mtime or self.supportsOperation("edit"):
                        self.load()
-                       self._loaded = True
                return self._atoms
 
        def _setAtoms(self, atoms):
@@ -43,22 +42,27 @@ class PackageSet(object):
                        elif not isvalidatom(a):
                                raise InvalidAtom(a)
                self._atoms = atoms
+               if not self.supportsOperation("edit"):
+                       self._mtime = True
        
        def getName(self):
                return self._name
        
-       def addAtom(self, atom):
+       def updateAtoms(self, atoms):
                if self.supportsOperation("edit"):
                        self.load()
-                       self._atoms.append(atom)
+                       self._atoms.update(atoms)
                        self.write()
                else:
                        raise NotImplementedError()
+       
+       def addAtom(self, atom):
+               self.updateAtoms([atom])
 
        def removeAtom(self, atom):
                if self.supportsOperation("edit"):
                        self.load()
-                       self._atoms.remove(atom)
+                       self._atoms.discard(atom)
                        self.write()
                else:
                        raise NotImplementedError()
@@ -74,6 +78,8 @@ class PackageSet(object):
 
        def load(self):
                # This method must be overwritten by subclasses
+               # Editable sets should use the value of self._mtime to determine if they
+               # need to reload themselves
                raise NotImplementedError()
 
        def containsCPV(self, cpv):
@@ -89,6 +95,8 @@ class InternalPackageSet(PackageSet):
        def load(self):
                pass
 
+       def write(self):
+               pass
 
 def make_default_sets(configroot, root, profile_paths, settings=None, 
                vdbapi=None, portdbapi=None):

diff --git a/pym/portage/sets/files.py b/pym/portage/sets/files.py
index 6fc9f042696b544f4f576ad3d82e8ca9aa0b2364..c4b3f73f6d0d186d34fa9e93e131b67d9343fd5a 100644 (file)
--- a/pym/portage/sets/files.py
+++ b/pym/portage/sets/files.py
@@ -3,6 +3,7 @@
 # $Id$
 
 from portage.util import grabfile_package, grabdict_package, write_atomic
+import os
 
 from portage.sets import PackageSet
 
@@ -17,6 +18,12 @@ class StaticFileSet(PackageSet):
                write_atomic(self._filename, "\n".join(self._atoms)+"\n")
        
        def load(self):
+               mtime = os.stat(self._filename).st_mtime
+               if not self._mtime or self._mtime != mtime:
+                       self._load()
+                       self._mtime = mtime
+       
+       def _load(self):
                self._setAtoms(grabfile_package(self._filename, recursive=True))
        
 class ConfigFileSet(StaticFileSet):
@@ -25,6 +32,6 @@ class ConfigFileSet(StaticFileSet):
        def write(self):
                raise NotImplementedError()
        
-       def load(self):
+       def _load(self):
                self._setAtoms(grabdict_package(self._filename, recursive=True).keys())