Skip to content

Commit

Permalink
Merge pull request #137 from TheZoker/enhance-entity-naming
Browse files Browse the repository at this point in the history 
Enhance entity naming (similar to HA native entity naming)
  • Loading branch information
@roleoroleo
roleoroleo committed Dec 1, 2023
2 parents 988a121 + dfc5190 commit e80326e
Show file tree
Hide file tree
Showing 5 changed files with 77 additions and 77 deletions.
46 changes: 23 additions & 23 deletions custom_components/yi_hack/binary_sensor.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,39 +30,39 @@ async def async_setup_entry(hass: HomeAssistant, config: ConfigEntry, async_add_
"""Set up MQTT motion sensors."""
if (config.data[CONF_HACK_NAME] == DEFAULT_BRAND) or (config.data[CONF_HACK_NAME] == MSTAR):
entities = [
YiMQTTBinarySensor(config, "status"),
YiMQTTBinarySensor(config, "motion_detection"),
YiMQTTBinarySensor(config, "baby_crying"),
YiMQTTBinarySensor(config, "status", "Status"),
YiMQTTBinarySensor(config, "motion_detection", "Motion Detection"),
YiMQTTBinarySensor(config, "baby_crying", "Baby Crying"),
]
elif (config.data[CONF_HACK_NAME] == V5):
entities = [
YiMQTTBinarySensor(config, "status"),
YiMQTTBinarySensor(config, "motion_detection"),
YiMQTTBinarySensor(config, "sound_detection"),
YiMQTTBinarySensor(config, "baby_crying"),
YiMQTTBinarySensor(config, "status", "Status"),
YiMQTTBinarySensor(config, "motion_detection", "Motion Detection"),
YiMQTTBinarySensor(config, "sound_detection", "Sound Detection"),
YiMQTTBinarySensor(config, "baby_crying", "Baby Crying"),
]
elif (config.data[CONF_HACK_NAME] == ALLWINNER):
entities = [
YiMQTTBinarySensor(config, "status"),
YiMQTTBinarySensor(config, "motion_detection"),
YiMQTTBinarySensor(config, "human_detection"),
YiMQTTBinarySensor(config, "vehicle_detection"),
YiMQTTBinarySensor(config, "animal_detection"),
YiMQTTBinarySensor(config, "sound_detection"),
YiMQTTBinarySensor(config, "status", "Status"),
YiMQTTBinarySensor(config, "motion_detection", "Motion Detection"),
YiMQTTBinarySensor(config, "human_detection", "Human Detection"),
YiMQTTBinarySensor(config, "vehicle_detection", "Vehicle Detection"),
YiMQTTBinarySensor(config, "animal_detection", "Animal Detection"),
YiMQTTBinarySensor(config, "sound_detection", "Sound Detection"),
]
elif (config.data[CONF_HACK_NAME] == ALLWINNERV2):
entities = [
YiMQTTBinarySensor(config, "status"),
YiMQTTBinarySensor(config, "motion_detection"),
YiMQTTBinarySensor(config, "human_detection"),
YiMQTTBinarySensor(config, "vehicle_detection"),
YiMQTTBinarySensor(config, "animal_detection"),
YiMQTTBinarySensor(config, "sound_detection"),
YiMQTTBinarySensor(config, "status", "Status"),
YiMQTTBinarySensor(config, "motion_detection", "Motion Detection"),
YiMQTTBinarySensor(config, "human_detection", "Human Detection"),
YiMQTTBinarySensor(config, "vehicle_detection", "Vehicle Detection"),
YiMQTTBinarySensor(config, "animal_detection", "Animal Detection"),
YiMQTTBinarySensor(config, "sound_detection", "Sound Detection"),
]
elif config.data[CONF_HACK_NAME] == SONOFF:
entities = [
YiMQTTBinarySensor(config, "status"),
YiMQTTBinarySensor(config, "motion_detection"),
YiMQTTBinarySensor(config, "status", "Status"),
YiMQTTBinarySensor(config, "motion_detection", "Motion Detection"),
]

async_add_entities(entities)
Expand All @@ -71,11 +71,11 @@ async def async_setup_entry(hass: HomeAssistant, config: ConfigEntry, async_add_
class YiMQTTBinarySensor(BinarySensorEntity):
"""Representation of a motion detection sensor that is updated via MQTT."""

def __init__(self, config: ConfigEntry, sensor_type):
def __init__(self, config: ConfigEntry, sensor_type, name):
"""Initialize the sensor."""
self._state = False
self._device_name = config.data[CONF_NAME]
self._name = self._device_name + "_" + sensor_type
self._name = self._device_name + " " + name
self._mac = config.data[CONF_MAC]
self._mqtt_subscription = None
self._delay_listener = None
Expand Down
4 changes: 2 additions & 2 deletions custom_components/yi_hack/camera.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ def __init__(self, hass, config):
self._extra_arguments = config.data[CONF_EXTRA_ARGUMENTS]
self._manager = hass.data[DATA_FFMPEG]
self._device_name = config.data[CONF_NAME]
self._name = self._device_name + "_cam"
self._name = self._device_name + " " + "Cam"
self._unique_id = self._device_name + "_caca"
self._mac = config.data[CONF_MAC]
self._host = config.data[CONF_HOST]
Expand Down Expand Up @@ -436,7 +436,7 @@ def __init__(self, hass: HomeAssistant, config):
super().__init__()

self._device_name = config.data[CONF_NAME]
self._name = self._device_name + "_motion_detection_cam"
self._name = self._device_name + " " + "Motion Detection Cam"
self._unique_id = self._device_name + "_camd"
self._mac = config.data[CONF_MAC]
self._host = config.data[CONF_HOST]
Expand Down
2 changes: 1 addition & 1 deletion custom_components/yi_hack/media_player.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ class YiHackMediaPlayer(MediaPlayerEntity):
def __init__(self, config):
"""Initialize the device."""
self._device_name = config.data[CONF_NAME]
self._name = self._device_name + "_media_player"
self._name = self._device_name + " " + "Media Player"
self._unique_id = self._device_name + "_mpca"
self._mac = config.data[CONF_MAC]
self._host = config.data[CONF_HOST]
Expand Down
18 changes: 9 additions & 9 deletions custom_components/yi_hack/select.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,19 +17,19 @@ async def async_setup_entry(hass, config_entry, async_add_entities):

if config_entry.data[CONF_HACK_NAME] == SONOFF:
entities = [
YiHackSelect(hass, config_entry, "sensitivity", [ "low", "medium", "high" ]),
YiHackSelect(hass, config_entry, "ir", [ "auto", "on", "off" ]),
YiHackSelect(hass, config_entry, "sensitivity", "Sensitivity", [ "low", "medium", "high" ]),
YiHackSelect(hass, config_entry, "ir", "IR", [ "auto", "on", "off" ]),
]
elif config_entry.data[CONF_HACK_NAME] == V5:
entities = [
YiHackSelect(hass, config_entry, "sensitivity", [ "low", "medium", "high" ]),
YiHackSelect(hass, config_entry, "sound_sensitivity", [ "30", "35", "40", "45", "50", "60", "70", "80", "90" ]),
YiHackSelect(hass, config_entry, "sensitivity", "Sensitivity", [ "low", "medium", "high" ]),
YiHackSelect(hass, config_entry, "sound_sensitivity", "Sound Sensitivity", [ "30", "35", "40", "45", "50", "60", "70", "80", "90" ]),
]
else:
entities = [
YiHackSelect(hass, config_entry, "sensitivity", [ "low", "medium", "high" ]),
YiHackSelect(hass, config_entry, "sound_sensitivity", [ "30", "35", "40", "45", "50", "60", "70", "80", "90" ]),
YiHackSelect(hass, config_entry, "cruise", [ "no", "presets", "360" ]),
YiHackSelect(hass, config_entry, "sensitivity", "Sensitivity", [ "low", "medium", "high" ]),
YiHackSelect(hass, config_entry, "sound_sensitivity", "Sound Sensitivity", [ "30", "35", "40", "45", "50", "60", "70", "80", "90" ]),
YiHackSelect(hass, config_entry, "cruise", "Cruise", [ "no", "presets", "360" ]),
]

async_add_entities(entities)
Expand All @@ -38,11 +38,11 @@ async def async_setup_entry(hass, config_entry, async_add_entities):
class YiHackSelect(SelectEntity):
"""Select entity."""

def __init__(self, hass, config, select_type, select_options):
def __init__(self, hass, config, select_type, name, select_options):
"""Initialize entity."""
self._device_name = config.data[CONF_NAME]
self._mac = config.data[CONF_MAC]
self._name = self._device_name + "_select_" + select_type
self._name = self._device_name + " " + name
self._mqtt_cmnd_topic = config.data[CONF_MQTT_PREFIX] + "/cmnd/camera/" + select_type
self._mqtt_stat_topic = config.data[CONF_MQTT_PREFIX] + "/stat/camera/" + select_type
self._select_type = select_type
Expand Down
84 changes: 42 additions & 42 deletions custom_components/yi_hack/switch.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,66 +19,66 @@ async def async_setup_entry(hass, config_entry, async_add_entities):
"""Set up the Yi Camera switches from a config entry."""
if (config_entry.data[CONF_HACK_NAME] == DEFAULT_BRAND) or (config_entry.data[CONF_HACK_NAME] == MSTAR):
entities = [
YiHackSwitch(hass, config_entry, "switch_on"),
YiHackSwitch(hass, config_entry, "save_video_on_motion"),
YiHackSwitch(hass, config_entry, "baby_crying_detect"),
YiHackSwitch(hass, config_entry, "led"),
YiHackSwitch(hass, config_entry, "ir"),
YiHackSwitch(hass, config_entry, "rotate"),
YiHackSwitch(hass, config_entry, "switch_on", "Switch On"),
YiHackSwitch(hass, config_entry, "save_video_on_motion", "Save Video on Motion"),
YiHackSwitch(hass, config_entry, "baby_crying_detect", "Baby Crying Detect"),
YiHackSwitch(hass, config_entry, "led", "LED"),
YiHackSwitch(hass, config_entry, "ir", "IR"),
YiHackSwitch(hass, config_entry, "rotate", "Rotate"),
]
elif (config_entry.data[CONF_HACK_NAME] == V5):
entities = [
YiHackSwitch(hass, config_entry, "switch_on"),
# YiHackSwitch(hass, config_entry, "detect_motion"),
YiHackSwitch(hass, config_entry, "save_video_on_motion"),
YiHackSwitch(hass, config_entry, "sound_detection"),
YiHackSwitch(hass, config_entry, "baby_crying_detect"),
YiHackSwitch(hass, config_entry, "led"),
YiHackSwitch(hass, config_entry, "ir"),
YiHackSwitch(hass, config_entry, "rotate"),
YiHackSwitch(hass, config_entry, "switch_on", "Switch On"),
# YiHackSwitch(hass, config_entry, "detect_motion", "Detect Motion"),
YiHackSwitch(hass, config_entry, "save_video_on_motion", "Save Video on Motion"),
YiHackSwitch(hass, config_entry, "sound_detection", "Sound Detection"),
YiHackSwitch(hass, config_entry, "baby_crying_detect", "Baby Crying Detect"),
YiHackSwitch(hass, config_entry, "led", "LED"),
YiHackSwitch(hass, config_entry, "ir", "IR"),
YiHackSwitch(hass, config_entry, "rotate", "Rotate"),
]
elif (config_entry.data[CONF_HACK_NAME] == ALLWINNER):
entities = [
YiHackSwitch(hass, config_entry, "switch_on"),
YiHackSwitch(hass, config_entry, "motion_detection"),
YiHackSwitch(hass, config_entry, "save_video_on_motion"),
YiHackSwitch(hass, config_entry, "ai_human_detection"),
YiHackSwitch(hass, config_entry, "ai_vehicle_detection"),
YiHackSwitch(hass, config_entry, "ai_animal_detection"),
YiHackSwitch(hass, config_entry, "sound_detection"),
YiHackSwitch(hass, config_entry, "led"),
YiHackSwitch(hass, config_entry, "ir"),
YiHackSwitch(hass, config_entry, "rotate"),
YiHackSwitch(hass, config_entry, "switch_on", "Switch On"),
YiHackSwitch(hass, config_entry, "motion_detection", "Motion Detection"),
YiHackSwitch(hass, config_entry, "save_video_on_motion", "Save Video on Motion"),
YiHackSwitch(hass, config_entry, "ai_human_detection", "AI Human Detection"),
YiHackSwitch(hass, config_entry, "ai_vehicle_detection", "AI Vehicle Detection"),
YiHackSwitch(hass, config_entry, "ai_animal_detection", "AI Animal Detection"),
YiHackSwitch(hass, config_entry, "sound_detection", "Sound Detection"),
YiHackSwitch(hass, config_entry, "led", "LED"),
YiHackSwitch(hass, config_entry, "ir", "IR"),
YiHackSwitch(hass, config_entry, "rotate", "Rotate"),
]
elif (config_entry.data[CONF_HACK_NAME] == ALLWINNERV2):
entities = [
YiHackSwitch(hass, config_entry, "switch_on"),
YiHackSwitch(hass, config_entry, "motion_detection"),
YiHackSwitch(hass, config_entry, "save_video_on_motion"),
YiHackSwitch(hass, config_entry, "ai_human_detection"),
YiHackSwitch(hass, config_entry, "ai_vehicle_detection"),
YiHackSwitch(hass, config_entry, "ai_animal_detection"),
YiHackSwitch(hass, config_entry, "face_detection"),
YiHackSwitch(hass, config_entry, "motion_tracking"),
YiHackSwitch(hass, config_entry, "sound_detection"),
YiHackSwitch(hass, config_entry, "led"),
YiHackSwitch(hass, config_entry, "ir"),
YiHackSwitch(hass, config_entry, "rotate"),
YiHackSwitch(hass, config_entry, "switch_on", "Switch On"),
YiHackSwitch(hass, config_entry, "motion_detection", "Motion Detection"),
YiHackSwitch(hass, config_entry, "save_video_on_motion", "Save Video on Motion"),
YiHackSwitch(hass, config_entry, "ai_human_detection", "AI Human Detection"),
YiHackSwitch(hass, config_entry, "ai_vehicle_detection", "AI Vehicle Detection"),
YiHackSwitch(hass, config_entry, "ai_animal_detection", "AI Animal Detection"),
YiHackSwitch(hass, config_entry, "face_detection", "Face Detection"),
YiHackSwitch(hass, config_entry, "motion_tracking", "Motion Tracking"),
YiHackSwitch(hass, config_entry, "sound_detection", "Sound Detection"),
YiHackSwitch(hass, config_entry, "led", "LED"),
YiHackSwitch(hass, config_entry, "ir", "IR"),
YiHackSwitch(hass, config_entry, "rotate", "Rotate"),
]
elif config_entry.data[CONF_HACK_NAME] == SONOFF:
entities = [
YiHackSwitch(hass, config_entry, "switch_on"),
YiHackSwitch(hass, config_entry, "motion_detection"),
YiHackSwitch(hass, config_entry, "local_record"),
YiHackSwitch(hass, config_entry, "rotate"),
YiHackSwitch(hass, config_entry, "switch_on", "Switch On"),
YiHackSwitch(hass, config_entry, "motion_detection", "Motion Detection"),
YiHackSwitch(hass, config_entry, "local_record", "Local Record"),
YiHackSwitch(hass, config_entry, "rotate", "Rotate"),
]

async_add_entities(entities)

class YiHackSwitch(SwitchEntity):
"""Representation of a Yi Camera Switch."""

def __init__(self, hass, config, switch_type):
def __init__(self, hass, config, switch_type, name):
"""Initialize the device."""
self._device_name = config.data[CONF_NAME]
self._mac = config.data[CONF_MAC]
Expand All @@ -87,7 +87,7 @@ def __init__(self, hass, config, switch_type):
self._user = config.data[CONF_USERNAME]
self._password = config.data[CONF_PASSWORD]
self._switch_type = switch_type
self._name = self._device_name + "_switch_" + switch_type
self._name = self._device_name + " " + name
self._mqtt_subscription = None
self._mqtt_cmnd_topic = config.data[CONF_MQTT_PREFIX] + "/cmnd/camera/" + switch_type
self._mqtt_stat_topic = config.data[CONF_MQTT_PREFIX] + "/stat/camera/" + switch_type
Expand Down

0 comments on commit e80326e

Please sign in to comment.