From 9f1fae0955c263ee3d4fd8106a395e8f56040b90 Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@koston.org>
Date: Sun, 29 Jun 2025 22:27:36 -0500
Subject: [PATCH] tweak

---
 esphome/components/web_server_base/web_server_base.cpp | 8 +++-----
 esphome/components/web_server_base/web_server_base.h   | 8 +++++---
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/esphome/components/web_server_base/web_server_base.cpp b/esphome/components/web_server_base/web_server_base.cpp
index 0ddfddd845..90d418dec1 100644
--- a/esphome/components/web_server_base/web_server_base.cpp
+++ b/esphome/components/web_server_base/web_server_base.cpp
@@ -63,6 +63,7 @@ void WebServerBase::add_handler(AsyncWebHandler *handler) {
   }
 }
 
+#ifdef USE_WEBSERVER_OTA
 void report_ota_error() {
 #ifdef USE_ARDUINO
   StreamString ss;
@@ -70,10 +71,8 @@ void report_ota_error() {
   ESP_LOGW(TAG, "OTA Update failed! Error: %s", ss.c_str());
 #endif
 }
-
 void OTARequestHandler::handleUpload(AsyncWebServerRequest *request, const String &filename, size_t index,
                                      uint8_t *data, size_t len, bool final) {
-#ifdef USE_WEBSERVER_OTA
 #ifdef USE_ARDUINO
   bool success;
   if (index == 0) {
@@ -160,10 +159,9 @@ void OTARequestHandler::handleUpload(AsyncWebServerRequest *request, const Strin
     this->ota_backend_ = nullptr;
   }
 #endif  // USE_ESP_IDF
-#endif  // USE_WEBSERVER_OTA
 }
+
 void OTARequestHandler::handleRequest(AsyncWebServerRequest *request) {
-#ifdef USE_WEBSERVER_OTA
   ESP_LOGV(TAG, "OTA handleRequest called");
   AsyncWebServerResponse *response;
 #ifdef USE_ARDUINO
@@ -183,8 +181,8 @@ void OTARequestHandler::handleRequest(AsyncWebServerRequest *request) {
 #endif  // USE_ESP_IDF
   response->addHeader("Connection", "close");
   request->send(response);
-#endif  // USE_WEBSERVER_OTA
 }
+#endif  // USE_WEBSERVER_OTA
 
 #ifdef USE_WEBSERVER_OTA
 void WebServerBase::add_ota_handler() {
diff --git a/esphome/components/web_server_base/web_server_base.h b/esphome/components/web_server_base/web_server_base.h
index db1379de74..09a41956c9 100644
--- a/esphome/components/web_server_base/web_server_base.h
+++ b/esphome/components/web_server_base/web_server_base.h
@@ -118,7 +118,9 @@ class WebServerBase : public Component {
   uint16_t get_port() const { return port_; }
 
  protected:
+#ifdef USE_WEBSERVER_OTA
   friend class OTARequestHandler;
+#endif
 
   int initialized_{0};
   uint16_t port_{80};
@@ -127,6 +129,7 @@ class WebServerBase : public Component {
   internal::Credentials credentials_;
 };
 
+#ifdef USE_WEBSERVER_OTA
 class OTARequestHandler : public AsyncWebHandler {
  public:
   OTARequestHandler(WebServerBase *parent) : parent_(parent) {}
@@ -141,22 +144,21 @@ class OTARequestHandler : public AsyncWebHandler {
   bool isRequestHandlerTrivial() const override { return false; }
 
  protected:
-#ifdef USE_WEBSERVER_OTA
   void report_ota_progress_(AsyncWebServerRequest *request);
   void schedule_ota_reboot_();
   void ota_init_(const char *filename);
 
   uint32_t last_ota_progress_{0};
   uint32_t ota_read_length_{0};
-#endif
   WebServerBase *parent_;
 
  private:
-#if defined(USE_ESP_IDF) && defined(USE_WEBSERVER_OTA)
+#ifdef USE_ESP_IDF
   void *ota_backend_{nullptr};
   bool ota_success_{false};
 #endif
 };
+#endif  // USE_WEBSERVER_OTA
 
 }  // namespace web_server_base
 }  // namespace esphome