latex-stickies 1.3.2 → 1.3.4

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/package.json

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

package/scripts/brand-electron.js

@@ -19,6 +19,25 @@ const path = require('path');
 
 const NAME = 'LaTeX Stickies';
 
+/**
+ * Makes LaunchServices re-read a bundle.
+ *
+ * It caches an app's name from the first time it sees the path, and npm
+ * extracts Electron under a directory macOS indexes -- so it can record
+ * "Electron" before this script ever runs, and then keep showing that in the
+ * Dock however right the plist is. Renaming alone is not enough.
+ */
+function refreshLaunchServices(appPath) {
+  try {
+    execFileSync(
+      '/System/Library/Frameworks/CoreServices.framework/Frameworks'
+      + '/LaunchServices.framework/Support/lsregister',
+      ['-f', appPath],
+      { stdio: 'ignore', timeout: 10000 }
+    );
+  } catch (_) { /* the name is still right; only the cache is stale */ }
+}
+
 function main() {
   if (process.platform !== 'darwin') return; // only macOS names apps this way
 
@@ -42,7 +61,17 @@ function main() {
     }
   };
 
-  if (read('CFBundleName') === NAME) return; // already done
+  if (read('CFBundleName') === NAME) {
+    // Already named, so a wrong name in the Dock can only be a stale cache.
+    refreshLaunchServices(appPath);
+    // Say so rather than exiting in silence. A user reporting "the Dock still
+    // says Electron" needs to know whether the rename failed or whether they
+    // are looking at an older instance still holding the single-instance lock.
+    if (process.env.LATEX_STICKIES_VERBOSE) {
+      console.log(`the Electron shell is already named "${NAME}"`);
+    }
+    return;
+  }
 
   const backup = fs.readFileSync(plist);
   try {
@@ -66,6 +95,8 @@ function main() {
     });
     execFileSync('codesign', ['--verify', appPath], { stdio: 'ignore' });
 
+    refreshLaunchServices(appPath);
+
     console.log(`named the Electron shell "${NAME}"`);
   } catch (err) {
     fs.writeFileSync(plist, backup);

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,
     };
@@ -183,6 +186,7 @@ function flushIndex() {
       fontSize: note.fontSize,
       alwaysOnTop: note.alwaysOnTop,
       bounds: note.bounds,
+      open: note.open !== false,
     };
   }
   writeIndex(meta);