summaryrefslogtreecommitdiff
path: root/apt-pkg/iprogress.cc
diff options
context:
space:
mode:
authorMichael Vogt <mvo@debian.org>2013-10-13 15:05:04 +0200
committerMichael Vogt <mvo@debian.org>2013-10-13 15:05:04 +0200
commite6ad8031b774af9bdd5d460d9983450bb5a03d0d (patch)
treec337e4b089a091770b181c9575ab61eea9cb0074 /apt-pkg/iprogress.cc
parent6c5ae8ed079e01082f606614641b19b7c08893ad (diff)
move the status-fd progress reporting out of the pkgDPkgPM class, at this point, breaks ABI/API, lets see what we can do about this
Diffstat (limited to 'apt-pkg/iprogress.cc')
-rw-r--r--apt-pkg/iprogress.cc95
1 files changed, 89 insertions, 6 deletions
diff --git a/apt-pkg/iprogress.cc b/apt-pkg/iprogress.cc
index 398059051..6c5d33d4a 100644
--- a/apt-pkg/iprogress.cc
+++ b/apt-pkg/iprogress.cc
@@ -1,16 +1,22 @@
+#include <apt-pkg/configuration.h>
+#include <apt-pkg/fileutl.h>
#include <apt-pkg/iprogress.h>
#include <apt-pkg/strutl.h>
+
#include <apti18n.h>
#include <termios.h>
#include <sys/ioctl.h>
+#include <sstream>
+
namespace APT {
namespace Progress {
bool PackageManager::StatusChanged(std::string PackageName,
- unsigned int StepsDone,
- unsigned int TotalSteps)
+ unsigned int StepsDone,
+ unsigned int TotalSteps,
+ std::string HumanReadableAction)
{
int reporting_steps = _config->FindI("DpkgPM::Reporting-Steps", 1);
percentage = StepsDone/(float)TotalSteps * 100.0;
@@ -22,6 +28,80 @@ bool PackageManager::StatusChanged(std::string PackageName,
return true;
}
+PackageManagerProgressFd::PackageManagerProgressFd(int progress_fd)
+{
+ OutStatusFd = progress_fd;
+}
+
+void PackageManagerProgressFd::Started()
+{
+ _config->Set("APT::Keep-Fds::", OutStatusFd);
+
+ // send status information that we are about to fork dpkg
+ if(OutStatusFd > 0) {
+ std::ostringstream status;
+ status << "pmstatus:dpkg-exec:"
+ << (StepsDone/float(StepsTotal)*100.0)
+ << ":" << _("Running dpkg")
+ << std::endl;
+ FileFd::Write(OutStatusFd, status.str().c_str(), status.str().size());
+ }
+}
+
+void PackageManagerProgressFd::Finished()
+{
+ // clear the Keep-Fd again
+ _config->Clear("APT::Keep-Fds", OutStatusFd);
+}
+
+void PackageManagerProgressFd::Error(std::string PackageName,
+ unsigned int StepsDone,
+ unsigned int TotalSteps,
+ std::string ErrorMessage)
+{
+ std::ostringstream status;
+ status << "pmerror:" << PackageName
+ << ":" << (StepsDone/float(TotalSteps)*100.0)
+ << ":" << ErrorMessage
+ << std::endl;
+ if(OutStatusFd > 0)
+ FileFd::Write(OutStatusFd, status.str().c_str(), status.str().size());
+}
+
+void PackageManagerProgressFd::ConffilePrompt(std::string PackageName,
+ unsigned int StepsDone,
+ unsigned int TotalSteps,
+ std::string ConfMessage)
+{
+ std::ostringstream status;
+ status << "pmconffile:" << PackageName
+ << ":" << (StepsDone/float(TotalSteps)*100.0)
+ << ":" << ConfMessage
+ << std::endl;
+ if(OutStatusFd > 0)
+ FileFd::Write(OutStatusFd, status.str().c_str(), status.str().size());
+}
+
+
+bool PackageManagerProgressFd::StatusChanged(std::string PackageName,
+ unsigned int xStepsDone,
+ unsigned int xTotalSteps,
+ std::string pkg_action)
+{
+ StepsDone = xStepsDone;
+ StepsTotal = xTotalSteps;
+
+ // build the status str
+ std::ostringstream status;
+ status << "pmstatus:" << PackageName
+ << ":" << (StepsDone/float(StepsTotal)*100.0)
+ << ":" << pkg_action
+ << std::endl;
+ if(OutStatusFd > 0)
+ FileFd::Write(OutStatusFd, status.str().c_str(), status.str().size());
+ return true;
+}
+
void PackageManagerFancy::SetupTerminalScrollArea(int nr_rows)
{
// scroll down a bit to avoid visual glitch when the screen
@@ -72,9 +152,11 @@ void PackageManagerFancy::Finished()
bool PackageManagerFancy::StatusChanged(std::string PackageName,
unsigned int StepsDone,
- unsigned int TotalSteps)
+ unsigned int TotalSteps,
+ std::string HumanReadableAction)
{
- if (!PackageManager::StatusChanged(PackageName, StepsDone, TotalSteps))
+ if (!PackageManager::StatusChanged(PackageName, StepsDone, TotalSteps,
+ HumanReadableAction))
return false;
int row = nr_terminal_rows;
@@ -105,9 +187,10 @@ bool PackageManagerFancy::StatusChanged(std::string PackageName,
bool PackageManagerText::StatusChanged(std::string PackageName,
unsigned int StepsDone,
- unsigned int TotalSteps)
+ unsigned int TotalSteps,
+ std::string HumanReadableAction)
{
- if (!PackageManager::StatusChanged(PackageName, StepsDone, TotalSteps))
+ if (!PackageManager::StatusChanged(PackageName, StepsDone, TotalSteps, HumanReadableAction))
return false;
std::cout << progress_str << "\r\n";