Add ?config-files and ?installed patterns

These two are mutually exclusive states of installed-ness. And
?installed package is fully unpacked and configured; a ?config-files
package only has config files left.

2 files changed, 23 insertions, 0 deletions

diff --git a/apt-pkg/cachefilter-patterns.cc b/apt-pkg/cachefilter-patterns.cc
index b97d65a03..0f23890b4 100644
--- a/apt-pkg/cachefilter-patterns.cc
+++ b/apt-pkg/cachefilter-patterns.cc
@@ -212,10 +212,14 @@ std::unique_ptr<APT::CacheFilter::Matcher> PatternParser::aPattern(std::unique_p
       return std::make_unique<APT::CacheFilter::PackageArchitectureMatchesSpecification>(aWord(node->arguments[0]));
    if (node->matches("?automatic", 0, 0))
       return std::make_unique<Patterns::PackageIsAutomatic>(file);
+   if (node->matches("?config-files", 0, 0))
+      return std::make_unique<Patterns::PackageIsConfigFiles>();
    if (node->matches("?false", 0, 0))
       return std::make_unique<APT::CacheFilter::FalseMatcher>();
    if (node->matches("?garbage", 0, 0))
       return std::make_unique<Patterns::PackageIsGarbage>(file);
+   if (node->matches("?installed", 0, 0))
+      return std::make_unique<Patterns::PackageIsInstalled>(file);
    if (node->matches("?name", 1, 1))
       return std::make_unique<APT::CacheFilter::PackageNameMatchesRegEx>(aWord(node->arguments[0]));
    if (node->matches("?not", 1, 1))
diff --git a/apt-pkg/cachefilter-patterns.h b/apt-pkg/cachefilter-patterns.h
index 68ad32f9a..7770385c9 100644
--- a/apt-pkg/cachefilter-patterns.h
+++ b/apt-pkg/cachefilter-patterns.h
@@ -128,6 +128,14 @@ struct PackageIsAutomatic : public PackageMatcher
    }
 };
 
+struct PackageIsConfigFiles : public PackageMatcher
+{
+   bool operator()(pkgCache::PkgIterator const &Pkg) override
+   {
+      return Pkg->CurrentState == pkgCache::State::ConfigFiles;
+   }
+};
+
 struct PackageIsGarbage : public PackageMatcher
 {
    pkgCacheFile *Cache;
@@ -139,6 +147,17 @@ struct PackageIsGarbage : public PackageMatcher
    }
 };
 
+struct PackageIsInstalled : public PackageMatcher
+{
+   pkgCacheFile *Cache;
+   explicit PackageIsInstalled(pkgCacheFile *Cache) : Cache(Cache) {}
+   bool operator()(pkgCache::PkgIterator const &Pkg) override
+   {
+      assert(Cache != nullptr);
+      return Pkg->CurrentVer != 0;
+   }
+};
+
 struct PackageIsObsolete : public PackageMatcher
 {
    bool operator()(pkgCache::PkgIterator const &pkg) override