crawlo 1.3.6__py3-none-any.whl → 1.3.7__py3-none-any.whl

crawlo/logging/factory.py

@@ -1,129 +1,129 @@
-#!/usr/bin/python
-# -*- coding: UTF-8 -*-
-"""
-日志器工厂 - 创建和缓存Logger实例
-"""
-
-import logging
-import os
-import threading
-from logging.handlers import RotatingFileHandler
-from typing import Dict, Optional
-from weakref import WeakValueDictionary
-
-from .manager import get_config, is_configured, configure
-from .config import LogConfig
-
-
-class LoggerFactory:
-    """
-    Logger工厂类 - 负责创建和缓存Logger实例
-    
-    特点：
-    1. 使用WeakValueDictionary避免内存泄漏
-    2. 线程安全的Logger创建
-    3. 自动配置管理
-    4. 简单的缓存策略
-    """
-    
-    # Logger缓存 - 使用弱引用避免内存泄漏
-    _logger_cache: WeakValueDictionary = WeakValueDictionary()
-    _cache_lock = threading.RLock()
-    
-    @classmethod
-    def get_logger(cls, name: str = 'crawlo') -> logging.Logger:
-        """
-        获取Logger实例
-        
-        Args:
-            name: Logger名称
-            
-        Returns:
-            logging.Logger: 配置好的Logger实例
-        """
-        # 确保日志系统已配置
-        if not is_configured():
-            configure()  # 使用默认配置
-        
-        # 检查缓存
-        with cls._cache_lock:
-            if name in cls._logger_cache:
-                return cls._logger_cache[name]
-            
-            # 创建新的Logger
-            logger = cls._create_logger(name)
-            cls._logger_cache[name] = logger
-            return logger
-    
-    @classmethod
-    def _create_logger(cls, name: str) -> logging.Logger:
-        """创建新的Logger实例"""
-        config = get_config()
-        if not config:
-            raise RuntimeError("Log system not configured")
-        
-        # 创建Logger
-        logger = logging.getLogger(name)
-        logger.setLevel(logging.DEBUG)  # Logger本身设为最低级别
-        
-        # 清除现有handlers（避免重复添加）
-        logger.handlers.clear()
-        
-        # 获取模块级别
-        module_level = config.get_module_level(name)
-        level = getattr(logging, module_level.upper(), logging.INFO)
-        
-        # 创建formatter
-        formatter = logging.Formatter(config.format)
-        
-        # 添加控制台Handler
-        if config.console_enabled:
-            console_handler = logging.StreamHandler()
-            console_handler.setFormatter(formatter)
-            console_handler.setLevel(level)
-            logger.addHandler(console_handler)
-        
-        # 添加文件Handler
-        if config.file_enabled and config.file_path:
-            try:
-                # 确保日志目录存在
-                log_dir = os.path.dirname(config.file_path)
-                if log_dir and not os.path.exists(log_dir):
-                    os.makedirs(log_dir, exist_ok=True)
-                
-                file_handler = RotatingFileHandler(
-                    filename=config.file_path,
-                    maxBytes=config.max_bytes,
-                    backupCount=config.backup_count,
-                    encoding=config.encoding
-                )
-                file_handler.setFormatter(formatter)
-                file_handler.setLevel(level)
-                logger.addHandler(file_handler)
-            except Exception as e:
-                # 文件Handler创建失败时，至少保证控制台输出
-                pass
-        
-        # 防止向上传播（避免重复输出）
-        logger.propagate = False
-        
-        return logger
-    
-    @classmethod
-    def clear_cache(cls):
-        """清空Logger缓存"""
-        with cls._cache_lock:
-            cls._logger_cache.clear()
-    
-    @classmethod
-    def refresh_loggers(cls, new_config: LogConfig):
-        """刷新所有缓存的Logger（配置更新时使用）"""
-        with cls._cache_lock:
-            # 清空缓存，强制重新创建
-            cls._logger_cache.clear()
-
-
-# 便捷函数
-def get_logger(name: str = 'crawlo') -> logging.Logger:
-    """获取Logger实例的便捷函数"""
+#!/usr/bin/python
+# -*- coding: UTF-8 -*-
+"""
+日志器工厂 - 创建和缓存Logger实例
+"""
+
+import logging
+import os
+import threading
+from logging.handlers import RotatingFileHandler
+from typing import Dict, Optional
+from weakref import WeakValueDictionary
+
+from .manager import get_config, is_configured, configure
+from .config import LogConfig
+
+
+class LoggerFactory:
+    """
+    Logger工厂类 - 负责创建和缓存Logger实例
+    
+    特点：
+    1. 使用WeakValueDictionary避免内存泄漏
+    2. 线程安全的Logger创建
+    3. 自动配置管理
+    4. 简单的缓存策略
+    """
+    
+    # Logger缓存 - 使用弱引用避免内存泄漏
+    _logger_cache: WeakValueDictionary = WeakValueDictionary()
+    _cache_lock = threading.RLock()
+    
+    @classmethod
+    def get_logger(cls, name: str = 'crawlo') -> logging.Logger:
+        """
+        获取Logger实例
+        
+        Args:
+            name: Logger名称
+            
+        Returns:
+            logging.Logger: 配置好的Logger实例
+        """
+        # 确保日志系统已配置
+        if not is_configured():
+            configure()  # 使用默认配置
+        
+        # 检查缓存
+        with cls._cache_lock:
+            if name in cls._logger_cache:
+                return cls._logger_cache[name]
+            
+            # 创建新的Logger
+            logger = cls._create_logger(name)
+            cls._logger_cache[name] = logger
+            return logger
+    
+    @classmethod
+    def _create_logger(cls, name: str) -> logging.Logger:
+        """创建新的Logger实例"""
+        config = get_config()
+        if not config:
+            raise RuntimeError("Log system not configured")
+        
+        # 创建Logger
+        logger = logging.getLogger(name)
+        logger.setLevel(logging.DEBUG)  # Logger本身设为最低级别
+        
+        # 清除现有handlers（避免重复添加）
+        logger.handlers.clear()
+        
+        # 获取模块级别
+        module_level = config.get_module_level(name)
+        level = getattr(logging, module_level.upper(), logging.INFO)
+        
+        # 创建formatter
+        formatter = logging.Formatter(config.format)
+        
+        # 添加控制台Handler
+        if config.console_enabled:
+            console_handler = logging.StreamHandler()
+            console_handler.setFormatter(formatter)
+            console_handler.setLevel(level)
+            logger.addHandler(console_handler)
+        
+        # 添加文件Handler
+        if config.file_enabled and config.file_path:
+            try:
+                # 确保日志目录存在
+                log_dir = os.path.dirname(config.file_path)
+                if log_dir and not os.path.exists(log_dir):
+                    os.makedirs(log_dir, exist_ok=True)
+                
+                file_handler = RotatingFileHandler(
+                    filename=config.file_path,
+                    maxBytes=config.max_bytes,
+                    backupCount=config.backup_count,
+                    encoding=config.encoding
+                )
+                file_handler.setFormatter(formatter)
+                file_handler.setLevel(level)
+                logger.addHandler(file_handler)
+            except Exception as e:
+                # 文件Handler创建失败时，至少保证控制台输出
+                pass
+        
+        # 防止向上传播（避免重复输出）
+        logger.propagate = False
+        
+        return logger
+    
+    @classmethod
+    def clear_cache(cls):
+        """清空Logger缓存"""
+        with cls._cache_lock:
+            cls._logger_cache.clear()
+    
+    @classmethod
+    def refresh_loggers(cls, new_config: LogConfig):
+        """刷新所有缓存的Logger（配置更新时使用）"""
+        with cls._cache_lock:
+            # 清空缓存，强制重新创建
+            cls._logger_cache.clear()
+
+
+# 便捷函数
+def get_logger(name: str = 'crawlo') -> logging.Logger:
+    """获取Logger实例的便捷函数"""
     return LoggerFactory.get_logger(name)

crawlo/logging/manager.py

@@ -1,112 +1,112 @@
-#!/usr/bin/python
-# -*- coding: UTF-8 -*-
-"""
-日志管理器 - 核心组件
-"""
-
-import threading
-from typing import Optional, Any
-from .config import LogConfig
-
-
-class LogManager:
-    """
-    日志管理器 - 单例模式
-    
-    职责：
-    1. 全局日志配置管理
-    2. 配置状态跟踪
-    3. 线程安全的配置更新
-    """
-    
-    _instance: Optional['LogManager'] = None
-    _lock = threading.Lock()
-    
-    def __new__(cls) -> 'LogManager':
-        if cls._instance is None:
-            with cls._lock:
-                if cls._instance is None:
-                    cls._instance = super(LogManager, cls).__new__(cls)
-                    cls._instance._initialized = False
-        return cls._instance
-    
-    def __init__(self):
-        if hasattr(self, '_initialized') and self._initialized:
-            return
-            
-        self._config: Optional[LogConfig] = None
-        self._configured = False
-        self._config_lock = threading.RLock()
-        self._initialized = True
-    
-    @property
-    def config(self) -> Optional[LogConfig]:
-        """获取当前配置"""
-        with self._config_lock:
-            return self._config
-    
-    @property
-    def is_configured(self) -> bool:
-        """检查是否已配置"""
-        return self._configured
-    
-    def configure(self, settings=None, **kwargs) -> LogConfig:
-        """
-        配置日志系统
-        
-        Args:
-            settings: 配置对象或None
-            **kwargs: 关键字参数配置
-            
-        Returns:
-            LogConfig: 生效的配置对象
-        """
-        with self._config_lock:
-            # 总是重新配置，即使已经配置过
-            # 从不同来源创建配置
-            if settings is not None:
-                # 检查settings是否已经是LogConfig对象
-                if isinstance(settings, LogConfig):
-                    config = settings
-                else:
-                    config = LogConfig.from_settings(settings)
-            elif kwargs:
-                config = LogConfig.from_dict(kwargs)
-            else:
-                config = LogConfig()  # 使用默认配置
-            
-            # 验证配置
-            if not config.validate():
-                raise ValueError("Invalid log configuration")
-            
-            self._config = config
-            self._configured = True
-            
-            return config
-    
-    def reset(self):
-        """重置配置（主要用于测试）"""
-        with self._config_lock:
-            self._config = None
-            self._configured = False
-
-
-# 全局实例
-_log_manager = LogManager()
-
-# 模块级便捷函数
-def configure(settings=None, **kwargs) -> LogConfig:
-    """配置日志系统"""
-    return _log_manager.configure(settings, **kwargs)
-
-def is_configured() -> bool:
-    """检查是否已配置"""
-    return _log_manager.is_configured
-
-def get_config() -> Optional[LogConfig]:
-    """获取当前配置"""
-    return _log_manager.config
-
-def reset():
-    """重置配置"""
+#!/usr/bin/python
+# -*- coding: UTF-8 -*-
+"""
+日志管理器 - 核心组件
+"""
+
+import threading
+from typing import Optional, Any
+from .config import LogConfig
+
+
+class LogManager:
+    """
+    日志管理器 - 单例模式
+    
+    职责：
+    1. 全局日志配置管理
+    2. 配置状态跟踪
+    3. 线程安全的配置更新
+    """
+    
+    _instance: Optional['LogManager'] = None
+    _lock = threading.Lock()
+    
+    def __new__(cls) -> 'LogManager':
+        if cls._instance is None:
+            with cls._lock:
+                if cls._instance is None:
+                    cls._instance = super(LogManager, cls).__new__(cls)
+                    cls._instance._initialized = False
+        return cls._instance
+    
+    def __init__(self):
+        if hasattr(self, '_initialized') and self._initialized:
+            return
+            
+        self._config: Optional[LogConfig] = None
+        self._configured = False
+        self._config_lock = threading.RLock()
+        self._initialized = True
+    
+    @property
+    def config(self) -> Optional[LogConfig]:
+        """获取当前配置"""
+        with self._config_lock:
+            return self._config
+    
+    @property
+    def is_configured(self) -> bool:
+        """检查是否已配置"""
+        return self._configured
+    
+    def configure(self, settings=None, **kwargs) -> LogConfig:
+        """
+        配置日志系统
+        
+        Args:
+            settings: 配置对象或None
+            **kwargs: 关键字参数配置
+            
+        Returns:
+            LogConfig: 生效的配置对象
+        """
+        with self._config_lock:
+            # 总是重新配置，即使已经配置过
+            # 从不同来源创建配置
+            if settings is not None:
+                # 检查settings是否已经是LogConfig对象
+                if isinstance(settings, LogConfig):
+                    config = settings
+                else:
+                    config = LogConfig.from_settings(settings)
+            elif kwargs:
+                config = LogConfig.from_dict(kwargs)
+            else:
+                config = LogConfig()  # 使用默认配置
+            
+            # 验证配置
+            if not config.validate():
+                raise ValueError("Invalid log configuration")
+            
+            self._config = config
+            self._configured = True
+            
+            return config
+    
+    def reset(self):
+        """重置配置（主要用于测试）"""
+        with self._config_lock:
+            self._config = None
+            self._configured = False
+
+
+# 全局实例
+_log_manager = LogManager()
+
+# 模块级便捷函数
+def configure(settings=None, **kwargs) -> LogConfig:
+    """配置日志系统"""
+    return _log_manager.configure(settings, **kwargs)
+
+def is_configured() -> bool:
+    """检查是否已配置"""
+    return _log_manager.is_configured
+
+def get_config() -> Optional[LogConfig]:
+    """获取当前配置"""
+    return _log_manager.config
+
+def reset():
+    """重置配置"""
     _log_manager.reset()

crawlo/middleware/__init__.py

@@ -1,21 +1,21 @@
-#!/usr/bin/python
-# -*- coding:UTF-8 -*-
-from crawlo import Request, Response
-
-
-class BaseMiddleware(object):
-    def process_request(self, request, spider) -> None | Request | Response:
-        # 请求预处理
-        pass
-
-    def process_response(self, request, response, spider) -> Request | Response:
-        # 响应预处理
-        pass
-
-    def process_exception(self, request, exp, spider) -> None | Request | Response:
-        # 异常预处理
-        pass
-
-    @classmethod
-    def create_instance(cls, crawler):
-        return cls()
+#!/usr/bin/python
+# -*- coding:UTF-8 -*-
+from crawlo import Request, Response
+
+
+class BaseMiddleware(object):
+    def process_request(self, request, spider) -> None | Request | Response:
+        # 请求预处理
+        pass
+
+    def process_response(self, request, response, spider) -> Request | Response:
+        # 响应预处理
+        pass
+
+    def process_exception(self, request, exp, spider) -> None | Request | Response:
+        # 异常预处理
+        pass
+
+    @classmethod
+    def create_instance(cls, crawler):
+        return cls()