Skip to content

Remove duplicate code for COMMANDS_WITH_MQTT_P2P_HANDLING #931

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
edenhaus merged 1 commit into from
Apr 28, 2025
Merged

Remove duplicate code for COMMANDS_WITH_MQTT_P2P_HANDLING #931

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 10 additions & 11 deletions deebot_client/commands/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,28 +5,27 @@
from enum import IntEnum, unique
from typing import TYPE_CHECKING

from deebot_client.command import CommandMqttP2P
from deebot_client.const import DataType

from .json import (
COMMANDS as JSON_COMMANDS,
COMMANDS_WITH_MQTT_P2P_HANDLING as JSON_COMMANDS_WITH_MQTT_P2P_HANDLING,
)
from .xml import (
COMMANDS as XML_COMMANDS,
COMMANDS_WITH_MQTT_P2P_HANDLING as XML_COMMANDS_WITH_MQTT_P2P_HANDLING,
)
from .json import COMMANDS as JSON_COMMANDS
from .xml import COMMANDS as XML_COMMANDS

if TYPE_CHECKING:
from deebot_client.command import Command, CommandMqttP2P
from deebot_client.command import Command

COMMANDS: dict[DataType, dict[str, type[Command]]] = {
DataType.JSON: JSON_COMMANDS,
DataType.XML: XML_COMMANDS,
}

COMMANDS_WITH_MQTT_P2P_HANDLING: dict[DataType, dict[str, type[CommandMqttP2P]]] = {
DataType.JSON: JSON_COMMANDS_WITH_MQTT_P2P_HANDLING,
DataType.XML: XML_COMMANDS_WITH_MQTT_P2P_HANDLING,
data_type: {
cmd_name: cmd
for (cmd_name, cmd) in commands.items()
if issubclass(cmd, CommandMqttP2P)
}
for data_type, commands in COMMANDS.items()
}


Expand Down
10 changes: 2 additions & 8 deletions deebot_client/commands/json/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@

from typing import TYPE_CHECKING

from deebot_client.command import Command, CommandMqttP2P

from . import auto_empty, station_action, station_state
from .advanced_mode import GetAdvancedMode, SetAdvancedMode
from .battery import GetBattery
Expand Down Expand Up @@ -52,6 +50,8 @@
from .work_mode import GetWorkMode, SetWorkMode

if TYPE_CHECKING:
from deebot_client.command import Command

from .common import JsonCommand

__all__ = [
Expand Down Expand Up @@ -241,9 +241,3 @@
# fmt: on

COMMANDS: dict[str, type[Command]] = {cmd.NAME: cmd for cmd in _COMMANDS}

COMMANDS_WITH_MQTT_P2P_HANDLING: dict[str, type[CommandMqttP2P]] = {
cmd_name: cmd
for (cmd_name, cmd) in COMMANDS.items()
if issubclass(cmd, CommandMqttP2P)
}
10 changes: 2 additions & 8 deletions deebot_client/commands/xml/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@

from typing import TYPE_CHECKING

from deebot_client.command import Command, CommandMqttP2P

from .battery import GetBatteryInfo
from .charge import Charge
from .charge_state import GetChargeState
Expand All @@ -20,6 +18,8 @@
from .stats import GetCleanSum

if TYPE_CHECKING:
from deebot_client.command import Command

from .common import XmlCommand

__all__ = [
Expand Down Expand Up @@ -87,9 +87,3 @@
# fmt: on

COMMANDS: dict[str, type[Command]] = {cmd.NAME: cmd for cmd in _COMMANDS}

COMMANDS_WITH_MQTT_P2P_HANDLING: dict[str, type[CommandMqttP2P]] = {
cmd_name: cmd
for (cmd_name, cmd) in COMMANDS.items()
if issubclass(cmd, CommandMqttP2P)
}