mirror of
https://github.com/esphome/esphome.git
synced 2025-07-28 14:16:40 +00:00
remove duplication from component_iterator (#7210)
Co-authored-by: Samuel Tardieu <sam@rfc1149.net> Co-authored-by: J. Nick Koston <nick@koston.org>
This commit is contained in:
tomaszduda23
GitHub
parent
5d9cba3dce
commit
6ab3de65a6
@ -16,6 +16,8 @@ class UserServiceDescriptor {
|
||||
virtual ListEntitiesServicesResponse encode_list_service_response() = 0;
|
||||
|
||||
virtual bool execute_service(const ExecuteServiceRequest &req) = 0;
|
||||
|
||||
bool is_internal() { return false; }
|
||||
};
|
||||
|
||||
template<typename T> T get_execute_arg_value(const ExecuteServiceArgument &arg);
|
||||
|
||||
@ -16,373 +16,186 @@ void ComponentIterator::begin(bool include_internal) {
|
||||
this->at_ = 0;
|
||||
this->include_internal_ = include_internal;
|
||||
}
|
||||
|
||||
template<typename PlatformItem>
|
||||
void ComponentIterator::process_platform_item_(const std::vector<PlatformItem *> &items,
|
||||
bool (ComponentIterator::*on_item)(PlatformItem *)) {
|
||||
if (this->at_ >= items.size()) {
|
||||
this->advance_platform_();
|
||||
} else {
|
||||
PlatformItem *item = items[this->at_];
|
||||
if ((item->is_internal() && !this->include_internal_) || (this->*on_item)(item)) {
|
||||
this->at_++;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void ComponentIterator::advance_platform_() {
|
||||
this->state_ = static_cast<IteratorState>(static_cast<uint32_t>(this->state_) + 1);
|
||||
this->at_ = 0;
|
||||
}
|
||||
|
||||
void ComponentIterator::advance() {
|
||||
bool advance_platform = false;
|
||||
bool success = true;
|
||||
switch (this->state_) {
|
||||
case IteratorState::NONE:
|
||||
// not started
|
||||
return;
|
||||
case IteratorState::BEGIN:
|
||||
if (this->on_begin()) {
|
||||
advance_platform = true;
|
||||
} else {
|
||||
return;
|
||||
advance_platform_();
|
||||
}
|
||||
break;
|
||||
|
||||
#ifdef USE_BINARY_SENSOR
|
||||
case IteratorState::BINARY_SENSOR:
|
||||
if (this->at_ >= App.get_binary_sensors().size()) {
|
||||
advance_platform = true;
|
||||
} else {
|
||||
auto *binary_sensor = App.get_binary_sensors()[this->at_];
|
||||
if (binary_sensor->is_internal() && !this->include_internal_) {
|
||||
success = true;
|
||||
break;
|
||||
} else {
|
||||
success = this->on_binary_sensor(binary_sensor);
|
||||
}
|
||||
}
|
||||
this->process_platform_item_(App.get_binary_sensors(), &ComponentIterator::on_binary_sensor);
|
||||
break;
|
||||
#endif
|
||||
|
||||
#ifdef USE_COVER
|
||||
case IteratorState::COVER:
|
||||
if (this->at_ >= App.get_covers().size()) {
|
||||
advance_platform = true;
|
||||
} else {
|
||||
auto *cover = App.get_covers()[this->at_];
|
||||
if (cover->is_internal() && !this->include_internal_) {
|
||||
success = true;
|
||||
break;
|
||||
} else {
|
||||
success = this->on_cover(cover);
|
||||
}
|
||||
}
|
||||
this->process_platform_item_(App.get_covers(), &ComponentIterator::on_cover);
|
||||
break;
|
||||
#endif
|
||||
|
||||
#ifdef USE_FAN
|
||||
case IteratorState::FAN:
|
||||
if (this->at_ >= App.get_fans().size()) {
|
||||
advance_platform = true;
|
||||
} else {
|
||||
auto *fan = App.get_fans()[this->at_];
|
||||
if (fan->is_internal() && !this->include_internal_) {
|
||||
success = true;
|
||||
break;
|
||||
} else {
|
||||
success = this->on_fan(fan);
|
||||
}
|
||||
}
|
||||
this->process_platform_item_(App.get_fans(), &ComponentIterator::on_fan);
|
||||
break;
|
||||
#endif
|
||||
|
||||
#ifdef USE_LIGHT
|
||||
case IteratorState::LIGHT:
|
||||
if (this->at_ >= App.get_lights().size()) {
|
||||
advance_platform = true;
|
||||
} else {
|
||||
auto *light = App.get_lights()[this->at_];
|
||||
if (light->is_internal() && !this->include_internal_) {
|
||||
success = true;
|
||||
break;
|
||||
} else {
|
||||
success = this->on_light(light);
|
||||
}
|
||||
}
|
||||
this->process_platform_item_(App.get_lights(), &ComponentIterator::on_light);
|
||||
break;
|
||||
#endif
|
||||
|
||||
#ifdef USE_SENSOR
|
||||
case IteratorState::SENSOR:
|
||||
if (this->at_ >= App.get_sensors().size()) {
|
||||
advance_platform = true;
|
||||
} else {
|
||||
auto *sensor = App.get_sensors()[this->at_];
|
||||
if (sensor->is_internal() && !this->include_internal_) {
|
||||
success = true;
|
||||
break;
|
||||
} else {
|
||||
success = this->on_sensor(sensor);
|
||||
}
|
||||
}
|
||||
this->process_platform_item_(App.get_sensors(), &ComponentIterator::on_sensor);
|
||||
break;
|
||||
#endif
|
||||
|
||||
#ifdef USE_SWITCH
|
||||
case IteratorState::SWITCH:
|
||||
if (this->at_ >= App.get_switches().size()) {
|
||||
advance_platform = true;
|
||||
} else {
|
||||
auto *a_switch = App.get_switches()[this->at_];
|
||||
if (a_switch->is_internal() && !this->include_internal_) {
|
||||
success = true;
|
||||
break;
|
||||
} else {
|
||||
success = this->on_switch(a_switch);
|
||||
}
|
||||
}
|
||||
this->process_platform_item_(App.get_switches(), &ComponentIterator::on_switch);
|
||||
break;
|
||||
#endif
|
||||
|
||||
#ifdef USE_BUTTON
|
||||
case IteratorState::BUTTON:
|
||||
if (this->at_ >= App.get_buttons().size()) {
|
||||
advance_platform = true;
|
||||
} else {
|
||||
auto *button = App.get_buttons()[this->at_];
|
||||
if (button->is_internal() && !this->include_internal_) {
|
||||
success = true;
|
||||
break;
|
||||
} else {
|
||||
success = this->on_button(button);
|
||||
}
|
||||
}
|
||||
this->process_platform_item_(App.get_buttons(), &ComponentIterator::on_button);
|
||||
break;
|
||||
#endif
|
||||
|
||||
#ifdef USE_TEXT_SENSOR
|
||||
case IteratorState::TEXT_SENSOR:
|
||||
if (this->at_ >= App.get_text_sensors().size()) {
|
||||
advance_platform = true;
|
||||
} else {
|
||||
auto *text_sensor = App.get_text_sensors()[this->at_];
|
||||
if (text_sensor->is_internal() && !this->include_internal_) {
|
||||
success = true;
|
||||
break;
|
||||
} else {
|
||||
success = this->on_text_sensor(text_sensor);
|
||||
}
|
||||
}
|
||||
this->process_platform_item_(App.get_text_sensors(), &ComponentIterator::on_text_sensor);
|
||||
break;
|
||||
#endif
|
||||
|
||||
#ifdef USE_API_SERVICES
|
||||
case IteratorState::SERVICE:
|
||||
if (this->at_ >= api::global_api_server->get_user_services().size()) {
|
||||
advance_platform = true;
|
||||
} else {
|
||||
auto *service = api::global_api_server->get_user_services()[this->at_];
|
||||
success = this->on_service(service);
|
||||
}
|
||||
this->process_platform_item_(api::global_api_server->get_user_services(), &ComponentIterator::on_service);
|
||||
break;
|
||||
#endif
|
||||
|
||||
#ifdef USE_CAMERA
|
||||
case IteratorState::CAMERA:
|
||||
if (camera::Camera::instance() == nullptr) {
|
||||
advance_platform = true;
|
||||
} else {
|
||||
if (camera::Camera::instance()->is_internal() && !this->include_internal_) {
|
||||
advance_platform = success = true;
|
||||
break;
|
||||
} else {
|
||||
advance_platform = success = this->on_camera(camera::Camera::instance());
|
||||
case IteratorState::CAMERA: {
|
||||
camera::Camera *camera_instance = camera::Camera::instance();
|
||||
if (camera_instance != nullptr && (!camera_instance->is_internal() || this->include_internal_)) {
|
||||
this->on_camera(camera_instance);
|
||||
}
|
||||
}
|
||||
break;
|
||||
advance_platform_();
|
||||
} break;
|
||||
#endif
|
||||
|
||||
#ifdef USE_CLIMATE
|
||||
case IteratorState::CLIMATE:
|
||||
if (this->at_ >= App.get_climates().size()) {
|
||||
advance_platform = true;
|
||||
} else {
|
||||
auto *climate = App.get_climates()[this->at_];
|
||||
if (climate->is_internal() && !this->include_internal_) {
|
||||
success = true;
|
||||
break;
|
||||
} else {
|
||||
success = this->on_climate(climate);
|
||||
}
|
||||
}
|
||||
this->process_platform_item_(App.get_climates(), &ComponentIterator::on_climate);
|
||||
break;
|
||||
#endif
|
||||
|
||||
#ifdef USE_NUMBER
|
||||
case IteratorState::NUMBER:
|
||||
if (this->at_ >= App.get_numbers().size()) {
|
||||
advance_platform = true;
|
||||
} else {
|
||||
auto *number = App.get_numbers()[this->at_];
|
||||
if (number->is_internal() && !this->include_internal_) {
|
||||
success = true;
|
||||
break;
|
||||
} else {
|
||||
success = this->on_number(number);
|
||||
}
|
||||
}
|
||||
this->process_platform_item_(App.get_numbers(), &ComponentIterator::on_number);
|
||||
break;
|
||||
#endif
|
||||
|
||||
#ifdef USE_DATETIME_DATE
|
||||
case IteratorState::DATETIME_DATE:
|
||||
if (this->at_ >= App.get_dates().size()) {
|
||||
advance_platform = true;
|
||||
} else {
|
||||
auto *date = App.get_dates()[this->at_];
|
||||
if (date->is_internal() && !this->include_internal_) {
|
||||
success = true;
|
||||
break;
|
||||
} else {
|
||||
success = this->on_date(date);
|
||||
}
|
||||
}
|
||||
this->process_platform_item_(App.get_dates(), &ComponentIterator::on_date);
|
||||
break;
|
||||
#endif
|
||||
|
||||
#ifdef USE_DATETIME_TIME
|
||||
case IteratorState::DATETIME_TIME:
|
||||
if (this->at_ >= App.get_times().size()) {
|
||||
advance_platform = true;
|
||||
} else {
|
||||
auto *time = App.get_times()[this->at_];
|
||||
if (time->is_internal() && !this->include_internal_) {
|
||||
success = true;
|
||||
break;
|
||||
} else {
|
||||
success = this->on_time(time);
|
||||
}
|
||||
}
|
||||
this->process_platform_item_(App.get_times(), &ComponentIterator::on_time);
|
||||
break;
|
||||
#endif
|
||||
|
||||
#ifdef USE_DATETIME_DATETIME
|
||||
case IteratorState::DATETIME_DATETIME:
|
||||
if (this->at_ >= App.get_datetimes().size()) {
|
||||
advance_platform = true;
|
||||
} else {
|
||||
auto *datetime = App.get_datetimes()[this->at_];
|
||||
if (datetime->is_internal() && !this->include_internal_) {
|
||||
success = true;
|
||||
break;
|
||||
} else {
|
||||
success = this->on_datetime(datetime);
|
||||
}
|
||||
}
|
||||
this->process_platform_item_(App.get_datetimes(), &ComponentIterator::on_datetime);
|
||||
break;
|
||||
#endif
|
||||
|
||||
#ifdef USE_TEXT
|
||||
case IteratorState::TEXT:
|
||||
if (this->at_ >= App.get_texts().size()) {
|
||||
advance_platform = true;
|
||||
} else {
|
||||
auto *text = App.get_texts()[this->at_];
|
||||
if (text->is_internal() && !this->include_internal_) {
|
||||
success = true;
|
||||
break;
|
||||
} else {
|
||||
success = this->on_text(text);
|
||||
}
|
||||
}
|
||||
this->process_platform_item_(App.get_texts(), &ComponentIterator::on_text);
|
||||
break;
|
||||
#endif
|
||||
|
||||
#ifdef USE_SELECT
|
||||
case IteratorState::SELECT:
|
||||
if (this->at_ >= App.get_selects().size()) {
|
||||
advance_platform = true;
|
||||
} else {
|
||||
auto *select = App.get_selects()[this->at_];
|
||||
if (select->is_internal() && !this->include_internal_) {
|
||||
success = true;
|
||||
break;
|
||||
} else {
|
||||
success = this->on_select(select);
|
||||
}
|
||||
}
|
||||
this->process_platform_item_(App.get_selects(), &ComponentIterator::on_select);
|
||||
break;
|
||||
#endif
|
||||
|
||||
#ifdef USE_LOCK
|
||||
case IteratorState::LOCK:
|
||||
if (this->at_ >= App.get_locks().size()) {
|
||||
advance_platform = true;
|
||||
} else {
|
||||
auto *a_lock = App.get_locks()[this->at_];
|
||||
if (a_lock->is_internal() && !this->include_internal_) {
|
||||
success = true;
|
||||
break;
|
||||
} else {
|
||||
success = this->on_lock(a_lock);
|
||||
}
|
||||
}
|
||||
this->process_platform_item_(App.get_locks(), &ComponentIterator::on_lock);
|
||||
break;
|
||||
#endif
|
||||
|
||||
#ifdef USE_VALVE
|
||||
case IteratorState::VALVE:
|
||||
if (this->at_ >= App.get_valves().size()) {
|
||||
advance_platform = true;
|
||||
} else {
|
||||
auto *valve = App.get_valves()[this->at_];
|
||||
if (valve->is_internal() && !this->include_internal_) {
|
||||
success = true;
|
||||
break;
|
||||
} else {
|
||||
success = this->on_valve(valve);
|
||||
}
|
||||
}
|
||||
this->process_platform_item_(App.get_valves(), &ComponentIterator::on_valve);
|
||||
break;
|
||||
#endif
|
||||
|
||||
#ifdef USE_MEDIA_PLAYER
|
||||
case IteratorState::MEDIA_PLAYER:
|
||||
if (this->at_ >= App.get_media_players().size()) {
|
||||
advance_platform = true;
|
||||
} else {
|
||||
auto *media_player = App.get_media_players()[this->at_];
|
||||
if (media_player->is_internal() && !this->include_internal_) {
|
||||
success = true;
|
||||
break;
|
||||
} else {
|
||||
success = this->on_media_player(media_player);
|
||||
}
|
||||
}
|
||||
this->process_platform_item_(App.get_media_players(), &ComponentIterator::on_media_player);
|
||||
break;
|
||||
#endif
|
||||
|
||||
#ifdef USE_ALARM_CONTROL_PANEL
|
||||
case IteratorState::ALARM_CONTROL_PANEL:
|
||||
if (this->at_ >= App.get_alarm_control_panels().size()) {
|
||||
advance_platform = true;
|
||||
} else {
|
||||
auto *a_alarm_control_panel = App.get_alarm_control_panels()[this->at_];
|
||||
if (a_alarm_control_panel->is_internal() && !this->include_internal_) {
|
||||
success = true;
|
||||
break;
|
||||
} else {
|
||||
success = this->on_alarm_control_panel(a_alarm_control_panel);
|
||||
}
|
||||
}
|
||||
this->process_platform_item_(App.get_alarm_control_panels(), &ComponentIterator::on_alarm_control_panel);
|
||||
break;
|
||||
#endif
|
||||
|
||||
#ifdef USE_EVENT
|
||||
case IteratorState::EVENT:
|
||||
if (this->at_ >= App.get_events().size()) {
|
||||
advance_platform = true;
|
||||
} else {
|
||||
auto *event = App.get_events()[this->at_];
|
||||
if (event->is_internal() && !this->include_internal_) {
|
||||
success = true;
|
||||
break;
|
||||
} else {
|
||||
success = this->on_event(event);
|
||||
}
|
||||
}
|
||||
this->process_platform_item_(App.get_events(), &ComponentIterator::on_event);
|
||||
break;
|
||||
#endif
|
||||
|
||||
#ifdef USE_UPDATE
|
||||
case IteratorState::UPDATE:
|
||||
if (this->at_ >= App.get_updates().size()) {
|
||||
advance_platform = true;
|
||||
} else {
|
||||
auto *update = App.get_updates()[this->at_];
|
||||
if (update->is_internal() && !this->include_internal_) {
|
||||
success = true;
|
||||
break;
|
||||
} else {
|
||||
success = this->on_update(update);
|
||||
}
|
||||
}
|
||||
this->process_platform_item_(App.get_updates(), &ComponentIterator::on_update);
|
||||
break;
|
||||
#endif
|
||||
|
||||
case IteratorState::MAX:
|
||||
if (this->on_end()) {
|
||||
this->state_ = IteratorState::NONE;
|
||||
}
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
if (advance_platform) {
|
||||
this->state_ = static_cast<IteratorState>(static_cast<uint8_t>(this->state_) + 1);
|
||||
this->at_ = 0;
|
||||
} else if (success) {
|
||||
this->at_++;
|
||||
}
|
||||
}
|
||||
bool ComponentIterator::on_end() { return true; }
|
||||
bool ComponentIterator::on_begin() { return true; }
|
||||
#ifdef USE_API_SERVICES
|
||||
|
||||
@ -171,6 +171,11 @@ class ComponentIterator {
|
||||
} state_{IteratorState::NONE};
|
||||
uint16_t at_{0}; // Supports up to 65,535 entities per type
|
||||
bool include_internal_{false};
|
||||
|
||||
template<typename PlatformItem>
|
||||
void process_platform_item_(const std::vector<PlatformItem *> &items,
|
||||
bool (ComponentIterator::*on_item)(PlatformItem *));
|
||||
void advance_platform_();
|
||||
};
|
||||
|
||||
} // namespace esphome
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user