cry/Hyprland
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

hyprpm: Minor optimizations and refactor of helpers and progress bar (#10246)

Browse source 
* hyprpm: optimize sys.cpp

* hyprpm: refine progress bar logic

* chore: fix fetchSuperuserBins

* chore: modify one line if/else statements

* chore: fix if/else statements

* chore: follow naming convention for const vars

* chore: revert shell escape logic
This commit is contained in:
s1dd 2025-05-05 07:52:22 +05:30 • committed by GitHub
parent 9cd5b25745
commit 1c530cbc66
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 96 additions and 89 deletions
Download patch file Download diff file Expand all files Collapse all files

100
hyprpm/src/progress/CProgressBar.cpp
View file

@ -1,82 +1,78 @@
#include "CProgressBar.hpp"
#include <sys/ioctl.h>
#include <algorithm>
#include <unistd.h>
#include <cmath>
#include <format>
#include <print>
#include <stdio.h>
#include <unistd.h>
#include <cstdio>
#include <algorithm>
#include <sstream>
#include "../helpers/Colors.hpp"
void CProgressBar::printMessageAbove(const std::string& msg) {
struct winsize w;
static winsize getTerminalSize() {
winsize w{};
ioctl(STDOUT_FILENO, TIOCGWINSZ, &w);
return w;
}
std::string spaces;
spaces.reserve(w.ws_col);
for (size_t i = 0; i < w.ws_col; ++i) {
spaces += ' ';
}
static void clearCurrentLine() {
std::print("\r\33[2K"); // ansi escape sequence to clear entire line
}
std::println("\r{}\r{}", spaces, msg);
print();
void CProgressBar::printMessageAbove(const std::string& msg) {
clearCurrentLine();
std::print("\r{}\n", msg);
print(); // reprint bar underneath
}
void CProgressBar::print() {
struct winsize w;
ioctl(STDOUT_FILENO, TIOCGWINSZ, &w);
const auto w = getTerminalSize();
if (m_bFirstPrint)
if (m_bFirstPrint) {
std::print("\n");
m_bFirstPrint = false;
std::string spaces;
spaces.reserve(w.ws_col);
for (size_t i = 0; i < w.ws_col; ++i) {
spaces += ' ';
m_bFirstPrint = false;
}
std::print("\r{}\r", spaces);
clearCurrentLine();
std::string message = "";
float percentDone = 0;
if (m_fPercentage >= 0)
float percentDone = 0.0f;
if (m_fPercentage >= 0.0f)
percentDone = m_fPercentage;
else
percentDone = (float)m_iSteps / (float)m_iMaxSteps;
const auto BARWIDTH = std::clamp(w.ws_col - static_cast<unsigned long>(m_szCurrentMessage.length()) - 2, 0UL, 50UL);
// draw bar
message += std::string{" "} + Colors::GREEN;
size_t i = 0;
for (; i < std::floor(percentDone * BARWIDTH); ++i) {
message += "━";
else {
// check for divide-by-zero
percentDone = m_iMaxSteps > 0 ? static_cast<float>(m_iSteps) / m_iMaxSteps : 0.0f;
}
// clamp to ensure no overflows (sanity check)
percentDone = std::clamp(percentDone, 0.0f, 1.0f);
const size_t BARWIDTH = std::clamp<size_t>(w.ws_col - m_szCurrentMessage.length() - 2, 0, 50);
std::ostringstream oss;
oss << ' ' << Colors::GREEN;
size_t filled = static_cast<size_t>(std::floor(percentDone * BARWIDTH));
size_t i = 0;
for (; i < filled; ++i)
oss << "━";
if (i < BARWIDTH) {
i++;
message += std::string{"╍"} + Colors::RESET;
for (; i < BARWIDTH; ++i) {
message += "━";
}
oss << "╍" << Colors::RESET;
++i;
for (; i < BARWIDTH; ++i)
oss << "━";
} else
message += Colors::RESET;
oss << Colors::RESET;
// draw progress
if (m_fPercentage >= 0)
message += " " + std::format("{}%", static_cast<int>(percentDone * 100.0)) + " ";
if (m_fPercentage >= 0.0f)
oss << " " << std::format("{}%", static_cast<int>(percentDone * 100.0)) << ' ';
else
message += " " + std::format("{} / {}", m_iSteps, m_iMaxSteps) + " ";
// draw message
std::print("{} {}", message, m_szCurrentMessage);
oss << " " << std::format("{} / {}", m_iSteps, m_iMaxSteps) << ' ';
std::print("{} {}", oss.str(), m_szCurrentMessage);
std::fflush(stdout);
}