evlli/hass-core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert "split"

Browse source 
This reverts commit 0ead89603d.
This commit is contained in:
J. Nick Koston 2023-02-16 00:24:59 -06:00
parent 0ead89603d
commit 20014af168
1 changed files with 20 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

38
homeassistant/components/recorder/statistics.py
View file

@ -2082,30 +2082,28 @@ def _sorted_statistics_to_dict(
"start": (start_ts := db_state[start_ts_idx]), "start": (start_ts := db_state[start_ts_idx]),
"end": start_ts + table_duration_seconds, "end": start_ts + table_duration_seconds,
} }
if _want_mean:
row["mean"] = (
convert(db_state[mean_idx]) if convert else db_state[mean_idx]
)
if _want_min:
row["min"] = (
convert(db_state[min_idx]) if convert else db_state[min_idx]
)
if _want_max:
row["max"] = (
convert(db_state[max_idx]) if convert else db_state[max_idx]
)
if _want_last_reset: if _want_last_reset:
row["last_reset"] = db_state[last_reset_ts_idx] row["last_reset"] = db_state[last_reset_ts_idx]
if convert:
if _want_mean:
row["mean"] = convert(db_state[mean_idx])
if _want_min:
row["min"] = convert(db_state[min_idx])
if _want_max:
row["max"] = convert(db_state[max_idx])
if _want_state: if _want_state:
row["state"] = convert(db_state[state_idx]) row["state"] = (
convert(db_state[state_idx]) if convert else db_state[state_idx]
)
if _want_sum: if _want_sum:
row["sum"] = convert(db_state[sum_idx]) row["sum"] = (
else: convert(db_state[sum_idx]) if convert else db_state[sum_idx]
if _want_mean: )
row["mean"] = db_state[mean_idx]
if _want_min:
row["min"] = db_state[min_idx]
if _want_max:
row["max"] = db_state[max_idx]
if _want_state:
row["state"] = db_state[state_idx]
if _want_sum:
row["sum"] = db_state[sum_idx]
ent_results.append(row) ent_results.append(row)
return result return result