Compare commits
3 Commits
1294688b40
...
stable-reb
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
f76c5ac33b | ||
|
|
6e0976a284 | ||
|
|
060a2bc917 |
@@ -6438,7 +6438,7 @@ async function stopTimer(token, entryId) {
|
||||
}
|
||||
|
||||
// src/plugin.ts
|
||||
var CURRENT_VERSION = "1.0.38";
|
||||
var CURRENT_VERSION = "1.0.40";
|
||||
var GITEA_BASE = "https://gitea.pdmarf.co.uk/pdm/stream_deck_notion_timer/raw/branch/stable-rebuild";
|
||||
var SIGNING_PUBLIC_KEY = `-----BEGIN PUBLIC KEY-----
|
||||
MCowBQYDK2VwAyEAN7ko8TUpuPzPAJuKAZCRjV0c4ZSlou5d9pUAF6o12b4=
|
||||
@@ -6535,11 +6535,10 @@ async function loadRunningState() {
|
||||
memRunningEntryId = stored.runningEntryId ?? null;
|
||||
memRunningActionId = stored.runningActionId ?? null;
|
||||
}
|
||||
async function setRunningEntry(entryId, actionId) {
|
||||
function setRunningEntry(entryId, actionId) {
|
||||
memRunningEntryId = entryId;
|
||||
memRunningActionId = actionId;
|
||||
const stored = await plugin_default.settings.getGlobalSettings();
|
||||
await plugin_default.settings.setGlobalSettings({ ...stored, runningEntryId: entryId, runningActionId: actionId });
|
||||
plugin_default.settings.getGlobalSettings().then((stored) => plugin_default.settings.setGlobalSettings({ ...stored, runningEntryId: entryId, runningActionId: actionId })).catch((err) => plugin_default.logger.error("Failed to persist running state:", err));
|
||||
}
|
||||
async function sendProjectsToPI(tokenOverride) {
|
||||
try {
|
||||
@@ -6570,6 +6569,7 @@ function buttonTitle(projectName) {
|
||||
}
|
||||
var TimerToggle = class extends SingletonAction {
|
||||
projectCache = /* @__PURE__ */ new Map();
|
||||
pendingKeyDown = /* @__PURE__ */ new Set();
|
||||
async onWillAppear(ev) {
|
||||
this.projectCache.set(ev.action.id, ev.payload.settings);
|
||||
const title = buttonTitle(ev.payload.settings.projectName || "");
|
||||
@@ -6585,50 +6585,58 @@ var TimerToggle = class extends SingletonAction {
|
||||
await sendProjectsToPI();
|
||||
}
|
||||
async onKeyDown(ev) {
|
||||
const { projectId, projectName } = ev.payload.settings;
|
||||
const title = buttonTitle(projectName || "");
|
||||
const isRunning = memRunningActionId === ev.action.id;
|
||||
if (projectId) {
|
||||
if (isRunning) {
|
||||
await Promise.all([ev.action.setState(0), ev.action.setTitle(title)]);
|
||||
} else {
|
||||
for (const other of this.actions) {
|
||||
if (other.id === ev.action.id) continue;
|
||||
if (memRunningActionId === other.id) {
|
||||
const s = this.projectCache.get(other.id);
|
||||
await Promise.all([other.setState(0), other.setTitle(buttonTitle(s?.projectName || ""))]);
|
||||
}
|
||||
}
|
||||
await Promise.all([ev.action.setState(1), ev.action.setTitle(`\u23F1 ${title}`)]);
|
||||
}
|
||||
}
|
||||
const global = await getGlobal();
|
||||
if (!isConfigured(global)) {
|
||||
await ev.action.showAlert();
|
||||
return;
|
||||
}
|
||||
if (!projectId) {
|
||||
await ev.action.showAlert();
|
||||
return;
|
||||
}
|
||||
if (this.pendingKeyDown.has(ev.action.id)) return;
|
||||
this.pendingKeyDown.add(ev.action.id);
|
||||
try {
|
||||
if (isRunning) {
|
||||
await stopTimer(global.notionToken, memRunningEntryId);
|
||||
await setRunningEntry(null, null);
|
||||
} else {
|
||||
if (memRunningEntryId) {
|
||||
await stopTimer(global.notionToken, memRunningEntryId);
|
||||
const { projectId, projectName } = ev.payload.settings;
|
||||
const title = buttonTitle(projectName || "");
|
||||
const isRunning = memRunningActionId === ev.action.id;
|
||||
if (projectId) {
|
||||
if (isRunning) {
|
||||
await Promise.all([ev.action.setState(0), ev.action.setTitle(title)]);
|
||||
} else {
|
||||
for (const other of this.actions) {
|
||||
if (other.id === ev.action.id) continue;
|
||||
if (memRunningActionId === other.id) {
|
||||
const s = this.projectCache.get(other.id);
|
||||
await Promise.all([other.setState(0), other.setTitle(buttonTitle(s?.projectName || ""))]);
|
||||
}
|
||||
}
|
||||
await Promise.all([ev.action.setState(1), ev.action.setTitle(`\u23F1 ${title}`)]);
|
||||
}
|
||||
const entryId = await startTimer(global.notionToken, global.timingDbId, projectId, projectName, global.userId);
|
||||
await setRunningEntry(entryId, ev.action.id);
|
||||
}
|
||||
} catch (err) {
|
||||
await Promise.all([
|
||||
ev.action.setState(isRunning ? 1 : 0),
|
||||
ev.action.setTitle(isRunning ? `\u23F1 ${title}` : title)
|
||||
]);
|
||||
plugin_default.logger.error("Timer toggle failed:", err);
|
||||
await ev.action.showAlert();
|
||||
const global = await getGlobal();
|
||||
if (!isConfigured(global)) {
|
||||
await ev.action.showAlert();
|
||||
return;
|
||||
}
|
||||
if (!projectId) {
|
||||
await ev.action.showAlert();
|
||||
return;
|
||||
}
|
||||
try {
|
||||
if (isRunning) {
|
||||
await stopTimer(global.notionToken, memRunningEntryId);
|
||||
setRunningEntry(null, null);
|
||||
await Promise.all([ev.action.setState(0), ev.action.setTitle(title)]);
|
||||
} else {
|
||||
if (memRunningEntryId) {
|
||||
await stopTimer(global.notionToken, memRunningEntryId);
|
||||
}
|
||||
const entryId = await startTimer(global.notionToken, global.timingDbId, projectId, projectName, global.userId);
|
||||
setRunningEntry(entryId, ev.action.id);
|
||||
await Promise.all([ev.action.setState(1), ev.action.setTitle(`\u23F1 ${title}`)]);
|
||||
}
|
||||
} catch (err) {
|
||||
await Promise.all([
|
||||
ev.action.setState(isRunning ? 1 : 0),
|
||||
ev.action.setTitle(isRunning ? `\u23F1 ${title}` : title)
|
||||
]);
|
||||
plugin_default.logger.error("Timer toggle failed:", err);
|
||||
await ev.action.showAlert();
|
||||
}
|
||||
} finally {
|
||||
this.pendingKeyDown.delete(ev.action.id);
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
@@ -1,2 +1 @@
|
||||
Κ¤<06>C¤•Sί¤
|
||||
Φ®Έ}•~P}ηΜ<>Z;·ΆxΤη{,¦NYPπu4#ΑΚ„jα§ΎWCκΈ©σΔ«Έ<0E>d
|
||||
{QÕ¿óîj¶?Íz_ÎDA+ÌOÎi °<u,&/Õ+ødeÆá¤"÷œSw+&öO.RC‘&óä^H-¯
|
||||
@@ -2,7 +2,7 @@
|
||||
"Author": "Pete Marfleet",
|
||||
"Description": "Toggle Notion time tracking for a project with a single button press.",
|
||||
"Name": "Notion Timer",
|
||||
"Version": "1.0.38",
|
||||
"Version": "1.0.39",
|
||||
"SDKVersion": 2,
|
||||
"Software": { "MinimumVersion": "5.0" },
|
||||
"OS": [{ "Platform": "mac", "MinimumVersion": "10.11" }],
|
||||
|
||||
Binary file not shown.
@@ -1,4 +1,4 @@
|
||||
const CURRENT_VERSION = "1.0.38";
|
||||
const CURRENT_VERSION = "1.0.40";
|
||||
const GITEA_BASE = "https://gitea.pdmarf.co.uk/pdm/stream_deck_notion_timer/raw/branch/stable-rebuild";
|
||||
const SIGNING_PUBLIC_KEY = `-----BEGIN PUBLIC KEY-----
|
||||
MCowBQYDK2VwAyEAN7ko8TUpuPzPAJuKAZCRjV0c4ZSlou5d9pUAF6o12b4=
|
||||
@@ -125,11 +125,13 @@ async function loadRunningState(): Promise<void> {
|
||||
memRunningActionId = stored.runningActionId ?? null;
|
||||
}
|
||||
|
||||
async function setRunningEntry(entryId: string | null, actionId: string | null): Promise<void> {
|
||||
function setRunningEntry(entryId: string | null, actionId: string | null): void {
|
||||
memRunningEntryId = entryId;
|
||||
memRunningActionId = actionId;
|
||||
const stored = await streamDeck.settings.getGlobalSettings<GlobalSettings>();
|
||||
await streamDeck.settings.setGlobalSettings({ ...stored, runningEntryId: entryId, runningActionId: actionId });
|
||||
// Persist in background — do not await, so the visual is never blocked
|
||||
streamDeck.settings.getGlobalSettings<GlobalSettings>()
|
||||
.then(stored => streamDeck.settings.setGlobalSettings({ ...stored, runningEntryId: entryId, runningActionId: actionId }))
|
||||
.catch(err => streamDeck.logger.error("Failed to persist running state:", err));
|
||||
}
|
||||
|
||||
async function sendProjectsToPI(tokenOverride?: string): Promise<void> {
|
||||
@@ -165,6 +167,7 @@ function buttonTitle(projectName: string): string {
|
||||
@action({ UUID: "com.pdma.notion-timer.toggle" })
|
||||
class TimerToggle extends SingletonAction<TimerSettings> {
|
||||
private projectCache = new Map<string, TimerSettings>();
|
||||
private pendingKeyDown = new Set<string>();
|
||||
|
||||
async onWillAppear(ev: WillAppearEvent<TimerSettings>): Promise<void> {
|
||||
this.projectCache.set(ev.action.id, ev.payload.settings);
|
||||
@@ -183,6 +186,9 @@ class TimerToggle extends SingletonAction<TimerSettings> {
|
||||
}
|
||||
|
||||
async onKeyDown(ev: KeyDownEvent<TimerSettings>): Promise<void> {
|
||||
if (this.pendingKeyDown.has(ev.action.id)) return;
|
||||
this.pendingKeyDown.add(ev.action.id);
|
||||
try {
|
||||
const { projectId, projectName } = ev.payload.settings;
|
||||
const title = buttonTitle(projectName || "");
|
||||
const isRunning = memRunningActionId === ev.action.id;
|
||||
@@ -210,13 +216,15 @@ class TimerToggle extends SingletonAction<TimerSettings> {
|
||||
try {
|
||||
if (isRunning) {
|
||||
await stopTimer(global.notionToken, memRunningEntryId!);
|
||||
await setRunningEntry(null, null);
|
||||
setRunningEntry(null, null);
|
||||
await Promise.all([ev.action.setState(0), ev.action.setTitle(title)]);
|
||||
} else {
|
||||
if (memRunningEntryId) {
|
||||
await stopTimer(global.notionToken, memRunningEntryId);
|
||||
}
|
||||
const entryId = await startTimer(global.notionToken, global.timingDbId, projectId, projectName, global.userId);
|
||||
await setRunningEntry(entryId, ev.action.id);
|
||||
setRunningEntry(entryId, ev.action.id);
|
||||
await Promise.all([ev.action.setState(1), ev.action.setTitle(`⏱ ${title}`)]);
|
||||
}
|
||||
} catch (err) {
|
||||
// Revert visual on error
|
||||
@@ -227,6 +235,9 @@ class TimerToggle extends SingletonAction<TimerSettings> {
|
||||
streamDeck.logger.error("Timer toggle failed:", err);
|
||||
await ev.action.showAlert();
|
||||
}
|
||||
} finally {
|
||||
this.pendingKeyDown.delete(ev.action.id);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -1 +1 @@
|
||||
{ "version": "1.0.38" }
|
||||
{ "version": "1.0.40" }
|
||||
|
||||
Reference in New Issue
Block a user