@sebbo2002/vestaboard2mqtt 2.0.5-develop.5 → 3.0.0-develop.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -16,6 +16,6 @@ export default class CalendarPage implements Page<CalendarPagePayload> {
|
|
|
16
16
|
static isSameDay(a: Date, b: Date): boolean;
|
|
17
17
|
static isMidnight(date: Date): boolean;
|
|
18
18
|
fetchURLs(urls: string[]): Promise<CalendarPageItem[]>;
|
|
19
|
-
static getTimeStr(event: CalendarPageItem): string;
|
|
19
|
+
static getTimeStr(event: CalendarPageItem, oneLine?: boolean): string;
|
|
20
20
|
render(payload: CalendarPagePayload): Promise<PageRenderResponse>;
|
|
21
21
|
}
|
|
@@ -52,10 +52,9 @@ export default class CalendarPage {
|
|
|
52
52
|
});
|
|
53
53
|
}
|
|
54
54
|
static isSameDay(a, b) {
|
|
55
|
-
const result = Boolean(a.
|
|
56
|
-
a.
|
|
57
|
-
a.
|
|
58
|
-
console.log(`isSameDay(${a}, ${b}) => ${result}`);
|
|
55
|
+
const result = Boolean(a.getFullYear() === b.getFullYear() &&
|
|
56
|
+
a.getMonth() === b.getMonth() &&
|
|
57
|
+
a.getDate() === b.getDate());
|
|
59
58
|
return result;
|
|
60
59
|
}
|
|
61
60
|
static isMidnight(date) {
|
|
@@ -63,7 +62,6 @@ export default class CalendarPage {
|
|
|
63
62
|
!date.getMinutes() &&
|
|
64
63
|
!date.getSeconds() &&
|
|
65
64
|
!date.getMilliseconds());
|
|
66
|
-
console.log(`isMidnight(${date}) => ${result}`);
|
|
67
65
|
return result;
|
|
68
66
|
}
|
|
69
67
|
fetchURLs(urls) {
|
|
@@ -75,7 +73,7 @@ export default class CalendarPage {
|
|
|
75
73
|
.sort((a, b) => a.end.getTime() - b.end.getTime());
|
|
76
74
|
});
|
|
77
75
|
}
|
|
78
|
-
static getTimeStr(event) {
|
|
76
|
+
static getTimeStr(event, oneLine = false) {
|
|
79
77
|
if (this.isMidnight(event.start) &&
|
|
80
78
|
this.isMidnight(event.end) &&
|
|
81
79
|
this.isSameDay(new Date(), event.start)) {
|
|
@@ -84,7 +82,7 @@ export default class CalendarPage {
|
|
|
84
82
|
if (this.isMidnight(event.start) &&
|
|
85
83
|
this.isMidnight(event.end) &&
|
|
86
84
|
this.isSameDay(new Date(new Date().getTime() + 1000 * 60 * 60 * 24), event.start)) {
|
|
87
|
-
return 'Morgn';
|
|
85
|
+
return oneLine ? 'Morgen' : 'Morgn';
|
|
88
86
|
}
|
|
89
87
|
return event.start.getHours().toString().padStart(2, '⬛️') + ':' +
|
|
90
88
|
event.start.getMinutes().toString().padStart(2, '0');
|
|
@@ -98,8 +96,8 @@ export default class CalendarPage {
|
|
|
98
96
|
const calendar = yield this.fetchURLs(urls)
|
|
99
97
|
.then(calendar => calendar.filter(entry => {
|
|
100
98
|
if (CalendarPage.isMidnight(entry.start) && CalendarPage.isMidnight(entry.end)) {
|
|
101
|
-
return CalendarPage.isSameDay(new Date(), entry.start) ||
|
|
102
|
-
CalendarPage.isSameDay(new Date(new Date().getTime() + 1000 * 60 * 60 * 24), entry.start);
|
|
99
|
+
return CalendarPage.isSameDay(new Date(), entry.start) || (new Date().getHours() >= 20 &&
|
|
100
|
+
CalendarPage.isSameDay(new Date(new Date().getTime() + 1000 * 60 * 60 * 24), entry.start));
|
|
103
101
|
}
|
|
104
102
|
else {
|
|
105
103
|
return entry.start < new Date(new Date().getTime() + (1000 * 60 * 60 * 12));
|
|
@@ -113,7 +111,7 @@ export default class CalendarPage {
|
|
|
113
111
|
}
|
|
114
112
|
let validTill = new Date(new Date().getTime() + 1000 * 60 * 10);
|
|
115
113
|
calendar.forEach(event => {
|
|
116
|
-
message.write(CalendarPage.getTimeStr(event), { line: MessageWriteOptionsLine.NEXT });
|
|
114
|
+
message.write(CalendarPage.getTimeStr(event, calendar.length === 1), { line: MessageWriteOptionsLine.NEXT });
|
|
117
115
|
message.write(event.summary, { line: MessageWriteOptionsLine.CURRENT, row: 6 });
|
|
118
116
|
message.write('', { line: MessageWriteOptionsLine.NEXT });
|
|
119
117
|
if (event.end < validTill) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"calendar.js","sourceRoot":"","sources":["../../../src/lib/pages/calendar.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,KAAK,MAAM,aAAa,CAAC;AAEhC,OAAO,OAAO,EAAE,EAAC,uBAAuB,EAAC,MAAM,eAAe,CAAC;AAC/D,OAAO,IAAgB,MAAM,WAAW,CAAC;AACzC,OAAO,MAAM,MAAM,cAAc,CAAC;AAClC,OAAO,SAA6B,MAAM,YAAY,CAAC;AASvD,MAAM,CAAC,OAAO,OAAO,YAAY;IAGtB,YAAY,CAAC,OAAsB;QACtC,OAAO;YACH,SAAS,EAAE,CAAC,OAAO,IAAI,EAAE,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC;SACxC,CAAC;IACN,CAAC;IAED,WAAW;QACP,OAAO,EAAE,CAAC;IACd,CAAC;IAEY,QAAQ,CAAC,GAAW;;YAC7B,IAAI,SAAS,GAAG,MAAM,YAAY,CAAC,KAAK,CAAC,GAAG,CAAqB,GAAG,EAAE,IAAI,GAAG,EAAE,GAAG,EAAE,CAAC,CAAC;YACtF,IAAG,CAAC,SAAS,EAAE;gBACX,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;gBAC/C,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC;qBACjC,MAAM,CAAC,KAAK,CAAC,EAAE,CACZ,KAAK,CAAC,IAAI,KAAK,QAAQ;oBACvB,KAAK,CAAC,KAAK;oBACX,KAAK,CAAC,GAAG;oBACT,KAAK,CAAC,OAAO,CACJ,CAAC;gBAClB,SAAS,GAAG,MAAM;qBACb,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;oBACX,KAAK,EAAE,IAAI,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;oBACpC,GAAG,EAAE,IAAI,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;oBAChC,OAAO,EAAE,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE;iBACxC,CAAC,CAAC;qBACF,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,GAAG,GAAG,IAAI,IAAI,EAAE,CAAC;qBACvC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC,GAAG,CAAC,OAAO,EAAE,CAAC;qBACjD,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;gBAEjB,MAAM,YAAY,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,EAAE,SAAS,CAAC,CAAC;aAChD;YAED,OAAO,SAAS;iBACX,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;gBACX,KAAK,EAAE,IAAI,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;gBACpC,GAAG,EAAE,IAAI,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;gBAChC,OAAO,EAAE,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC;aACjC,CAAC,CAAC;iBACF,MAAM,CAAC,KAAK,CAAC,EAAE,CACZ,KAAK,CAAC,GAAG,GAAG,IAAI,IAAI,EAAE,CACzB,CAAC;QACV,CAAC;KAAA;IAEM,MAAM,CAAC,SAAS,CAAE,CAAO,EAAE,CAAO;QACrC,MAAM,MAAM,GAAG,OAAO,CAClB,CAAC,CAAC,
|
|
1
|
+
{"version":3,"file":"calendar.js","sourceRoot":"","sources":["../../../src/lib/pages/calendar.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -26,7 +26,7 @@
|
|
|
26
26
|
"@typescript-eslint/eslint-plugin": "^5.51.0",
|
|
27
27
|
"@typescript-eslint/parser": "^5.51.0",
|
|
28
28
|
"c8": "^7.12.0",
|
|
29
|
-
"eslint": "^8.
|
|
29
|
+
"eslint": "^8.34.0",
|
|
30
30
|
"eslint-plugin-jsonc": "^2.6.0",
|
|
31
31
|
"esm": "^3.2.25",
|
|
32
32
|
"license-checker": "^25.0.1",
|
|
@@ -35,11 +35,11 @@
|
|
|
35
35
|
"semantic-release-license": "^1.0.3",
|
|
36
36
|
"source-map-support": "^0.5.21",
|
|
37
37
|
"ts-node": "^10.8.2",
|
|
38
|
-
"typedoc": "^0.23.
|
|
38
|
+
"typedoc": "^0.23.25",
|
|
39
39
|
"typescript": "^4.9.5"
|
|
40
40
|
},
|
|
41
41
|
"engines": {
|
|
42
|
-
"node": "^
|
|
42
|
+
"node": "^14.8.0 || >=16.0.0"
|
|
43
43
|
},
|
|
44
44
|
"exports": "./dist/index.js",
|
|
45
45
|
"files": [
|
|
@@ -63,5 +63,5 @@
|
|
|
63
63
|
"test": "mocha"
|
|
64
64
|
},
|
|
65
65
|
"type": "module",
|
|
66
|
-
"version": "
|
|
66
|
+
"version": "3.0.0-develop.1"
|
|
67
67
|
}
|