diff --git a/src/MaaDebugger/maafw/__init__.py b/src/MaaDebugger/maafw/__init__.py index 168fecf..0d2bd69 100644 --- a/src/MaaDebugger/maafw/__init__.py +++ b/src/MaaDebugger/maafw/__init__.py @@ -1,7 +1,7 @@ import re from asyncify import asyncify from pathlib import Path -from typing import Callable, List, Optional +from typing import Callable, List, Optional, Union from maa.controller import AdbController, Win32Controller from maa.tasker import Tasker, RecognitionDetail, NotificationHandler @@ -14,10 +14,10 @@ class MaaFW: - resource: Resource | None - controller: AdbController | Win32Controller | None - tasker: Tasker | None - notification_handler: NotificationHandler | None + resource: Optional[Resource] + controller: Union[AdbController, Win32Controller, None] + tasker: Optional[Tasker] + notification_handler: Optional[NotificationHandler] def __init__(self): Toolkit.init_option("./") diff --git a/src/MaaDebugger/utils/arg_parser/__init__.py b/src/MaaDebugger/utils/arg_parser/__init__.py index e8e50aa..74835f3 100644 --- a/src/MaaDebugger/utils/arg_parser/__init__.py +++ b/src/MaaDebugger/utils/arg_parser/__init__.py @@ -1,4 +1,5 @@ import argparse +from typing import Optional from ..port_checker import PortChecker @@ -20,7 +21,7 @@ def get_port(self) -> int: """ Determine the port to use based on the provided arguments. """ - specified_port: int | None = self.args.port + specified_port: Optional[int] = self.args.port if specified_port is not None: if PortChecker.is_port_in_use(specified_port): diff --git a/src/MaaDebugger/webpage/reco_page/__init__.py b/src/MaaDebugger/webpage/reco_page/__init__.py index 534491f..61106c5 100644 --- a/src/MaaDebugger/webpage/reco_page/__init__.py +++ b/src/MaaDebugger/webpage/reco_page/__init__.py @@ -1,4 +1,4 @@ -from typing import Dict, Tuple +from typing import Dict, Tuple, Optional from nicegui import ui @@ -24,7 +24,7 @@ async def reco_page(reco_id: int): ui.separator() - details: RecognitionDetail | None = await maafw.get_reco_detail(reco_id) + details: Optional[RecognitionDetail] = await maafw.get_reco_detail(reco_id) if not details: ui.markdown("## Not Found") return