From 1871843b17143cc09a978ee34b66d5449ec4d61d Mon Sep 17 00:00:00 2001 From: vvzvlad Date: Tue, 15 Apr 2025 02:43:26 +0300 Subject: [PATCH] small refactoring --- rss_generator.py | 10 +++++----- tests/test_post_parser_flags.py | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/rss_generator.py b/rss_generator.py index eb14095..99d2866 100644 --- a/rss_generator.py +++ b/rss_generator.py @@ -7,13 +7,13 @@ # type: ignore import logging +import re from datetime import datetime, timezone from typing import Optional from feedgen.feed import FeedGenerator +from pyrogram import errors from post_parser import PostParser from config import get_settings -import re -from pyrogram import errors Config = get_settings() @@ -276,8 +276,8 @@ async def generate_channel_rss(channel: str, logger.warning(f"Could not get username for channel {channel}, using identifier for error feed.") return create_error_feed(str(channel), base_url) # Ensure channel is string for error feed except (errors.UsernameInvalid, errors.UsernameNotOccupied) as e: - logger.warning(f"Channel not found error for {channel}: {str(e)}") - return create_error_feed(channel, base_url) + logger.warning(f"Channel not found error for {channel}: {str(e)}") + return create_error_feed(channel, base_url) except Exception as e: logger.error(f"Error during get_chat for channel '{channel}' (type: {type(channel)}): {str(e)}", exc_info=True) # Log error specifically for get_chat # Re-raise the original exception to be caught by the outer handler if needed, @@ -439,4 +439,4 @@ def create_error_feed(channel: str, base_url: str) -> str: rss_feed = fg.rss_str(pretty=True) if isinstance(rss_feed, bytes): return rss_feed.decode('utf-8') - return rss_feed \ No newline at end of file + return rss_feed diff --git a/tests/test_post_parser_flags.py b/tests/test_post_parser_flags.py index 52ec91c..7b67353 100644 --- a/tests/test_post_parser_flags.py +++ b/tests/test_post_parser_flags.py @@ -11,7 +11,7 @@ sys.path.insert(0, os.path.abspath(os.path.join(os.path.dirname(__file__), '..') # Mock the config module before importing PostParser sys.modules['config'] = __import__('tests.mock_config', fromlist=['get_settings']) -from pyrogram.types import Message, Chat, User, Reaction, MessageReactions +from pyrogram.types import Message, Chat, Reaction, MessageReactions from pyrogram.enums import MessageMediaType from post_parser import PostParser # Import after mocking config