TheLovinator/discord-rss-bot
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add logging with loguru

Browse Source
This commit is contained in:
Joakim Hellsén
2023-01-18 22:56:29 +01:00
parent cbad4e4430
commit ae7a10892d
11 changed files with 327 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
discord_rss_bot/feeds.py
View File

@ -1,6 +1,7 @@
from typing import Iterable
from discord_webhook import DiscordWebhook
from loguru import logger
from reader import Entry, Feed, Reader
from requests import Response
@ -26,6 +27,7 @@ def send_to_discord(custom_reader: Reader | None = None, feed: Feed | None = Non
"""
# Get the default reader if we didn't get a custom one.
reader: Reader = get_reader() if custom_reader is None else custom_reader
logger.info(f"Sending to Discord. Reader: {reader}, feed: {feed}, do_once: {do_once}.")
# Check for new entries for every feed.
reader.update_feeds()
@ -44,37 +46,46 @@ def send_to_discord(custom_reader: Reader | None = None, feed: Feed | None = Non
# Get the webhook URL for the entry. If it is None, we will continue to the next entry.
webhook_url: str = settings.get_webhook_for_entry(reader, entry)
if not webhook_url:
logger.error(f"Could not find webhook for entry {entry.title}.")
continue
# If the user has set the custom message to an empty string, we will use the default message, otherwise we will
# use the custom message.
if custom_message.get_custom_message(reader, entry.feed) != "":
webhook_message = custom_message.replace_tags(entry=entry, feed=entry.feed) # type: ignore
logger.info(f"Using custom message for {entry.title}.")
else:
webhook_message: str = default_custom_message
logger.info(f"Using default message for {entry.title}.")
# Create the webhook.
webhook: DiscordWebhook = DiscordWebhook(url=webhook_url, content=webhook_message, rate_limit_retry=True)
# Check if the feed has a whitelist, and if it does, check if the entry is whitelisted.
if feed is not None and has_white_tags(reader, feed):
logger.info(f"Feed {feed.title} has a whitelist, checking if entry {entry.title} is whitelisted.")
if should_be_sent(reader, entry):
logger.info(f"Entry {entry.title} is whitelisted, sending to Discord.")
response: Response = webhook.execute()
reader.set_entry_read(entry, True)
if not response.ok:
logger.error(f"Response was not ok, marking entry {entry.title} as unread.")
reader.set_entry_read(entry, False)
else:
logger.info(f"Entry {entry.title} is not whitelisted, skipping.")
reader.set_entry_read(entry, True)
continue
# Check if the entry is blacklisted, if it is, mark it as read and continue.
if should_be_skipped(reader, entry):
logger.info(f"Entry {entry.title} is blacklisted, skipping.")
reader.set_entry_read(entry, True)
continue
# It was not blacklisted, and not forced through whitelist, so we will send it to Discord.
response: Response = webhook.execute()
if not response.ok:
logger.error(f"Response was not ok, marking entry {entry.title} as unread.")
reader.set_entry_read(entry, False)
# If we only want to send one entry, we will break the loop. This is used when testing this function.