From ec51bc4be021116013a56a55fc6eb804887c2034 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 5 Oct 2024 19:58:51 +0100 Subject: make checking news more portable --- src/backend/getnews.py | 13 +++++-------- src/frontend/cli/sisyphus-cli.py | 3 ++- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/src/backend/getnews.py b/src/backend/getnews.py index ce56df4..b2d2978 100644 --- a/src/backend/getnews.py +++ b/src/backend/getnews.py @@ -42,7 +42,8 @@ def mark_read(article_nr): r_news_index = ld_r_news() if article_index in r_news_index: - print(f"\nArticle {sisyphus.getclr.green}{article_nr}{sisyphus.getclr.reset} is already marked as {sisyphus.getclr.green}read{sisyphus.getclr.reset}.") + print( + f"\nArticle {sisyphus.getclr.green}{article_nr}{sisyphus.getclr.reset} is already marked as {sisyphus.getclr.green}read{sisyphus.getclr.reset}.") else: r_news_index.append(article_index) save_r_news(r_news_index) @@ -61,7 +62,8 @@ def mark_unread(article_nr): r_news_index = ld_r_news() if article_index not in r_news_index: - print(f"\nArticle {sisyphus.getclr.green}{article_nr}{sisyphus.getclr.reset} is already marked as {sisyphus.getclr.green}unread{sisyphus.getclr.reset}.") + print( + f"\nArticle {sisyphus.getclr.green}{article_nr}{sisyphus.getclr.reset} is already marked as {sisyphus.getclr.green}unread{sisyphus.getclr.reset}.") else: r_news_index.remove(article_index) save_r_news(r_news_index) @@ -88,12 +90,7 @@ def check_n_news(): unread_count = len(n_news) - len(r_news_index) - if unread_count > 0: - print( - f"\nThere are {sisyphus.getclr.bright_red}{unread_count}{sisyphus.getclr.reset} unread news article(s).") - else: - print( - f"\nThere are {sisyphus.getclr.green}{unread_count}{sisyphus.getclr.reset} unread news article(s).") + return unread_count def start(check=False, list=False, read=False, unread=False, article_nr=None): diff --git a/src/frontend/cli/sisyphus-cli.py b/src/frontend/cli/sisyphus-cli.py index 053f111..076bce3 100755 --- a/src/frontend/cli/sisyphus-cli.py +++ b/src/frontend/cli/sisyphus-cli.py @@ -357,7 +357,8 @@ def checknews(): * Example:\n sisyphus news check\n """ - sisyphus.getnews.start(check=True) + unread_count = sisyphus.getnews.start(check=True) + print(f"\nThere are {unread_count} unread news article(s).\n") @getNews.command("list") -- cgit v1.2.3