Merge branch 'master' into guirefactor

3 files changed, 17 insertions, 11 deletions

diff --git a/cmd/rescribe/gui.go b/cmd/rescribe/gui.go
index 91cdb4d..16e6bd8 100644
--- a/cmd/rescribe/gui.go
+++ b/cmd/rescribe/gui.go
@@ -376,7 +376,7 @@ func letsGo(ctx context.Context, log *log.Logger, cmd string, tessdir string, gb
 		// happens if extractPdfImgs recovers from a PDF panic,
 		// which will occur if we encounter an image we can't decode
 		if bookdir == "" {
-			msg := fmt.Sprintf("Error opening PDF\nThe format of this PDF is not supported, extract the images to .jpg manually into a folder first.\n")
+			msg := fmt.Sprintf("Error opening PDF\nThe format of this PDF is not supported, extract the images to .jpg manually into a\nfolder first, using a tool like the PDF image extractor at https://pdfcandy.com/extract-images.html.\n")
 			dialog.ShowError(errors.New(msg), win)
 			fmt.Fprintf(os.Stderr, msg)
 
@@ -405,6 +405,9 @@ func letsGo(ctx context.Context, log *log.Logger, cmd string, tessdir string, gb
 	}
 	if err != nil {
 		msg := fmt.Sprintf("Error during processing: %v\n", err)
+		if strings.HasSuffix(err.Error(), "No images found") && strings.HasSuffix(dir.Text, ".pdf") && !f.IsDir() {
+			msg = fmt.Sprintf("Error opening PDF\nNo images found in the PDF. Most likely the format of this PDF is not supported,\nextract the images to .jpg manually into a folder first, using a tool like\nthe PDF image extractor at https://pdfcandy.com/extract-images.html.\n")
+		}
 		dialog.ShowError(errors.New(msg), win)
 		fmt.Fprintf(os.Stderr, msg)
 
diff --git a/cmd/rescribe/xyz.rescribe.rescribe.appdata.xml b/cmd/rescribe/xyz.rescribe.rescribe.appdata.xml
index a6f17b1..795b228 100644
--- a/cmd/rescribe/xyz.rescribe.rescribe.appdata.xml
+++ b/cmd/rescribe/xyz.rescribe.rescribe.appdata.xml
@@ -9,7 +9,8 @@
   <description><p>An easy-to-use desktop tool for OCR of images, PDFs and Google Books. It uses the Tesseract OCR engine, combined with modern and efficient preprocessing and analysis pipelines, to produce high quality output in plain text, hOCR and searchable PDF format. The tool has been built with a focus on OCR of historical printed works, but it includes modern language options and also works well on modern printed works.</p></description>
 
   <screenshots>
-    <screenshot type="default"><image>https://rescribe.xyz/rescribe/screenshot-02.png</image></screenshot>
+    <screenshot type="default"><image>https://rescribe.xyz/rescribe/screenshot-03.png</image></screenshot>
+    <screenshot><image>https://rescribe.xyz/rescribe/screenshot-04.png</image></screenshot>
   </screenshots>
 
   <url type="homepage">https://rescribe.xyz/rescribe</url>
@@ -22,9 +23,9 @@
   <content_rating type="oars-1.1" />
 
   <releases>
-    <release version="1.1.0pr" date="2022-11-21" type="development">
+    <release version="1.1.0" date="2023-02-13" type="stable">
       <description>
-        <p>Improved PDF reading by adding support for embedded CCITT images. Improve PDF parsing to prevent a possible crash with bad PDF files.</p>
+        <p>Improved PDF reading by adding support for embedded CCITT images. Improved PDF parsing to prevent a possible crash with bad PDF files. Improved error messages for unreadable PDFs. Improved GUI theme thanks to an update to Fyne.</p>
       </description>
     </release>
     <release version="1.0.0" date="2022-03-22" type="stable">
diff --git a/cmd/rescribe/xyz.rescribe.rescribe.yml b/cmd/rescribe/xyz.rescribe.rescribe.yml
index 17db7c8..ae87d59 100644
--- a/cmd/rescribe/xyz.rescribe.rescribe.yml
+++ b/cmd/rescribe/xyz.rescribe.rescribe.yml
@@ -6,9 +6,9 @@ sdk-extensions: org.freedesktop.Sdk.Extension.golang
 build-options:
   append-path: /usr/lib/sdk/golang/bin
 finish-args:
-  - --socket=x11
+  - --socket=fallback-x11
   - --share=ipc # needed for X11
-  #- --socket=wayland # wayland is not stable on fyne yet, when it is add this and the wayland tag to 'go build'
+  - --socket=wayland
   - --device=dri # OpenGL
   - --share=network # Used for google book downloading
   - --filesystem=home
@@ -18,22 +18,24 @@ modules:
     buildsystem: simple
     build-commands:
       - cd cmd/rescribe && go build .
+      - cd cmd/rescribe && go build -tags wayland -o rescribe-wayland .
       - install -Dm00755 cmd/rescribe/rescribe $FLATPAK_DEST/bin/rescribe-bin
+      - install -Dm00755 cmd/rescribe/rescribe-wayland $FLATPAK_DEST/bin/rescribe-bin-wayland
       - install -Dm00644 cmd/rescribe/icon.256.png $FLATPAK_DEST/share/icons/hicolor/256x256/apps/xyz.rescribe.rescribe.png
       - install -Dm00644 cmd/rescribe/xyz.rescribe.rescribe.desktop $FLATPAK_DEST/share/applications/xyz.rescribe.rescribe.desktop
       - install -Dm00644 cmd/rescribe/xyz.rescribe.rescribe.appdata.xml $FLATPAK_DEST/share/appdata/xyz.rescribe.rescribe.appdata.xml
-      - printf '#!/bin/sh\nTMPDIR=$XDG_RUNTIME_DIR rescribe-bin -gbookcmd "/app/bin/getgbook" -tesscmd "/app/bin/tesseract" -t "/app/share/tessdata/rescribev9_fast.traineddata"\n' > $FLATPAK_DEST/bin/rescribe
+      - printf '#!/bin/sh\nexport TMPDIR=$XDG_RUNTIME_DIR\nbin=rescribe-bin\ntest -n "$WAYLAND_DISPLAY" && bin=rescribe-bin-wayland\n"$bin" -gbookcmd "/app/bin/getgbook" -tesscmd "/app/bin/tesseract" -t "/app/share/tessdata/rescribev9_fast.traineddata"\n' > $FLATPAK_DEST/bin/rescribe
       - chmod 755 $FLATPAK_DEST/bin/rescribe
       - mkdir -p $FLATPAK_DEST/share/tessdata
       - cp -r tessdata/* $FLATPAK_DEST/share/tessdata/
     sources:
       - type: git
         url: https://github.com/rescribe/bookpipeline
-        tag: v1.0.2
-        commit: 3fb28b552eb1e945ff8ba48dd96271e641c295bc
+        tag: v1.1.0
+        commit: 3dd003691436ed954d3b7de54affbb10b509d5a6
       - type: archive
-        url: https://rescribe.xyz/rescribe/modules-20221030-3a6024.tar.xz
-        sha256: 98fdbe455f7cb916cda570d0a30fca0de331809d4549e655e25b95e9be119856
+        url: https://rescribe.xyz/rescribe/modules-20230213-3dd003.tar.xz
+        sha256: 36553c4b97ceefc2c4711d18f26c98d89a9a610cb99bd2a38b7a0bbf3236eb4a
         strip-components: 0
       - type: archive
         url: https://rescribe.xyz/rescribe/embeds/tessdata.20220322.zip