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, )