Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pkgman: Split "interactive" and "show progress" logic.

Browse Source 
Previously we didn't show progress in non-interactive mode. Now
we do, so long as stdout is a TTY.

Fixes #14603.
This commit is contained in:
Augustin Cavalier 2019-05-13 19:31:56 -04:00
parent 7115cef989
commit 45c3eb3a3c
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/bin/pkgman/PackageManager.cpp
View File

@ -173,10 +173,13 @@ PackageManager::Warn(status_t error, const char* format, ...)
void
PackageManager::ProgressPackageDownloadStarted(const char* packageName)
{
fShowProgress = isatty(STDOUT_FILENO);
fLastBytes = 0;
fLastRateCalcTime = system_time();
fDownloadRate = 0;
printf(" 0%%");
if (fShowProgress)
printf(" 0%%");
}
@ -186,7 +189,7 @@ PackageManager::ProgressPackageDownloadActive(const char* packageName,
{
if (bytes == totalBytes)
fLastBytes = totalBytes;
if (!fInteractive)
if (!fShowProgress)
return;
// Do not update if nothing changed in the last 500ms
@ -258,7 +261,7 @@ PackageManager::ProgressPackageDownloadActive(const char* packageName,
void
PackageManager::ProgressPackageDownloadComplete(const char* packageName)
{
if (fInteractive) {
if (fShowProgress) {
// Erase the line, return to the start, and reset colors
printf("\r\33[2K\r\x1B[0m");
}

1
src/bin/pkgman/PackageManager.h
View File

@ -72,6 +72,7 @@ private:
fClientInstallationInterface;
bool fInteractive;
bool fShowProgress;
off_t fLastBytes;
bigtime_t fLastRateCalcTime;
float fDownloadRate;