fix: opening PDF fix

Akylas · Dec 9, 2024 · 8cb077f · 8cb077f
1 parent 85e1216
commit 8cb077f
Show file tree

Hide file tree

Showing 8 changed files with 1,573 additions and 1,597 deletions.
diff --git a/app/components/list/MainList.svelte b/app/components/list/MainList.svelte
@@ -410,7 +410,7 @@
     }
 
     function unselectItem(item: Item) {
-        DEV_LOG && console.log('unselectItem', item);
+        // DEV_LOG && console.log('unselectItem', item);
         if (item.selected) {
             if (item.folder) {
                 folderItems?.some((d, index) => {

diff --git a/app/components/pdf/PDFPreview.svelte b/app/components/pdf/PDFPreview.svelte
@@ -23,6 +23,7 @@
     import { hideLoading, showLoading, showPopoverMenu, showSettings, showSliderPopover, showSnack } from '~/utils/ui';
     import { colors, fonts, screenHeightDips, screenRatio, screenWidthDips, windowInset } from '~/variables';
     import PageIndicator from '../common/PageIndicator.svelte';
+    import { SilentError } from '@shared/utils/error';
     // let bitmapPaint: Paint;
     // const textPaint = new Paint();
     const bgPaint = new Paint();
@@ -108,7 +109,11 @@
             showLoading(l('exporting'));
             const filePath = await exportPDFAsync({ pages, document });
             hideLoading();
-            openFile(filePath);
+            if (filePath) {
+                openFile(filePath);
+            } else {
+                throw new SilentError(lc('no_pages_in_pdf'));
+            }
         } catch (error) {
             showError(error);
         }

diff --git a/app/i18n/en.json b/app/i18n/en.json
@@ -246,6 +246,7 @@
     "no_document_found": "no document found",
     "no_document_yet": "add a document using the camera or import one from an image",
     "no_network": "no network",
+    "no_pages_in_pdf": "there was no pages to export in the PDF",
     "no_qrcode": "no QRCode found",
     "no_qrcode_found": "no QRCode found",
     "no_space_left": "your device seems to be running out of free storage",

diff --git a/app/services/pdf/PDFCanvas.ts b/app/services/pdf/PDFCanvas.ts
@@ -199,7 +199,7 @@ export default class PDFCanvas {
         const canvas = this.canvas;
         const w = canvas.getWidth() - 2;
         const h = canvas.getHeight() - 2;
-        DEV_LOG && console.log('drawPages', pages.length, this.options, canvas.getWidth(), canvas.getHeight(), w, h);
+        DEV_LOG && console.log('drawPages', pages.length, JSON.stringify(this.options), canvas.getWidth(), canvas.getHeight(), w, h);
 
         const nbItems = pages.length;
         // console.log('drawPDFPage', w, h, nbItems, srcs);
@@ -364,5 +364,6 @@ export default class PDFCanvas {
             }
             return hasPages;
         }
+        return true;
     }
 }
diff --git a/app/services/pdf/PDFExporter.ts b/app/services/pdf/PDFExporter.ts
@@ -132,7 +132,7 @@ export async function exportPDFAsync({ compress, document, filename, folder = kn
             });
         }
         // DEV_LOG && console.log('export message sent to worker', { pages, folder, filename, compress });
-        const result = await sendMessageToWorker('export', { pages: pages.map((p) => p.page), folder, filename, compress }, Date.now());
+        const result = await sendMessageToWorker('export', { pages: pages.map((p) => ({ page: p.page })), folder, filename, compress }, Date.now());
         // DEV_LOG && console.log('result', result);
         return result.messageData;
     }

diff --git a/app/utils/ui/index.common.ts b/app/utils/ui/index.common.ts
@@ -50,7 +50,7 @@ import { get } from 'svelte/store';
 import type OptionSelect__SvelteComponent_ from '~/components/common/OptionSelect.svelte';
 import type BottomSnack__SvelteComponent_ from '~/components/widgets/BottomSnack.svelte';
 import BottomSnack from '~/components/widgets/BottomSnack.svelte';
-import { cleanFilename, getFileNameForDocument, getFormatedDateForFilename, getLocaleDisplayName, l, lc } from '~/helpers/locale';
+import { getFileNameForDocument, getFormatedDateForFilename, getLocaleDisplayName, l, lc } from '~/helpers/locale';
 import { DocFolder, ImportImageData, OCRDocument, OCRPage, PageData } from '~/models/OCRDocument';
 import { OCRLanguages, ocrService } from '~/services/ocr';
 import { getTransformedImage } from '~/services/pdf/PDFExportCanvas.common';
@@ -95,7 +95,7 @@ import {
 } from '~/utils/constants';
 import { recycleImages } from '~/utils/images';
 import { showToast } from '~/utils/ui';
-import { colors, fontScale, screenHeightDips, screenWidthDips } from '~/variables';
+import { colors, fontScale, screenWidthDips } from '~/variables';
 import { MatricesTypes, Matrix } from '../color_matrix';
 import { saveImage } from '../utils';
 
@@ -651,7 +651,11 @@ export async function showPDFPopoverMenu(pages: { page: OCRPage; document: OCRDo
                         const filePath = await exportPDFAsync({ pages, document });
                         hideLoading();
                         DEV_LOG && console.log('opening pdf', filePath);
-                        openFile(filePath);
+                        if (filePath) {
+                            openFile(filePath);
+                        } else {
+                            throw new SilentError(lc('no_pages_in_pdf'));
+                        }
                         break;
                     }
                     case 'share': {

diff --git a/app/workers/PDFExportWorker.ts b/app/workers/PDFExportWorker.ts
@@ -28,7 +28,7 @@ class PDFExportWorker extends BaseWorker {
 
     async export(id, type, { pages, folder, filename, compress }) {
         try {
-            DEV_LOG && console.log(TAG, 'export', id, type, pages.length, folder, filename, compress);
+            DEV_LOG && console.log(TAG, 'export', id, type, pages.length, folder, filename, compress, JSON.stringify(pages));
             const exporter = new PDFExportCanvas();
             const filePath = await exporter.export({ pages, folder, filename, compress });
             // const filePath = 'test';