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

pkgman: Use BNumberFormat for i18n

Browse Source 
Change-Id: I2441f1d37bfccd5f5dbc9b763aeb87d017e628bc
Reviewed-on: https://review.haiku-os.org/c/haiku/+/7508
Haiku-Format: Haiku-format Bot <no-reply+haikuformatbot@haiku-os.org>
Tested-by: Commit checker robot <no-reply+buildbot@haiku-os.org>
Reviewed-by: Adrien Destugues <pulkomandy@pulkomandy.tk>
This commit is contained in:
Emir SARI 2024-03-05 21:46:47 +03:00 committed by Adrien Destugues
parent 058be77bec
commit bc6674c89e
2 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,5 +1,5 @@
/*
* Copyright 2013-2015, Haiku, Inc. All Rights Reserved.
* Copyright 2013-2024, Haiku, Inc. All Rights Reserved.
* Distributed under the terms of the MIT License.
*
* Authors:
@ -178,8 +178,12 @@ PackageManager::ProgressPackageDownloadStarted(const char* packageName)
fLastRateCalcTime = system_time();
fDownloadRate = 0;
if (fShowProgress)
printf(" 0%%");
if (fShowProgress) {
char percentString[32];
fNumberFormat.FormatPercent(percentString, sizeof(percentString), 0.0);
// Make sure there is enough space for '100 %' percent format
printf("%6s", percentString);
}
}
@ -215,10 +219,12 @@ PackageManager::ProgressPackageDownloadActive(const char* packageName,
if (width < 30) {
// Not much space for anything, just draw a percentage
leftStr.SetToFormat("%3d%%", (int)(completionPercentage * 100));
fNumberFormat.FormatPercent(leftStr, completionPercentage);
} else {
leftStr.SetToFormat("%3d%% %s", (int)(completionPercentage * 100),
packageName);
BString dataString;
fNumberFormat.FormatPercent(dataString, completionPercentage);
// Make sure there is enough space for '100 %' percent format
leftStr.SetToFormat("%6s %s", dataString.String(), packageName);
char byteBuffer[32];
char totalBuffer[32];
@ -267,7 +273,10 @@ PackageManager::ProgressPackageDownloadComplete(const char* packageName)
}
char byteBuffer[32];
printf("100%% %s [%s]\n", packageName,
char percentString[32];
fNumberFormat.FormatPercent(percentString, sizeof(percentString), 1.0);
// Make sure there is enough space for '100 %' percent format
printf("%6s %s [%s]\n", percentString, packageName,
string_for_size(fLastBytes, byteBuffer, sizeof(byteBuffer)));
fflush(stdout);
}

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

@ -13,6 +13,8 @@
#include <package/DaemonClient.h>
#include <package/manager/PackageManager.h>
#include <NumberFormat.h>
#include "DecisionProvider.h"
@ -68,6 +70,7 @@ private:
private:
DecisionProvider fDecisionProvider;
BNumberFormat fNumberFormat;
BPackageManager::ClientInstallationInterface
fClientInstallationInterface;
bool fInteractive;