dsh-local-board 1.5.3 → 1.5.6

package/client.js

@@ -24,6 +24,13 @@ window.__ModuleLoader__.load({
 			configureVault: '选择文件夹'
 		};
 		const PROJECT_STATUS = ['进行中', '暂停', '已结束'];
+		/**
+		 * True while an IME is composing (Chinese/Japanese/Korean input). Enter and Escape
+		 * then belong to the IME — confirming a candidate must never submit the form.
+		 */
+		const composing = (event) => (event.nativeEvent && event.nativeEvent.isComposing === true)
+			|| event.isComposing === true
+			|| event.keyCode === 229;
 		/** Card color stripe; keys match what the markdown stores. */
 		const CARD_COLORS = [
 			{ key: 'red', hex: '#e5484d', label: '红' },
@@ -211,6 +218,7 @@ window.__ModuleLoader__.load({
 				placeholder,
 				onChange: (event) => setDraft({ ...draft, [key]: event.target.value }),
 				onKeyDown: (event) => {
+					if (composing(event)) return;
 					if (event.key === 'Escape') onCancel();
 					if (event.key === 'Enter') onSubmit(draft);
 				}
@@ -515,6 +523,7 @@ window.__ModuleLoader__.load({
 					value: name,
 					onChange: (event) => setName(event.target.value),
 					onKeyDown: (event) => {
+						if (composing(event)) return;
 						if (event.key === 'Enter' && name.trim() !== '') onCreate({ name: name.trim(), role });
 						if (event.key === 'Escape') onCancel();
 					}
@@ -548,6 +557,7 @@ window.__ModuleLoader__.load({
 								if (next !== '' && next !== project.name) commit({ name: next });
 							},
 							onKeyDown: (event) => {
+								if (composing(event)) return;
 								if (event.key === 'Enter') event.target.blur();
 							}
 						})),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-local-board",
-  "version": "1.5.3",
+  "version": "1.5.6",
   "description": "本地待办看板：Todo/Doing/Done 三列，按项目组织。首次使用自己选一个文件夹，数据就是一个 Markdown 文件，随你放哪、随你备份。macOS 支持到期提醒。",
   "type": "module",
   "main": "index.js",

package/scripts/digest.py

@@ -84,9 +84,27 @@ def build(rows, today):
         body = body[:197] + '…'
     return body
 
-def notify(body):
-    script = 'display notification "' + body.replace('"', '\\"') + '" with title "' + TITLE + '" sound name "Glass"'
-    subprocess.run(['/usr/bin/osascript', '-e', script], check=False)
+APPLESCRIPT = (
+    'on run argv\n'
+    '  display notification (item 2 of argv) with title (item 1 of argv) subtitle "DSH 看板" sound name "Glass"\n'
+    'end run'
+)
+
+
+def notify(title, body):
+    """Notification text is user data: pass it as argv so AppleScript never parses it."""
+    try:
+        result = subprocess.run(
+            ['/usr/bin/osascript', '-e', APPLESCRIPT, str(title), str(body)],
+            capture_output=True, text=True, timeout=20
+        )
+        if result.returncode != 0:
+            print('notify failed:', (result.stderr or '').strip() or 'osascript exit ' + str(result.returncode), file=sys.stderr)
+            return False
+        return True
+    except (OSError, subprocess.SubprocessError) as error:
+        print('notify failed:', error, file=sys.stderr)
+        return False
 
 def main():
     today = datetime.date.today().isoformat()
@@ -106,7 +124,7 @@ def main():
         print('title:', TITLE)
         print('body :', body)
         return 0
-    notify(body)
+    notify(TITLE, body)
     print('notified:', body)
     return 0
 

package/scripts/due-soon.py

@@ -72,6 +72,29 @@ def save_state(state):
     STATE.parent.mkdir(parents=True, exist_ok=True)
     STATE.write_text(json.dumps(state, ensure_ascii=False), encoding='utf-8')
 
+APPLESCRIPT = (
+    'on run argv\n'
+    '  display notification (item 2 of argv) with title (item 1 of argv) subtitle "DSH 看板" sound name "Glass"\n'
+    'end run'
+)
+
+
+def notify(title, body):
+    """Notification text is user data: pass it as argv so AppleScript never parses it."""
+    try:
+        result = subprocess.run(
+            ['/usr/bin/osascript', '-e', APPLESCRIPT, str(title), str(body)],
+            capture_output=True, text=True, timeout=20
+        )
+        if result.returncode != 0:
+            print('notify failed:', (result.stderr or '').strip() or 'osascript exit ' + str(result.returncode), file=sys.stderr)
+            return False
+        return True
+    except (OSError, subprocess.SubprocessError) as error:
+        print('notify failed:', error, file=sys.stderr)
+        return False
+
+
 def main():
     window = 120
     if '--window' in sys.argv:
@@ -111,7 +134,7 @@ def main():
     if '--dry-run' in sys.argv:
         print('body:', body)
         return 0
-    subprocess.run(['/usr/bin/osascript', '-e', f'display notification "{body}" with title "{TITLE}" sound name "Glass"'], check=False)
+    notify(TITLE, body)
     for when, _minutes, _row, key in hits:
         state[key] = when.isoformat(timespec='minutes')
     save_state(state)

package/scripts/weekly.py

@@ -70,17 +70,40 @@ def build(rows, today):
         body = body[:197] + '…'
     return body
 
+APPLESCRIPT = (
+    'on run argv\n'
+    '  display notification (item 2 of argv) with title (item 1 of argv) subtitle "DSH 看板" sound name "Glass"\n'
+    'end run'
+)
+
+
+def notify(title, body):
+    """Notification text is user data: pass it as argv so AppleScript never parses it."""
+    try:
+        result = subprocess.run(
+            ['/usr/bin/osascript', '-e', APPLESCRIPT, str(title), str(body)],
+            capture_output=True, text=True, timeout=20
+        )
+        if result.returncode != 0:
+            print('notify failed:', (result.stderr or '').strip() or 'osascript exit ' + str(result.returncode), file=sys.stderr)
+            return False
+        return True
+    except (OSError, subprocess.SubprocessError) as error:
+        print('notify failed:', error, file=sys.stderr)
+        return False
+
+
 def main():
-    if not BOARD.exists():
-        print('board not found', file=sys.stderr)
-        return 1
     today = datetime.date.today()
-    body = build(parse(read_board()), today)
+    try:
+        body = build(parse(read_board()), today)
+    except OSError as error:
+        print('cannot read board or snapshot:', error, file=sys.stderr)
+        return 1
     if '--dry-run' in sys.argv:
         print('body:', body)
         return 0
-    script = 'display notification "' + body.replace('"', '\\"') + '" with title "' + TITLE + '" sound name "Glass"'
-    subprocess.run(['/usr/bin/osascript', '-e', script], check=False)
+    notify(TITLE, body)
     print('notified:', body)
     return 0