From e6da63ff09654bc83e63992e8ec57e552edbe3c2 Mon Sep 17 00:00:00 2001 From: simon Date: Thu, 16 Mar 2023 18:11:08 +0700 Subject: [PATCH] clean up notification --- tubearchivist/home/src/es/connect.py | 11 ++++------- tubearchivist/home/src/index/reindex.py | 2 +- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/tubearchivist/home/src/es/connect.py b/tubearchivist/home/src/es/connect.py index 0c27ca2..fd6e5ab 100644 --- a/tubearchivist/home/src/es/connect.py +++ b/tubearchivist/home/src/es/connect.py @@ -152,7 +152,7 @@ class IndexPaginate: if self.kwargs.get("callback"): self.kwargs.get("callback")(all_hits, self.index_name).run() - if counter % 10 == 0 and self.kwargs.get("task"): + if self.kwargs.get("task"): print(f"{self.index_name}: processing page {counter}") self._notify(len(all_results)) @@ -167,12 +167,9 @@ class IndexPaginate: """send notification on task""" total = self.kwargs.get("total") progress = (processed + 1) / total - message = f"Processing {self.index_name} {processed}/{total}" - print(message) - self.kwargs.get("task").send_progress( - message_lines=[message], - progress=progress, - ) + index_clean = self.index_name.lstrip("ta_").title() + message = [f"Processing {index_clean}s {processed}/{total}"] + self.kwargs.get("task").send_progress(message, progress=progress) def clean_pit(self): """delete pit from elastic search""" diff --git a/tubearchivist/home/src/index/reindex.py b/tubearchivist/home/src/index/reindex.py index 66d958e..a7c6674 100644 --- a/tubearchivist/home/src/index/reindex.py +++ b/tubearchivist/home/src/index/reindex.py @@ -248,7 +248,7 @@ class Reindex(ReindexBase): """send notification back to task""" remaining = RedisQueue(index_config["queue_name"]).length() idx = total - remaining - message = [f"Reindexing {name[0].upper()}{name[1:]}s {idx}/{total}"] + message = [f"Reindexing {name[0].title()}s {idx}/{total}"] progress = idx / total self.task.send_progress(message, progress=progress)