parent
a8742c052e
commit
ebbcdc175c
1 changed files with 85 additions and 0 deletions
@ -0,0 +1,85 @@ |
||||
From 59222222201575d69799e91562358d4d5d401ec0 Mon Sep 17 00:00:00 2001
|
||||
From: Jacopo De Simoi <wilderjds@protonmail.com>
|
||||
Date: Tue, 17 Jun 2025 14:04:32 -0400
|
||||
Subject: [PATCH] shorten info
|
||||
|
||||
---
|
||||
lib/_emerge/JobStatusDisplay.py | 39 +++++++++++++++++++--------------
|
||||
1 file changed, 22 insertions(+), 17 deletions(-)
|
||||
|
||||
diff --git a/lib/_emerge/JobStatusDisplay.py b/lib/_emerge/JobStatusDisplay.py
|
||||
index b98d4a832..0b9815ccc 100644
|
||||
--- a/lib/_emerge/JobStatusDisplay.py
|
||||
+++ b/lib/_emerge/JobStatusDisplay.py
|
||||
@@ -75,7 +75,7 @@ class JobStatusDisplay:
|
||||
if width <= 0 or width > self.max_display_width:
|
||||
width = self.max_display_width
|
||||
object.__setattr__(self, "width", width)
|
||||
- object.__setattr__(self, "_jobs_column_width", width - 32)
|
||||
+ object.__setattr__(self, "_jobs_column_width", width - 32 + 7)
|
||||
|
||||
def sigwinch(self):
|
||||
if not self._isatty:
|
||||
@@ -250,38 +250,43 @@ class JobStatusDisplay:
|
||||
f.push_style(number_style)
|
||||
f.add_literal_data(curval_str)
|
||||
f.pop_style()
|
||||
- f.add_literal_data(" of ")
|
||||
- f.push_style(number_style)
|
||||
- f.add_literal_data(maxval_str)
|
||||
- f.pop_style()
|
||||
- f.add_literal_data(" complete")
|
||||
|
||||
if self.running:
|
||||
- f.add_literal_data(", ")
|
||||
+ f.add_literal_data(" + ")
|
||||
f.push_style(number_style)
|
||||
f.add_literal_data(running_str)
|
||||
f.pop_style()
|
||||
- f.add_literal_data(" running")
|
||||
|
||||
- if self.failed:
|
||||
- f.add_literal_data(", ")
|
||||
+ if self.merge_wait:
|
||||
+ f.add_literal_data("(")
|
||||
f.push_style(number_style)
|
||||
- f.add_literal_data(failed_str)
|
||||
+ f.add_literal_data(f"{self.merge_wait}")
|
||||
f.pop_style()
|
||||
- f.add_literal_data(" failed")
|
||||
+ f.add_literal_data(" wait")
|
||||
|
||||
- if self.merge_wait:
|
||||
- f.add_literal_data(", ")
|
||||
+ if self.failed:
|
||||
+ if not self.merge_wait:
|
||||
+ f.add_literal_data("(")
|
||||
+ else:
|
||||
+ f.add_literal_data(", ")
|
||||
f.push_style(number_style)
|
||||
- f.add_literal_data(f"{self.merge_wait}")
|
||||
+ f.add_literal_data(failed_str)
|
||||
f.pop_style()
|
||||
- f.add_literal_data(" merge wait")
|
||||
+ f.add_literal_data(" fail")
|
||||
+
|
||||
+ if self.failed or self.merge_wait:
|
||||
+ f.add_literal_data(")")
|
||||
+
|
||||
+ f.add_literal_data(" / ")
|
||||
+ f.push_style(number_style)
|
||||
+ f.add_literal_data(maxval_str)
|
||||
+ f.pop_style()
|
||||
|
||||
padding = self._jobs_column_width - len(plain_output.getvalue())
|
||||
if padding > 0:
|
||||
f.add_literal_data(padding * " ")
|
||||
|
||||
- f.add_literal_data("Load avg: ")
|
||||
+ f.add_literal_data("λ: ")
|
||||
f.add_literal_data(load_avg_str)
|
||||
|
||||
# Truncate to fit width, to avoid making the terminal scroll if the
|
||||
--
|
||||
2.49.0
|
||||
|
||||
Loading…
Reference in new issue