Merge pull request #167 from Gnathonic/develop

Release v1.4.0

Author: Gnathonic

.github/workflows/pr-target-guard.yml

@@ -2,10 +2,23 @@ name: PR Target Guard
 
 on:
   pull_request_target:
-    types: [opened]
+    types: [opened, reopened, synchronize]
 
 jobs:
-  check-target:
+  # Block any PR to main that doesn't come from develop
+  require-develop-to-main:
+    runs-on: ubuntu-latest
+    if: github.event.pull_request.base.ref == 'main' && github.event.pull_request.head.ref != 'develop'
+    steps:
+      - name: Block non-develop PRs to main
+        run: |
+          gh pr comment ${{ github.event.number }} --repo ${{ github.repository }} --body "PRs to \`main\` must come from \`develop\`. Please target \`develop\` instead, or merge your changes into \`develop\` first."
+          exit 1
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+  # Redirect external contributors to develop
+  redirect-forks:
     runs-on: ubuntu-latest
     if: github.event.pull_request.base.ref == 'main' && github.event.pull_request.head.repo.fork
     steps:

CHANGELOG.md

@@ -1,5 +1,47 @@
 # Changelog
 
+## [1.4.0] - 2026-02-20
+
+### Added
+
+- **Bulk cover cropping** - Crop a cover and apply the same crop region to the next volume in the series, making it easy to set consistent covers across an entire series
+- **Cloud thumbnail previews** - Cloud-only volumes now show cover thumbnails in the catalog before downloading
+- **Faster catalog scrolling** - Thumbnail rendering rewritten for smoother performance, especially on mobile
+- **AnkiConnect field action badges** - Visual indicators showing Append/Unchanged/Replace behavior for each field
+
+### Changed
+
+- **AnkiConnect field modal layout** - Tiered accordion design for clearer field organization
+- **Cloud sync now preserves cover images** - Uploads and downloads keep your custom covers and metadata intact
+
+### Fixed
+
+- **Duplicate cloud folders** - Automatically detects and merges duplicate series folders
+- **Google Drive series deletion** - No longer fails intermittently
+- **Mobile import page reloads** - Fixed unexpected full-page reloads during file imports on mobile
+- **Image-only archive imports** - Now prompts for confirmation instead of silently failing
+- **Routing race conditions** - Fixed premature redirect to catalog when the library loads slowly
+- **Loading vs not-found states** - Proper distinction between "loading" and "does not exist" for series/volumes
+- **Zoom notification removed** - No longer interferes with Yomitan dictionary popups
+- **Image dragging in cropper** - Disabled unwanted drag behavior during crop selection
+- **AnkiConnect field modal fixes** - Truncated long previews, proper crop bounds, scroll wheel support, improved styling
+- **Reader spread navigation** - Fixed forward/backward paging with two-page spreads
+
+## [1.3.0] - 2026-01-06
+
+### Added
+
+- **Dynamic AnkiConnect field mapping** - Configure which template populates each Anki field with a visual UI
+- **Template variables for fields** - Use `{selection}`, `{sentence}`, `{image}`, `{series}`, `{volume}` in any field
+- **Mixed field templates** - Combine text and images in the same field (e.g., `{sentence} {image}`)
+- **Android mode detection** - Auto-detects AnkiConnect Android limitations with manual override option
+- **Connection-gated AnkiConnect settings** - Settings only appear after connecting, with live model/deck/field data from Anki
+
+### Changed
+
+- **AnkiConnect settings redesign** - Complete overhaul with connection status, enable toggle, and organized sections
+- **Card mode selection** - Now uses radio buttons instead of dropdown for clearer selection
+
 ## [1.2.3] - 2026-01-15
 
 ### Added

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "mokuro-reader",
-  "version": "1.2.3",
+  "version": "1.4.0",
   "private": true,
   "scripts": {
     "dev": "vite dev",

package.json

@@ -26,19 +26,40 @@ export function expandTextBoxBounds(
   ];
 }
 
-type CropperModal = {
+/**
+ * Modal modes for the unified Anki field modal:
+ * - configure: Edit raw template strings for field mapping (no cropper)
+ * - create: Create new card with resolved templates (shows cropper)
+ * - update: Update existing card with {existing} support (shows cropper)
+ */
+export type AnkiModalMode = 'configure' | 'create' | 'update';
+
+type AnkiFieldModal = {
   open: boolean;
+  mode: AnkiModalMode;
   image?: string;
   selectedText?: string; // The selected/highlighted text (for Front field)
   sentence?: string; // The full sentence/all lines (for Sentence field)
   tags?: string;
   metadata?: VolumeMetadata;
+  pageNumber?: number;
+  pageFilename?: string; // The filename of the current page image
   pages?: Page[]; // Available pages with textboxes for visual selection
   textBox?: [number, number, number, number]; // [xmin, ymin, xmax, ymax] for initial crop
+  previousValues?: Record<string, string>; // field name -> previous value
+  previousTags?: string[]; // existing tags on the card being updated
+  previousCardId?: number;
+  modelName?: string; // For update mode: the model name from the card being updated
 };
 
-export const cropperStore = writable<CropperModal | undefined>(undefined);
+// Backwards compatibility alias
+type CropperModal = AnkiFieldModal;
 
+export const cropperStore = writable<AnkiFieldModal | undefined>(undefined);
+
+/**
+ * Legacy function for backwards compatibility - opens modal in create mode
+ */
 export function showCropper(
   image: string,
   selectedText?: string,
@@ -47,19 +68,95 @@ export function showCropper(
   metadata?: VolumeMetadata,
   pages?: Page[],
   textBox?: [number, number, number, number]
+) {
+  openCreateModal(image, selectedText, sentence, tags, metadata, pages, textBox);
+}
+
+/**
+ * Opens the modal in configure mode (no cropper, raw templates)
+ * @param modelName - Optional model name to configure. If not provided, uses the selected model from settings.
+ */
+export function openConfigureModal(modelName?: string) {
+  cropperStore.set({
+    open: true,
+    mode: 'configure',
+    modelName
+  });
+}
+
+/**
+ * Opens the modal in create mode (cropper + resolved templates)
+ */
+export function openCreateModal(
+  image: string,
+  selectedText?: string,
+  sentence?: string,
+  tags?: string,
+  metadata?: VolumeMetadata,
+  pages?: Page[],
+  textBox?: [number, number, number, number],
+  pageNumber?: number,
+  pageFilename?: string
 ) {
   cropperStore.set({
     open: true,
+    mode: 'create',
     image,
     selectedText,
     sentence,
     tags,
     metadata,
     pages,
-    textBox
+    textBox,
+    pageNumber,
+    pageFilename
   });
 }
 
+/**
+ * Opens the modal in update mode (cropper + {existing} support)
+ */
+export function openUpdateModal(
+  image: string,
+  previousValues: Record<string, string>,
+  previousCardId: number,
+  modelName: string,
+  previousTags?: string[],
+  selectedText?: string,
+  sentence?: string,
+  tags?: string,
+  metadata?: VolumeMetadata,
+  pages?: Page[],
+  textBox?: [number, number, number, number],
+  pageNumber?: number,
+  pageFilename?: string
+) {
+  cropperStore.set({
+    open: true,
+    mode: 'update',
+    image,
+    selectedText,
+    sentence,
+    tags,
+    metadata,
+    pages,
+    textBox,
+    pageNumber,
+    pageFilename,
+    previousValues,
+    previousTags,
+    previousCardId,
+    modelName
+  });
+}
+
+/**
+ * Closes the modal
+ */
+export function closeAnkiModal() {
+  cropperStore.set({ open: false, mode: 'create' });
+}
+
 async function createImage(url: string) {
   return new Promise<HTMLImageElement>((resolve, reject) => {
     const image = new Image();
@@ -126,7 +223,7 @@ export async function getCroppedImg(
     settings.ankiConnectSettings.heightField
   );
   const blob = await canvas.convertToBlob({
-    type: 'image/webp',
+    type: 'image/jpeg',
     quality: settings.ankiConnectSettings.qualityField
   });