Merge pull request #23 from imshentastic/fix/4.1.1-sd-fonts-preflight

fix(optimizer): include SD-card fonts in preflight modal

Author: imshentastic

CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## [crumble-v4.1.1] - 2026-06-04
+
+### Fixed
+- **Optimizer preflight modal now includes SD-card fonts.** Users with a custom `.cpfont` family (e.g. the CharEink SD-card bundle, or any community font dropped into `/fonts/` on the SD card) can now confirm or change their font in the "Lock in reader settings?" dialog that fires before each EPUB optimization. Previously the dropdown hardcoded only the three built-in families (Lexend Deca / Bitter / CharEink) and silently dropped SD selections. The fix pulls the family list from `/api/fonts` at modal open and routes the saved selection through `sdFontFamilyName` when an SD font is picked.
+
 ## [crumble-v4.1.0] - 2026-06-04
 
 ### Added

platformio.ini

@@ -35,7 +35,7 @@ crossink_version = 1.3.0
 ;         the last book page in as a background unless you slept from a book.
 ;         Also adds X4/X3 simulator envs + tooling (dev-only; X3 runtime support
 ;         already shipped in 3.0.0).
-crumble_version = 4.1.0
+crumble_version = 4.1.1
 
 [base]
 platform = https://github.com/pioarduino/platform-espressif32/releases/download/55.03.37/platform-espressif32.zip

src/network/html/js/optimizer.js

@@ -1872,11 +1872,34 @@ async function showOptimizerPreflightModal(renderInfo, fileName) {
   // Enum tables. Indexes match the CrossPointSettings.h enums byte-for-byte
   // -- the device validates the same ranges in handleSaveReaderSettings, so
   // any drift here would be caught server-side. Keep in sync with that file.
+  //
+  // Font-family is special: the dropdown carries STRING tags rather than
+  // numeric values so we can represent both built-in fonts ("builtin:N")
+  // and SD-card fonts ("sd:<family-name>") in the same select. Built-in
+  // tags map to numeric fontFamily on save; SD tags map to
+  // sdFontFamilyName. See the confirm.onclick handler below.
   const FONT_FAMILY = [
-    { v: 0, label: 'Lexend Deca' },
-    { v: 1, label: 'Bitter' },
-    { v: 2, label: 'CharE-Ink' },
+    { v: 'builtin:0', label: 'Lexend Deca' },
+    { v: 'builtin:1', label: 'Bitter' },
+    { v: 'builtin:2', label: 'CharE-Ink' },
   ];
+
+  // CrumBLE 4.1.1: pull SD-card font families from the device so users
+  // with a custom .cpfont can confirm / pick it in this dialog. Missing
+  // or failed /api/fonts response just falls through to built-ins only.
+  try {
+    const fontsResp = await fetch('/api/fonts');
+    if (fontsResp.ok) {
+      const fontsData = await fontsResp.json();
+      for (const family of (fontsData.families || [])) {
+        if (family && typeof family.name === 'string' && family.name.length > 0) {
+          FONT_FAMILY.push({ v: `sd:${family.name}`, label: `${family.name} (SD)` });
+        }
+      }
+    }
+  } catch (e) {
+    console.warn('Preflight: /api/fonts unavailable; SD-card font families will be missing from the picker', e);
+  }
   const FONT_SIZE = [
     { v: 0, label: 'Tiny (8pt)' },
     { v: 1, label: 'Small (10pt)' },
@@ -1990,7 +2013,12 @@ async function showOptimizerPreflightModal(renderInfo, fileName) {
       form.appendChild(wrap);
     };
 
-    makeSelect('Font family', 'fontFamily', FONT_FAMILY, renderInfo.fontFamily | 0);
+    // CrumBLE 4.1.1: pick the current font tag based on whether an SD
+    // font is selected (sdFontFamilyName non-empty) or a built-in one.
+    const currentFontTag = (renderInfo.sdFontFamilyName && renderInfo.sdFontFamilyName.length > 0)
+      ? `sd:${renderInfo.sdFontFamilyName}`
+      : `builtin:${renderInfo.fontFamily | 0}`;
+    makeSelect('Font family', 'fontFamily', FONT_FAMILY, currentFontTag);
     makeSelect('Font size', 'fontSize', FONT_SIZE, renderInfo.fontSize | 0);
     makeSelect('Orientation', 'orientation', ORIENTATION, renderInfo.orientation | 0);
     makeNumber('Screen margin (px)', 'screenMargin', renderInfo.screenMargin | 0, 0, 50);
@@ -2036,8 +2064,22 @@ async function showOptimizerPreflightModal(renderInfo, fileName) {
         const val = (el.type === 'checkbox') ? (el.checked ? '1' : '0') : el.value;
         if (val !== cur) {
           dirtyKeys.push(key);
-          if (el.type === 'checkbox') updates[key] = el.checked ? 1 : 0;
-          else updates[key] = Number(val);
+          if (el.type === 'checkbox') {
+            updates[key] = el.checked ? 1 : 0;
+          } else if (key === 'fontFamily' && typeof val === 'string' && val.startsWith('sd:')) {
+            // CrumBLE 4.1.1: SD-card font selection. Route the picked
+            // family name to sdFontFamilyName; keep fontFamily at its
+            // current built-in value so the device's font-resolution
+            // path knows to consult the SD registry.
+            updates.sdFontFamilyName = val.substring(3);
+          } else if (key === 'fontFamily' && typeof val === 'string' && val.startsWith('builtin:')) {
+            // Built-in font selection. Clear any prior SD selection so
+            // the device falls back to the numeric fontFamily enum.
+            updates.fontFamily = Number(val.substring(8));
+            updates.sdFontFamilyName = '';
+          } else {
+            updates[key] = Number(val);
+          }
         }
       });
       if (dirtyKeys.length === 0) {