summaryrefslogtreecommitdiff
path: root/apt-pkg/iprogress.cc
diff options
context:
space:
mode:
authorMichael Vogt <mvo@debian.org>2013-10-11 22:48:22 +0200
committerMichael Vogt <mvo@debian.org>2013-10-11 22:48:22 +0200
commit6c5ae8ed079e01082f606614641b19b7c08893ad (patch)
tree30d168e66eed72236853fe8ce99e4d7bcae2bcb0 /apt-pkg/iprogress.cc
parentdb78c60c6a726ed70fa8b0984090b80840444016 (diff)
move common code into PackageManager::StatusChanged()
Diffstat (limited to 'apt-pkg/iprogress.cc')
-rw-r--r--apt-pkg/iprogress.cc43
1 files changed, 25 insertions, 18 deletions
diff --git a/apt-pkg/iprogress.cc b/apt-pkg/iprogress.cc
index 68a2c7207..398059051 100644
--- a/apt-pkg/iprogress.cc
+++ b/apt-pkg/iprogress.cc
@@ -1,5 +1,6 @@
#include <apt-pkg/iprogress.h>
#include <apt-pkg/strutl.h>
+#include <apti18n.h>
#include <termios.h>
#include <sys/ioctl.h>
@@ -7,6 +8,20 @@
namespace APT {
namespace Progress {
+bool PackageManager::StatusChanged(std::string PackageName,
+ unsigned int StepsDone,
+ unsigned int TotalSteps)
+{
+ int reporting_steps = _config->FindI("DpkgPM::Reporting-Steps", 1);
+ percentage = StepsDone/(float)TotalSteps * 100.0;
+ strprintf(progress_str, _("Progress: [%3i%%]"), (int)percentage);
+
+ if(percentage < (last_reported_progress + reporting_steps))
+ return false;
+
+ return true;
+}
+
void PackageManagerFancy::SetupTerminalScrollArea(int nr_rows)
{
// scroll down a bit to avoid visual glitch when the screen
@@ -55,18 +70,12 @@ void PackageManagerFancy::Finished()
}
}
-void PackageManagerFancy::StatusChanged(std::string PackageName,
+bool PackageManagerFancy::StatusChanged(std::string PackageName,
unsigned int StepsDone,
unsigned int TotalSteps)
{
- int reporting_steps = _config->FindI("DpkgPM::Reporting-Steps", 1);
- float percentage = StepsDone/(float)TotalSteps * 100.0;
-
- if(percentage < (last_reported_progress + reporting_steps))
- return;
-
- std::string progress_str;
- strprintf(progress_str, "Progress: [%3i%%]", (int)percentage);
+ if (!PackageManager::StatusChanged(PackageName, StepsDone, TotalSteps))
+ return false;
int row = nr_terminal_rows;
@@ -90,25 +99,23 @@ void PackageManagerFancy::StatusChanged(std::string PackageName,
<< restore_fg;
std::flush(std::cout);
last_reported_progress = percentage;
+
+ return true;
}
-void PackageManagerText::StatusChanged(std::string PackageName,
+bool PackageManagerText::StatusChanged(std::string PackageName,
unsigned int StepsDone,
unsigned int TotalSteps)
{
- int reporting_steps = _config->FindI("DpkgPM::Reporting-Steps", 1);
- float percentage = StepsDone/(float)TotalSteps * 100.0;
-
- if(percentage < (last_reported_progress + reporting_steps))
- return;
-
- std::string progress_str;
- strprintf(progress_str, "Progress: [%3i%%]", (int)percentage);
+ if (!PackageManager::StatusChanged(PackageName, StepsDone, TotalSteps))
+ return false;
std::cout << progress_str << "\r\n";
std::flush(std::cout);
last_reported_progress = percentage;
+
+ return true;
}