diff --git a/slixfeed/action.py b/slixfeed/action.py index 35895f9..f01ebba 100644 --- a/slixfeed/action.py +++ b/slixfeed/action.py @@ -21,7 +21,7 @@ async def add_feed(db_file, url): while True: exist = await sqlite.is_feed_exist(db_file, url) if not exist: - result = await fetch.download_feed([url]) + result = await fetch.download_feed(url) document = result[0] status = result[1] if document: @@ -82,7 +82,7 @@ async def add_feed(db_file, url): async def view_feed(url): while True: - result = await fetch.download_feed([url]) + result = await fetch.download_feed(url) document = result[0] status = result[1] if document: @@ -151,7 +151,7 @@ async def view_feed(url): async def view_entry(url, num): while True: - result = await fetch.download_feed([url]) + result = await fetch.download_feed(url) document = result[0] status = result[1] if document: @@ -320,6 +320,7 @@ async def organize_items(db_file, urls): db_file, source, eid=eid, title=title, link=link, date=date) if not exist: + print(url) # new_entry = new_entry + 1 # TODO Enhance summary if entry.has_key("summary"): @@ -384,7 +385,7 @@ async def remove_nonexistent_entries(db_file, feed, source): source : str Feed URL. URL of associated feed. """ - items = sqlite.get_entries_of_source(db_file, feed, source) + items = await sqlite.get_entries_of_source(db_file, feed, source) entries = feed.entries # breakpoint() for item in items: diff --git a/slixfeed/fetch.py b/slixfeed/fetch.py index 57a6a0d..383f5f7 100644 --- a/slixfeed/fetch.py +++ b/slixfeed/fetch.py @@ -66,10 +66,11 @@ async def download_feed(url): msg: list or str Document or error message. """ - user_agent = (config.get_value( - "settings", "Network", "user-agent")) or 'Slixfeed/0.1' + user_agent = ( + config.get_value( + "settings", "Network", "user-agent") + ) or 'Slixfeed/0.1' headers = {'User-Agent': user_agent} - url = url[0] proxy = (config.get_value( "settings", "Network", "http_proxy")) or '' timeout = ClientTimeout(total=10) diff --git a/slixfeed/sqlite.py b/slixfeed/sqlite.py index e808375..adebfe5 100644 --- a/slixfeed/sqlite.py +++ b/slixfeed/sqlite.py @@ -829,9 +829,9 @@ async def add_entry(cur, entry): try: cur.execute(sql, entry) except: - None - # print("Unknown error for sqlite.add_entry") - # print(entry) + # None + print("Unknown error for sqlite.add_entry") + print(entry) # # print(current_time(), "COROUTINE OBJECT NOW") # for i in entry: diff --git a/slixfeed/task.py b/slixfeed/task.py index e03f9cd..7ad7e0d 100644 --- a/slixfeed/task.py +++ b/slixfeed/task.py @@ -288,7 +288,7 @@ async def send_status(self, jid): """ logging.debug( "Sending a status message to JID {}".format(jid)) - status_text = "🤖️ Slixfeed RSS News Bot" + status_text = "📜️ Slixfeed RSS News Bot" db_file = get_pathname_to_database(jid) enabled = ( await get_settings_value( diff --git a/slixfeed/xmpp/compose.py b/slixfeed/xmpp/compose.py index 8bd3c46..6e5e178 100644 --- a/slixfeed/xmpp/compose.py +++ b/slixfeed/xmpp/compose.py @@ -2,7 +2,16 @@ # -*- coding: utf-8 -*- """ -TODO Port functions insert_feed, remove_feed, get_entry_unread + +TODO + +1) Port functions insert_feed, remove_feed, get_entry_unread. + +2) Merge with action.py + +3) Call sqlite function from function statistics. + Returning a list of values doesn't' seem to be a good practice. + """ import slixfeed.xmpp.bookmark as bookmark diff --git a/slixfeed/xmpp/process.py b/slixfeed/xmpp/process.py index fa3a109..92d75a6 100644 --- a/slixfeed/xmpp/process.py +++ b/slixfeed/xmpp/process.py @@ -259,9 +259,12 @@ async def message(self, message): val = message_text[7:] if val: db_file = get_pathname_to_database(jid) - keywords = await sqlite.get_filters_value(db_file, key) - val = await add_to_list(val, keywords) - await sqlite.set_filters_value(db_file, [key, val]) + keywords = await sqlite.get_filters_value( + db_file, key) + val = await add_to_list( + val, keywords) + await sqlite.set_filters_value( + db_file, [key, val]) response = ( "Approved keywords\n" "```\n{}\n```" @@ -274,9 +277,12 @@ async def message(self, message): val = message_text[7:] if val: db_file = get_pathname_to_database(jid) - keywords = await sqlite.get_filters_value(db_file, key) - val = await remove_from_list(val, keywords) - await sqlite.set_filters_value(db_file, [key, val]) + keywords = await sqlite.get_filters_value( + db_file, key) + val = await remove_from_list( + val, keywords) + await sqlite.set_filters_value( + db_file, [key, val]) response = ( "Approved keywords\n" "```\n{}\n```" @@ -293,7 +299,8 @@ async def message(self, message): response = "Value may not be greater than 500." else: db_file = get_pathname_to_database(jid) - await sqlite.set_settings_value(db_file, [key, val]) + await sqlite.set_settings_value( + db_file, [key, val]) response = ( "Maximum archived items has been set to {}." ).format(val) @@ -316,7 +323,8 @@ async def message(self, message): ) send_reply_message(self, message, response) case "bookmarks": - if jid == get_value("accounts", "XMPP", "operator"): + if jid == get_value( + "accounts", "XMPP", "operator"): response = await compose.list_bookmarks(self) else: response = ( @@ -329,9 +337,12 @@ async def message(self, message): val = message_text[6:] if val: db_file = get_pathname_to_database(jid) - keywords = await sqlite.get_filters_value(db_file, key) - val = await add_to_list(val, keywords) - await sqlite.set_filters_value(db_file, [key, val]) + keywords = await sqlite.get_filters_value( + db_file, key) + val = await add_to_list( + val, keywords) + await sqlite.set_filters_value( + db_file, [key, val]) response = ( "Rejected keywords\n" "```\n{}\n```" @@ -344,9 +355,12 @@ async def message(self, message): val = message_text[6:] if val: db_file = get_pathname_to_database(jid) - keywords = await sqlite.get_filters_value(db_file, key) - val = await remove_from_list(val, keywords) - await sqlite.set_filters_value(db_file, [key, val]) + keywords = await sqlite.get_filters_value( + db_file, key) + val = await remove_from_list( + val, keywords) + await sqlite.set_filters_value( + db_file, [key, val]) response = ( "Rejected keywords\n" "```\n{}\n```" @@ -489,8 +503,9 @@ async def message(self, message): try: val = int(val) db_file = get_pathname_to_database(jid) - await sqlite.set_settings_value(db_file, [key, val]) - if val == 0: + await sqlite.set_settings_value( + db_file, [key, val]) + if val == 0: # if not val: response = ( "Summary length limit is disabled." ) @@ -530,7 +545,8 @@ async def message(self, message): send_reply_message(self, message, response) case "new": db_file = get_pathname_to_database(jid) - await sqlite.set_settings_value(db_file, ["old", 0]) + await sqlite.set_settings_value( + db_file, ["old", 0]) response = ( "Only new items of newly added feeds will be sent." ) @@ -538,8 +554,10 @@ async def message(self, message): # TODO Will you add support for number of messages? case "next": # num = message_text[5:] - await task.clean_tasks_xmpp(jid, ["interval", "status"]) - await task.start_tasks_xmpp(self, jid, ["interval", "status"]) + await task.clean_tasks_xmpp( + jid, ["interval", "status"]) + await task.start_tasks_xmpp( + self, jid, ["interval", "status"]) # await refresh_task( # self, # jid, @@ -557,7 +575,8 @@ async def message(self, message): # await refresh_task(jid, key, val) case "old": db_file = get_pathname_to_database(jid) - await sqlite.set_settings_value(db_file, ["old", 1]) + await sqlite.set_settings_value( + db_file, ["old", 1]) response = ( "All items of newly added feeds will be sent." ) @@ -572,7 +591,8 @@ async def message(self, message): # "Every update will contain {} news items." # ).format(response) db_file = get_pathname_to_database(jid) - await sqlite.set_settings_value(db_file, [key, val]) + await sqlite.set_settings_value( + db_file, [key, val]) response = ( "Next update will contain {} news items." ).format(val) @@ -619,7 +639,8 @@ async def message(self, message): "URL must not contain white space." ) send_reply_message(self, message, response) - await task.start_tasks_xmpp(self, jid, ["status"]) + await task.start_tasks_xmpp( + self, jid, ["status"]) case _ if message_lowercase.startswith("recent"): num = message_text[7:] if num: @@ -682,14 +703,17 @@ async def message(self, message): await sqlite.mark_all_as_read(db_file) response = "All entries have been marked as read." send_reply_message(self, message, response) - await task.start_tasks_xmpp(self, jid, ["status"]) + await task.start_tasks_xmpp( + self, jid, ["status"]) case _ if message_lowercase.startswith("search"): query = message_text[7:] if query: if len(query) > 1: db_file = get_pathname_to_database(jid) - results = await sqlite.search_entries(db_file, query) - response = compose.list_search_results(query, results) + results = await sqlite.search_entries( + db_file, query) + response = compose.list_search_results( + query, results) else: response = ( "Enter at least 2 characters to search" @@ -777,7 +801,8 @@ async def message(self, message): case "support": # TODO Send an invitation. response = ( - "Join xmpp:slixfeed@chat.woodpeckersnest.space?join") + "Join xmpp:slixfeed@chat.woodpeckersnest.space?join" + ) send_reply_message(self, message, response) case _ if message_lowercase.startswith("xmpp:"): muc_jid = uri.check_xmpp_uri(message_text) @@ -828,6 +853,7 @@ def send_reply_message(self, message, response): message.reply(response).send() +# TODO Solve this function def send_oob_reply_message(message, url, response): reply = message.reply(response) reply['oob']['url'] = url @@ -839,7 +865,12 @@ async def send_oob_message(self, jid, url): html = ( f'' f'{url}') - message = self.make_message(mto=jid, mbody=url, mhtml=html, mtype=chat_type) + message = self.make_message( + mto=jid, + mbody=url, + mhtml=html, + mtype=chat_type + ) message['oob']['url'] = url message.send()