Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/data/logbook.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ const LOGBOOK_LOCALIZE_PATH = "ui.components.logbook.messages";
export const CONTINUOUS_DOMAINS = ["proximity", "sensor"];

export interface LogbookEntry {
// Python timestamp. Do *1000 to get JS timestamp.
when: number;
name: string;
message?: string;
Expand Down
30 changes: 21 additions & 9 deletions src/panels/logbook/ha-logbook.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,12 @@ import "./ha-logbook-renderer";
export class HaLogbook extends LitElement {
@property({ attribute: false }) public hass!: HomeAssistant;

@property() public time!: { range: [Date, Date] } | { recent: number };
@property() public time!:
| { range: [Date, Date] }
| {
// Seconds
recent: number;
};

@property() public entityIds?: string[];

Expand Down Expand Up @@ -211,17 +216,19 @@ export class HaLogbook extends LitElement {

let startTime: Date;
let endTime: Date;
let appendData = false;
let purgeBeforePythonTime: number | undefined;

if ("range" in this.time) {
[startTime, endTime] = this.time.range;
} else {
// Recent data
appendData = true;
} else if ("recent" in this.time) {
purgeBeforePythonTime =
new Date(new Date().getTime() - this.time.recent * 1000).getTime() /
1000;
startTime =
this._lastLogbookDate ||
new Date(new Date().getTime() - 24 * 60 * 60 * 1000);
this._lastLogbookDate || new Date(purgeBeforePythonTime * 1000);
endTime = new Date();
} else {
throw new Error("Unexpected time specified");
}

let newEntries: LogbookEntry[];
Expand Down Expand Up @@ -251,8 +258,13 @@ export class HaLogbook extends LitElement {
newEntries = [...newEntries].reverse();

this._logbookEntries =
appendData && this._logbookEntries
? newEntries.concat(...this._logbookEntries)
// If we have a purgeBeforeTime, it means we're in recent-mode and fetch batches
purgeBeforePythonTime && this._logbookEntries
? newEntries.concat(
...this._logbookEntries.filter(
(entry) => entry.when > purgeBeforePythonTime!
)
)
: newEntries;
this._lastLogbookDate = endTime;
}
Expand Down
2 changes: 1 addition & 1 deletion src/panels/lovelace/cards/hui-logbook-card.ts
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ export class HuiLogbookCard extends LitElement implements LovelaceCard {
...config,
};
this._time = {
recent: this._config!.hours_to_show! * 60 * 60 * 1000,
recent: this._config!.hours_to_show! * 60 * 60,
};
this._entityId = processConfigEntities<EntityConfig>(config.entities).map(
(entity) => entity.entity
Expand Down