Fix interval status message

This commit is contained in:
Schimon Jehudah 2024-01-02 12:06:35 +00:00
parent b4a20e9808
commit beb5c4c976
2 changed files with 12 additions and 12 deletions

View file

@ -311,7 +311,7 @@ async def check_feed_exist(db_file, url):
return result return result
def get_number_of_items(db_file, table): async def get_number_of_items(db_file, table):
""" """
Return number of entries or feeds. Return number of entries or feeds.
@ -337,7 +337,7 @@ def get_number_of_items(db_file, table):
return count return count
def get_number_of_feeds_active(db_file): async def get_number_of_feeds_active(db_file):
""" """
Return number of active feeds. Return number of active feeds.
@ -362,7 +362,7 @@ def get_number_of_feeds_active(db_file):
return count return count
def get_number_of_entries_unread(db_file): async def get_number_of_entries_unread(db_file):
""" """
Return number of unread items. Return number of unread items.
@ -618,12 +618,12 @@ async def statistics(db_file):
Statistics as message. Statistics as message.
""" """
values = [] values = []
values.extend([get_number_of_entries_unread(db_file)]) values.extend([await get_number_of_entries_unread(db_file)])
entries = get_number_of_items(db_file, 'entries') entries = await get_number_of_items(db_file, 'entries')
archive = get_number_of_items(db_file, 'archive') archive = await get_number_of_items(db_file, 'archive')
values.extend([entries + archive]) values.extend([entries + archive])
values.extend([get_number_of_feeds_active(db_file)]) values.extend([await get_number_of_feeds_active(db_file)])
values.extend([get_number_of_items(db_file, 'feeds')]) values.extend([await get_number_of_items(db_file, 'feeds')])
# msg = """You have {} unread news items out of {} from {} news sources. # msg = """You have {} unread news items out of {} from {} news sources.
# """.format(unread_entries, entries, feeds) # """.format(unread_entries, entries, feeds)
with create_connection(db_file) as conn: with create_connection(db_file) as conn:
@ -654,9 +654,9 @@ async def update_statistics(cur):
Cursor object. Cursor object.
""" """
stat_dict = {} stat_dict = {}
stat_dict["feeds"] = get_number_of_items(cur, 'feeds') stat_dict["feeds"] = await get_number_of_items(cur, 'feeds')
stat_dict["entries"] = get_number_of_items(cur, 'entries') stat_dict["entries"] = await get_number_of_items(cur, 'entries')
stat_dict["unread"] = get_number_of_entries_unread(cur=cur) stat_dict["unread"] = await get_number_of_entries_unread(cur=cur)
for i in stat_dict: for i in stat_dict:
sql = ( sql = (
"SELECT id " "SELECT id "

View file

@ -256,7 +256,7 @@ async def send_status(self, jid):
status_mode = "xa" status_mode = "xa"
status_text = "📫️ Send \"Start\" to receive updates" status_text = "📫️ Send \"Start\" to receive updates"
else: else:
feeds = get_number_of_items(db_file, "feeds") feeds = await get_number_of_items(db_file, "feeds")
# print(await current_time(), jid, "has", feeds, "feeds") # print(await current_time(), jid, "has", feeds, "feeds")
if not feeds: if not feeds:
print(">>> not feeds:", feeds, "jid:", jid) print(">>> not feeds:", feeds, "jid:", jid)