From 1bdd014e6d70dd5e59be6489ff3b99ab467eea60 Mon Sep 17 00:00:00 2001
From: monosans <hsyqixco@protonmail.com>
Date: Thu, 20 Oct 2022 09:37:43 +0300
Subject: [PATCH] Refactor progress bar

---
 CHANGELOG.md | 4 ++++
 main.py      | 8 ++++----
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 509245d..15fa1af 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # YYYY-MM-DD
 
+## 2022-10-20
+
+- Refactor progress bar.
+
 ## 2022-10-17
 
 - Treat a proxy as invalid if ip-api returns an invalid response.
diff --git a/main.py b/main.py
index 61d5139..0681ec7 100755
--- a/main.py
+++ b/main.py
@@ -16,10 +16,11 @@ from aiohttp_socks import ProxyConnector
 from rich.console import Console
 from rich.progress import (
     BarColumn,
+    MofNCompleteColumn,
     Progress,
     TaskID,
+    TaskProgressColumn,
     TextColumn,
-    TimeRemainingColumn,
 )
 from rich.table import Table
 
@@ -356,9 +357,8 @@ class ProxyScraperChecker:
         return Progress(
             TextColumn("[progress.description]{task.description}"),
             BarColumn(),
-            TextColumn("[progress.percentage]{task.percentage:3.0f}%"),
-            TextColumn("[blue][{task.completed}/{task.total}]"),
-            TimeRemainingColumn(compact=True),
+            TaskProgressColumn(),
+            MofNCompleteColumn(),
             console=self.console,
         )