reenable support for -s (and co) in apt-get source

[apt.git] / apt-private / private-search.cc

diff --git a/apt-private/private-search.cc b/apt-private/private-search.cc
index ff4140fa70099d09128445c4b7490402f8e82e78..6bce9ffa4a3143254bf77be6113ada18f4406bf2 100644 (file)
--- a/apt-private/private-search.cc
+++ b/apt-private/private-search.cc
@@ -1,40 +1,30 @@
 // Includes                                                            /*{{{*/
 // Includes                                                            /*{{{*/

-#include <apt-pkg/error.h>
+#include <config.h>
+

 #include <apt-pkg/cachefile.h>
 #include <apt-pkg/cachefile.h>

-#include <apt-pkg/cachefilter.h>

 #include <apt-pkg/cacheset.h>
 #include <apt-pkg/cacheset.h>

-#include <apt-pkg/init.h>
-#include <apt-pkg/progress.h>
-#include <apt-pkg/sourcelist.h>

 #include <apt-pkg/cmndline.h>
 #include <apt-pkg/cmndline.h>

-#include <apt-pkg/strutl.h>
-#include <apt-pkg/fileutl.h>

 #include <apt-pkg/pkgrecords.h>
 #include <apt-pkg/pkgrecords.h>

-#include <apt-pkg/srcrecords.h>
-#include <apt-pkg/version.h>

 #include <apt-pkg/policy.h>
 #include <apt-pkg/policy.h>

-#include <apt-pkg/tagfile.h>
-#include <apt-pkg/algorithms.h>
-#include <apt-pkg/sptr.h>
-#include <apt-pkg/pkgsystem.h>
-#include <apt-pkg/indexfile.h>
-#include <apt-pkg/metaindex.h>
+#include <apt-pkg/progress.h>
+#include <apt-pkg/cacheiterators.h>
+#include <apt-pkg/configuration.h>
+#include <apt-pkg/depcache.h>
+#include <apt-pkg/macros.h>
+#include <apt-pkg/pkgcache.h>

 
 

-#include <sstream>
-#include <utility>
-#include <cassert>
-#include <locale.h>
+#include <apt-private/private-cacheset.h>
+#include <apt-private/private-output.h>
+#include <apt-private/private-search.h>
+
+#include <string.h>

 #include <iostream>
 #include <iostream>

-#include <unistd.h>
-#include <errno.h>
-#include <regex.h>
-#include <stdio.h>
-#include <iomanip>
-#include <algorithm>
+#include <sstream>

 #include <map>
 #include <map>

+#include <string>
+#include <utility>

 
 

-#include "private-search.h"
-#include "private-cacheset.h"
+#include <apti18n.h>

                                                                        /*}}}*/
 
 bool FullTextSearch(CommandLine &CmdL)                                 /*{{{*/
                                                                        /*}}}*/
 
 bool FullTextSearch(CommandLine &CmdL)                                 /*{{{*/


@@ -42,58 +32,96 @@ bool FullTextSearch(CommandLine &CmdL)                                      /*{{{*/
    pkgCacheFile CacheFile;
    pkgCache *Cache = CacheFile.GetPkgCache();
    pkgDepCache::Policy *Plcy = CacheFile.GetPolicy();
    pkgCacheFile CacheFile;
    pkgCache *Cache = CacheFile.GetPkgCache();
    pkgDepCache::Policy *Plcy = CacheFile.GetPolicy();

-   pkgRecords records(CacheFile);

    if (unlikely(Cache == NULL || Plcy == NULL))
       return false;
 
    if (unlikely(Cache == NULL || Plcy == NULL))
       return false;
 

-   const char **patterns;
-   patterns = CmdL.FileList + 1;
+   // Make sure there is at least one argument
+   unsigned int const NumPatterns = CmdL.FileSize() -1;
+   if (NumPatterns < 1)
+      return _error->Error(_("You must give at least one search pattern"));
+
+#define APT_FREE_PATTERNS() for (std::vector<regex_t>::iterator P = Patterns.begin(); \
+      P != Patterns.end(); ++P) { regfree(&(*P)); }
+
+   // Compile the regex pattern
+   std::vector<regex_t> Patterns;
+   for (unsigned int I = 0; I != NumPatterns; ++I)
+   {
+      regex_t pattern;
+      if (regcomp(&pattern, CmdL.FileList[I + 1], REG_EXTENDED | REG_ICASE | REG_NOSUB) != 0)
+      {
+        APT_FREE_PATTERNS();
+        return _error->Error("Regex compilation error");
+      }
+      Patterns.push_back(pattern);
+   }
+
+   bool const NamesOnly = _config->FindB("APT::Cache::NamesOnly", false);

 
    std::map<std::string, std::string> output_map;
 
    std::map<std::string, std::string> output_map;

-   std::map<std::string, std::string>::const_iterator K;

 
    LocalitySortedVersionSet bag;
 
    LocalitySortedVersionSet bag;

-   OpTextProgress progress;
+   OpTextProgress progress(*_config);

    progress.OverallProgress(0, 100, 50,  _("Sorting"));
    progress.OverallProgress(0, 100, 50,  _("Sorting"));

-   GetLocalitySortedVersionSet(CacheFile, bag, progress);
+   GetLocalitySortedVersionSet(CacheFile, &bag, &progress);

    LocalitySortedVersionSet::iterator V = bag.begin();
 
    progress.OverallProgress(50, 100, 50,  _("Full Text Search"));
    progress.SubProgress(bag.size());
    LocalitySortedVersionSet::iterator V = bag.begin();
 
    progress.OverallProgress(50, 100, 50,  _("Full Text Search"));
    progress.SubProgress(bag.size());

+   pkgRecords records(CacheFile);
+
+   std::string format = "${color:highlight}${Package}${color:neutral}/${Origin} ${Version} ${Architecture}${ }${apt:Status}\n";
+   if (_config->FindB("APT::Cache::ShowFull",false) == false)
+      format += "  ${Description}\n";
+   else
+      format += "  ${LongDescription}\n";
+

    int Done = 0;
    int Done = 0;

-   for ( ;V != bag.end(); V++)
+   std::vector<bool> PkgsDone(Cache->Head().PackageCount, false);
+   for ( ;V != bag.end(); ++V)

    {
       if (Done%500 == 0)
          progress.Progress(Done);
    {
       if (Done%500 == 0)
          progress.Progress(Done);

-      Done++;
-      
-      int i;
+      ++Done;
+
+      // we want to list each package only once
+      pkgCache::PkgIterator const P = V.ParentPkg();
+      if (PkgsDone[P->ID] == true)
+        continue;
+
+      char const * const PkgName = P.Name();

       pkgCache::DescIterator Desc = V.TranslatedDescription();
       pkgRecords::Parser &parser = records.Lookup(Desc.FileList());
       pkgCache::DescIterator Desc = V.TranslatedDescription();
       pkgRecords::Parser &parser = records.Lookup(Desc.FileList());

-     
+      std::string const LongDesc = parser.LongDesc();
+

       bool all_found = true;
       bool all_found = true;

-      for(i=0; patterns[i] != NULL; i++) 
+      for (std::vector<regex_t>::const_iterator pattern = Patterns.begin();
+           pattern != Patterns.end(); ++pattern)

       {
       {

-         // FIXME: use regexp instead of simple find()
-         const char *pattern = patterns[i];
-         all_found &=  (
-            strstr(V.ParentPkg().Name(), pattern) != NULL ||
-            parser.ShortDesc().find(pattern) != std::string::npos ||
-            parser.LongDesc().find(pattern) != std::string::npos);
+        if (regexec(&(*pattern), PkgName, 0, 0, 0) == 0)
+           continue;
+        else if (NamesOnly == false && regexec(&(*pattern), LongDesc.c_str(), 0, 0, 0) == 0)
+           continue;
+        // search patterns are AND, so one failing fails all
+        all_found = false;
+        break;

       }
       }

-      if (all_found)
+      if (all_found == true)

       {
       {

-            std::stringstream outs;
-            ListSingleVersion(CacheFile, records, V, outs);
-            output_map.insert(std::make_pair<std::string, std::string>(
-                                 V.ParentPkg().Name(), outs.str()));
+        PkgsDone[P->ID] = true;
+        std::stringstream outs;
+        ListSingleVersion(CacheFile, records, V, outs, format);
+        output_map.insert(std::make_pair<std::string, std::string>(
+                 PkgName, outs.str()));

       }
    }
       }
    }

+   APT_FREE_PATTERNS();

    progress.Done();
 
    // FIXME: SORT! and make sorting flexible (alphabetic, by pkg status)
    // output the sorted map
    progress.Done();
 
    // FIXME: SORT! and make sorting flexible (alphabetic, by pkg status)
    // output the sorted map

-   for (K = output_map.begin(); K != output_map.end(); K++)
+   std::map<std::string, std::string>::const_iterator K;
+   for (K = output_map.begin(); K != output_map.end(); ++K)

       std::cout << (*K).second << std::endl;
 
    return true;
       std::cout << (*K).second << std::endl;
 
    return true;