diff --git a/book_manager.py b/book_manager.py index 03252b77..3bbc2b66 100644 --- a/book_manager.py +++ b/book_manager.py @@ -6,11 +6,11 @@ from urllib.parse import quote from typing import List, Optional, Dict, Union from bs4 import BeautifulSoup, Tag, NavigableString, ResultSet +import downloader from logger import setup_logger from config import SUPPORTED_FORMATS, BOOK_LANGUAGE, AA_BASE_URL from env import AA_DONATOR_KEY, USE_CF_BYPASS from models import BookInfo, SearchFilters -import downloader logger = setup_logger(__name__) @@ -60,7 +60,7 @@ def search_books(query: str, filters: SearchFilters) -> List[BookInfo]: f"&ext={'&ext='.join(SUPPORTED_FORMATS)}&q={query_html}" f"{filters_query}" ) - + html = downloader.html_get_page(url) if not html: raise Exception("Failed to fetch search results") diff --git a/logger.py b/logger.py index 122647c6..c317d736 100644 --- a/logger.py +++ b/logger.py @@ -4,8 +4,8 @@ import logging import sys from pathlib import Path from logging.handlers import RotatingFileHandler -from env import FLASK_DEBUG, LOG_FILE, ENABLE_LOGGING, LOG_LEVEL -from typing import Any, Optional +from env import LOG_FILE, ENABLE_LOGGING, LOG_LEVEL +from typing import Any class CustomLogger(logging.Logger): """Custom logger class with additional error_trace method.""" diff --git a/network.py b/network.py index a06395cf..361ac4df 100644 --- a/network.py +++ b/network.py @@ -11,6 +11,7 @@ import ssl from logger import setup_logger from config import PROXIES, AA_BASE_URL, CUSTOM_DNS, AA_AVAILABLE_URLS, DOH_SERVER +import config logger = setup_logger(__name__) @@ -275,6 +276,7 @@ if AA_BASE_URL == "auto": logger.error_trace(f"Error checking {url}: {e}") if AA_BASE_URL == "auto": AA_BASE_URL = AA_AVAILABLE_URLS[0] +config.AA_BASE_URL = AA_BASE_URL logger.info(f"AA_BASE_URL: {AA_BASE_URL}") # Configure urllib opener with appropriate headers