From a6f33d730bf91fb7c557709894b19dd84a1ab13c Mon Sep 17 00:00:00 2001
From: rfdarter <rfdarter@googlemail.com>
Date: Tue, 25 Feb 2025 00:41:00 +0100
Subject: [PATCH] more suggested changes

---
 .../components/uptime/text_sensor/__init__.py | 21 ++++++++++++-------
 ...or.cpp => uptime_duration_text_sensor.cpp} | 10 ++++-----
 ...sensor.h => uptime_duration_text_sensor.h} |  2 +-
 .../uptime_timestamp_text_sensor.h            |  2 +-
 4 files changed, 21 insertions(+), 14 deletions(-)
 rename esphome/components/uptime/text_sensor/{uptime_seconds_text_sensor.cpp => uptime_duration_text_sensor.cpp} (83%)
 rename esphome/components/uptime/text_sensor/{uptime_seconds_text_sensor.h => uptime_duration_text_sensor.h} (84%)

diff --git a/esphome/components/uptime/text_sensor/__init__.py b/esphome/components/uptime/text_sensor/__init__.py
index 55ce528c25..41cada73e9 100644
--- a/esphome/components/uptime/text_sensor/__init__.py
+++ b/esphome/components/uptime/text_sensor/__init__.py
@@ -1,11 +1,18 @@
 import esphome.codegen as cg
 from esphome.components import text_sensor, time
 import esphome.config_validation as cv
-from esphome.const import CONF_TIME_ID, ENTITY_CATEGORY_DIAGNOSTIC, ICON_TIMER
+from esphome.const import (
+    CONF_DURATION,
+    CONF_TIME_ID,
+    ENTITY_CATEGORY_DIAGNOSTIC,
+    ICON_TIMER,
+)
+
+CONF_TIMESTAMP = "timestamp"
 
 uptime_ns = cg.esphome_ns.namespace("uptime")
-UptimeSecondsTextSensor = uptime_ns.class_(
-    "UptimeSecondsTextSensor", text_sensor.TextSensor, cg.PollingComponent
+UptimeDurationTextSensor = uptime_ns.class_(
+    "UptimeDurationTextSensor", text_sensor.TextSensor, cg.PollingComponent
 )
 UptimeTimestampTextSensor = uptime_ns.class_(
     "UptimeTimestampTextSensor", text_sensor.TextSensor, cg.Component
@@ -13,7 +20,7 @@ UptimeTimestampTextSensor = uptime_ns.class_(
 
 
 CONFIG_SCHEMA = text_sensor.text_sensor_schema(
-    UptimeSecondsTextSensor,
+    UptimeDurationTextSensor,
     icon=ICON_TIMER,
     entity_category=ENTITY_CATEGORY_DIAGNOSTIC,
 ).extend(cv.polling_component_schema("30s"))
@@ -21,12 +28,12 @@ CONFIG_SCHEMA = text_sensor.text_sensor_schema(
 
 CONFIG_SCHEMA = cv.typed_schema(
     {
-        "seconds": text_sensor.text_sensor_schema(
-            UptimeSecondsTextSensor,
+        CONF_DURATION: text_sensor.text_sensor_schema(
+            UptimeDurationTextSensor,
             icon=ICON_TIMER,
             entity_category=ENTITY_CATEGORY_DIAGNOSTIC,
         ).extend(cv.polling_component_schema("30s")),
-        "timestamp": text_sensor.text_sensor_schema(
+        CONF_TIMESTAMP: text_sensor.text_sensor_schema(
             UptimeTimestampTextSensor,
             icon=ICON_TIMER,
             entity_category=ENTITY_CATEGORY_DIAGNOSTIC,
diff --git a/esphome/components/uptime/text_sensor/uptime_seconds_text_sensor.cpp b/esphome/components/uptime/text_sensor/uptime_duration_text_sensor.cpp
similarity index 83%
rename from esphome/components/uptime/text_sensor/uptime_seconds_text_sensor.cpp
rename to esphome/components/uptime/text_sensor/uptime_duration_text_sensor.cpp
index 104fcc6aa3..0764314b7d 100644
--- a/esphome/components/uptime/text_sensor/uptime_seconds_text_sensor.cpp
+++ b/esphome/components/uptime/text_sensor/uptime_duration_text_sensor.cpp
@@ -1,4 +1,4 @@
-#include "uptime_seconds_text_sensor.h"
+#include "uptime_duration_text_sensor.h"
 
 #include "esphome/core/hal.h"
 #include "esphome/core/helpers.h"
@@ -9,14 +9,14 @@ namespace uptime {
 
 static const char *const TAG = "uptime.sensor";
 
-void UptimeSecondsTextSensor::setup() {
+void UptimeDurationTextSensor::setup() {
   this->last_ms_ = millis();
   if (this->last_ms_ < 60 * 1000)
     this->last_ms_ = 0;
   this->update();
 }
 
-void UptimeSecondsTextSensor::update() {
+void UptimeDurationTextSensor::update() {
   auto now = millis();
   // get whole seconds since last update. Note that even if the millis count has overflowed between updates,
   // the difference will still be correct due to the way twos-complement arithmetic works.
@@ -56,8 +56,8 @@ void UptimeSecondsTextSensor::update() {
   this->publish_state(buffer);
 }
 
-float UptimeSecondsTextSensor::get_setup_priority() const { return setup_priority::HARDWARE; }
-void UptimeSecondsTextSensor::dump_config() { LOG_TEXT_SENSOR("", "Uptime Text Sensor", this); }
+float UptimeDurationTextSensor::get_setup_priority() const { return setup_priority::HARDWARE; }
+void UptimeDurationTextSensor::dump_config() { LOG_TEXT_SENSOR("", "Uptime Text Sensor", this); }
 
 }  // namespace uptime
 }  // namespace esphome
diff --git a/esphome/components/uptime/text_sensor/uptime_seconds_text_sensor.h b/esphome/components/uptime/text_sensor/uptime_duration_text_sensor.h
similarity index 84%
rename from esphome/components/uptime/text_sensor/uptime_seconds_text_sensor.h
rename to esphome/components/uptime/text_sensor/uptime_duration_text_sensor.h
index b6f9b13738..d979d84227 100644
--- a/esphome/components/uptime/text_sensor/uptime_seconds_text_sensor.h
+++ b/esphome/components/uptime/text_sensor/uptime_duration_text_sensor.h
@@ -8,7 +8,7 @@
 namespace esphome {
 namespace uptime {
 
-class UptimeSecondsTextSensor : public text_sensor::TextSensor, public PollingComponent {
+class UptimeDurationTextSensor : public text_sensor::TextSensor, public PollingComponent {
  public:
   void update() override;
   void dump_config() override;
diff --git a/esphome/components/uptime/text_sensor/uptime_timestamp_text_sensor.h b/esphome/components/uptime/text_sensor/uptime_timestamp_text_sensor.h
index 7a76866c2d..d72b60e4d0 100644
--- a/esphome/components/uptime/text_sensor/uptime_timestamp_text_sensor.h
+++ b/esphome/components/uptime/text_sensor/uptime_timestamp_text_sensor.h
@@ -21,7 +21,7 @@ class UptimeTimestampTextSensor : public text_sensor::TextSensor, public Compone
   void set_time(time::RealTimeClock *time) { this->time_ = time; }
 
  protected:
-  time::RealTimeClock *time_;
+  time::RealTimeClock *time_{};
 };
 
 }  // namespace uptime