fix testcase expecting incorrect remove log from dpkg

[apt.git] / apt-private / private-output.h

diff --git a/apt-private/private-output.h b/apt-private/private-output.h
index 2a2a694584b9567d869734ec98de7087f2ba3cf7..bb9428d7f916321de4b7ad670116813d1113d877 100644 (file)
--- a/apt-private/private-output.h
+++ b/apt-private/private-output.h
@@ -1,37 +1,94 @@
 #ifndef APT_PRIVATE_OUTPUT_H
 #define APT_PRIVATE_OUTPUT_H
 
 #ifndef APT_PRIVATE_OUTPUT_H
 #define APT_PRIVATE_OUTPUT_H
 

+#include <apt-pkg/configuration.h>
+#include <apt-pkg/pkgcache.h>
+#include <apt-pkg/macros.h>

 
 

-#include <iostream>
+#include <functional>

 #include <fstream>
 #include <string>
 #include <fstream>
 #include <string>

-
-#include "private-cachefile.h"
+#include <iostream>

 
 // forward declaration
 class pkgCacheFile;
 class CacheFile;
 
 // forward declaration
 class pkgCacheFile;
 class CacheFile;

-class pkgCache;

 class pkgDepCache;
 class pkgRecords;
 
 
 class pkgDepCache;
 class pkgRecords;
 
 

-extern std::ostream c0out;
-extern std::ostream c1out;
-extern std::ostream c2out;
-extern std::ofstream devnull;
-extern unsigned int ScreenWidth;
+APT_PUBLIC extern std::ostream c0out;
+APT_PUBLIC extern std::ostream c1out;
+APT_PUBLIC extern std::ostream c2out;
+APT_PUBLIC extern std::ofstream devnull;
+APT_PUBLIC extern unsigned int ScreenWidth;

 
 

-bool InitOutput();
-void ListSingleVersion(pkgCacheFile &CacheFile, pkgRecords &records, 
-                       pkgCache::VerIterator V, std::ostream &out,
-                       bool include_summary=true);
+APT_PUBLIC bool InitOutput(std::basic_streambuf<char> * const out = std::cout.rdbuf());
+
+void ListSingleVersion(pkgCacheFile &CacheFile, pkgRecords &records,
+                       pkgCache::VerIterator const &V, std::ostream &out,
+                       std::string const &format);

 
 
 // helper to describe global state
 
 
 // helper to describe global state

-bool ShowList(std::ostream &out, std::string Title, std::string List,
-              std::string VersionsList);
-void ShowBroken(std::ostream &out,CacheFile &Cache,bool Now);
+APT_PUBLIC void ShowBroken(std::ostream &out, CacheFile &Cache, bool const Now);
+APT_PUBLIC void ShowBroken(std::ostream &out, pkgCacheFile &Cache, bool const Now);
+
+template<class Container, class PredicateC, class DisplayP, class DisplayV> bool ShowList(std::ostream &out, std::string const &Title,
+      Container const &cont,
+      PredicateC Predicate,
+      DisplayP PkgDisplay,
+      DisplayV VerboseDisplay)
+{
+   size_t const ScreenWidth = (::ScreenWidth > 3) ? ::ScreenWidth - 3 : 0;
+   int ScreenUsed = 0;
+   bool const ShowVersions = _config->FindB("APT::Get::Show-Versions", false);
+   bool printedTitle = false;
+
+   for (auto const &Pkg: cont)
+   {
+      if (Predicate(Pkg) == false)
+        continue;
+
+      if (printedTitle == false)
+      {
+        out << Title;
+        printedTitle = true;
+      }
+
+      if (ShowVersions == true)
+      {
+        out << std::endl << "   " << PkgDisplay(Pkg);
+        std::string const verbose = VerboseDisplay(Pkg);
+        if (verbose.empty() == false)
+           out << " (" << verbose << ")";
+      }
+      else
+      {
+        std::string const PkgName = PkgDisplay(Pkg);
+        if (ScreenUsed == 0 || (ScreenUsed + PkgName.length()) >= ScreenWidth)
+        {
+           out << std::endl << "  ";
+           ScreenUsed = 0;
+        }
+        else if (ScreenUsed != 0)
+        {
+           out << " ";
+           ++ScreenUsed;
+        }
+        out << PkgName;
+        ScreenUsed += PkgName.length();
+      }
+   }
+
+   if (printedTitle == true)
+   {
+      out << std::endl;
+      return false;
+   }
+   return true;
+}
+

 void ShowNew(std::ostream &out,CacheFile &Cache);
 void ShowDel(std::ostream &out,CacheFile &Cache);
 void ShowKept(std::ostream &out,CacheFile &Cache);
 void ShowNew(std::ostream &out,CacheFile &Cache);
 void ShowDel(std::ostream &out,CacheFile &Cache);
 void ShowKept(std::ostream &out,CacheFile &Cache);


@@ -44,7 +101,15 @@ bool ShowEssential(std::ostream &out,CacheFile &Cache);
 void Stats(std::ostream &out, pkgDepCache &Dep);
 
 // prompting
 void Stats(std::ostream &out, pkgDepCache &Dep);
 
 // prompting

-bool YnPrompt(bool Default=true);
-bool AnalPrompt(const char *Text);
+bool YnPrompt(char const * const Question, bool Default=true);
+bool AnalPrompt(std::string const &Question, const char *Text);
+
+std::string PrettyFullName(pkgCache::PkgIterator const &Pkg);
+std::string CandidateVersion(pkgCacheFile * const Cache, pkgCache::PkgIterator const &Pkg);
+std::function<std::string(pkgCache::PkgIterator const &)> CandidateVersion(pkgCacheFile * const Cache);
+std::string CurrentToCandidateVersion(pkgCacheFile * const Cache, pkgCache::PkgIterator const &Pkg);
+std::function<std::string(pkgCache::PkgIterator const &)> CurrentToCandidateVersion(pkgCacheFile * const Cache);
+std::string EmptyString(pkgCache::PkgIterator const &);
+bool AlwaysTrue(pkgCache::PkgIterator const &);

 
 #endif
 
 #endif