latex-stickies 1.3.1 → 1.3.3

package/README.md

@@ -88,7 +88,7 @@ Use `Ctrl` in place of `Cmd` on Windows and Linux.
 | | |
 |---|---|
 | `Cmd+N` | New note |
-| `Cmd+W` | Close note (it reopens next launch) |
+| `Cmd+W` | Close note (it stays closed until you reopen it) |
 | `Cmd+Shift+Backspace` | Delete note, permanently |
 | `Cmd+B` / `Cmd+I` / `Cmd+E` | Bold / italic / code |
 | `Cmd+K` | Link |
@@ -103,8 +103,9 @@ On Windows and Linux the note windows have no menu bar, so the **☰** button
 in a note's toolbar opens the same menu. Every command is there.
 
 The **All Notes** menu lists every note you have. A tick means it is on screen;
-click to open a note, or click a ticked one to close it. So a note you closed
-is one click away rather than lost until the next launch.
+click to open a note, or click a ticked one to close it. Closing a note is
+remembered, so the desk you left is the desk you come back to -- the app
+reopens what was on screen rather than every note you have ever written.
 
 ## Where notes live
 

package/bin/latex-stickies.js

@@ -21,6 +21,16 @@ try {
   process.exit(1);
 }
 
+// Name the Electron shell before launching it, not only at install time.
+// postinstall scripts are increasingly blocked -- npm warns about them by
+// default now, and plenty of people and companies set ignore-scripts -- and a
+// user who installs with them off gets "Electron" in their Dock. Doing it here
+// as well means the name is right by the time macOS reads the bundle, whatever
+// happened during the install. It returns immediately once done.
+try {
+  require('../scripts/brand-electron.js');
+} catch (_) { /* cosmetic: never block a launch over the name */ }
+
 const appDir = path.join(__dirname, '..');
 const child = spawn(electron, [appDir, ...process.argv.slice(2)], {
   detached: true,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "latex-stickies",
-  "version": "1.3.1",
+  "version": "1.3.3",
   "description": "Sticky notes for your desktop that render LaTeX and Markdown.",
   "main": "src/main.js",
   "scripts": {

package/src/main.js

@@ -128,6 +128,8 @@ function openNote(note) {
     return existing;
   }
 
+  store.upsert({ id: note.id, open: true });
+
   const win = new BrowserWindow({
     ...onScreenBounds(note.bounds),
     minWidth: 220,
@@ -158,6 +160,11 @@ function openNote(note) {
     windows.delete(note.id);
     smokeLog(`windows=${windows.size}`);
 
+    // Closing a note is a decision that should survive a restart. Quitting is
+    // not: an app that shuts down closes every window, and treating that as
+    // "the user closed them all" would greet them with an empty desk.
+    if (!quitting) store.upsert({ id: note.id, open: false });
+
     // macOS apps outlive their windows; the Dock icon is the way back.
     // Elsewhere there is no way back, so an app with no windows is just an
     // invisible process -- and the next launch hands off to it and appears to
@@ -205,13 +212,24 @@ function createNote(seed = {}) {
   return note;
 }
 
+/**
+ * Opens the notes that were on screen when the app was last used.
+ *
+ * Not every note: someone with thirty notes and three on screen wants three
+ * windows back, and reopening all of them made closing one pointless. A note
+ * closed on purpose stays closed until it is opened again from All Notes.
+ */
 function restoreNotes() {
   const notes = store.all();
   if (notes.length === 0) {
     createNote({ body: WELCOME });
     return;
   }
-  notes.forEach(openNote);
+
+  const open = notes.filter((n) => n.open !== false);
+  // Never nothing. A launch that puts no window on screen looks like a failed
+  // launch, and on Windows it leaves an invisible process with no way back.
+  (open.length ? open : [notes[notes.length - 1]]).forEach(openNote);
 }
 
 const { WELCOME } = require('./welcome');
@@ -442,6 +460,8 @@ app.on('second-instance', surfaceNotes);
  * quietly overwriting what was changed on disk.
  */
 let stopWatchingNotes = null;
+/** Set while the app is shutting down, so closing windows is not a choice. */
+let quitting = false;
 
 /**
  * Everything that must happen before the process goes away.
@@ -452,6 +472,7 @@ let stopWatchingNotes = null;
  * process -- alive after the last window has gone.
  */
 function prepareToExit() {
+  quitting = true;
   if (stopWatchingNotes) {
     stopWatchingNotes();
     stopWatchingNotes = null;

package/src/store.js

@@ -25,7 +25,7 @@ const INDEX = path.join(DIR, '.stickies.json');
 /** The old single-file store, migrated from once and then left alone. */
 const LEGACY = path.join(app.getPath('userData'), 'notes.json');
 
-const DEFAULTS = { color: 'yellow', fontSize: 15, alwaysOnTop: false };
+const DEFAULTS = { color: 'yellow', fontSize: 15, alwaysOnTop: false, open: true };
 
 let notes = null; // [{ id, file, body, color, fontSize, alwaysOnTop, bounds }]
 let timer = null;
@@ -94,6 +94,9 @@ function load() {
       ...saved,
       // The file is the source of truth for content; the index only decorates.
       id: saved.id || file,
+      // A file that appeared in the folder from outside has no index entry,
+      // and should show itself rather than stay invisible.
+      open: saved.open !== false,
       file,
       body,
     };
@@ -173,26 +176,34 @@ function writeIndex(meta) {
   }
 }
 
-function flush() {
-  timer = null;
+/** The sidecar index alone: filenames to ids, colours, bounds. */
+function flushIndex() {
   const meta = {};
   for (const note of all()) {
-    try {
-      writeFileAtomic(path.join(DIR, note.file), note.body || '');
-    } catch (err) {
-      console.error(`failed to save ${note.file}`, err);
-    }
     meta[note.file] = {
       id: note.id,
       color: note.color,
       fontSize: note.fontSize,
       alwaysOnTop: note.alwaysOnTop,
       bounds: note.bounds,
+      open: note.open !== false,
     };
   }
   writeIndex(meta);
 }
 
+function flush() {
+  timer = null;
+  for (const note of all()) {
+    try {
+      writeFileAtomic(path.join(DIR, note.file), note.body || '');
+    } catch (err) {
+      console.error(`failed to save ${note.file}`, err);
+    }
+  }
+  flushIndex();
+}
+
 // Writes are frequent (every keystroke, every window drag), so coalesce them.
 function save() {
   if (timer) return;
@@ -234,8 +245,23 @@ function upsert(note) {
     const next = slugFor(list[i].body, taken, path.extname(before.file) || '.md');
     try {
       const from = path.join(DIR, before.file);
+      // Both names count as our own writing, or the rename looks like an
+      // outside edit and the watcher reloads over the top of it.
+      justWrote.set(before.file, Date.now());
+      justWrote.set(next, Date.now());
       if (fs.existsSync(from)) fs.renameSync(from, path.join(DIR, next));
       list[i].file = next;
+      // Write this note's body now too. The rename is immediate but the body
+      // is on the 400ms timer, so a reload in between would read the new file
+      // and find the old text -- after which the filename stops following the
+      // title, because it no longer looks like a name we chose.
+      writeFileAtomic(path.join(DIR, next), list[i].body || '');
+      // The index must follow the rename at once, not on the 400ms timer.
+      // A note's id lives in the index, keyed by filename; anything that
+      // reloads in the gap finds a file the index has never heard of, gives
+      // it a fresh id, and orphans the window still holding the old one --
+      // whose next keystroke then writes a second copy of the same note.
+      flushIndex();
     } catch (err) {
       console.error(`could not rename ${before.file} to ${next}`, err);
     }