+
+See more [screnshots](https://github.com/gen2brain/cbconvert/blob/master/cmd/cbconvert-gui/screenshots/).
+
### Features
* reads CBR (RAR), CBZ (ZIP), CB7 (7Z), CBT (TAR), PDF, XPS, EPUB, MOBI and plain directory
-* saves processed comics in ZIP archive format or TAR
-* images can be converted to JPEG, PNG, TIFF, WEBP, AVIF, JXL, or 4-Bit BMP (16 colors) file format
+* saves processed files in ZIP archive format or TAR
+* images can be converted to JPEG, PNG, TIFF, WEBP, AVIF, JXL, or 4-Bit BMP (16 colors) image format
* rotate, adjust brightness/contrast, adjust levels (Photoshop-like) or grayscale images
* resize filters (NearestNeighbor, Box, Linear, MitchellNetravali, CatmullRom, Gaussian, Lanczos)
* export covers from comics
@@ -18,26 +22,25 @@ It can convert comics to different formats to fit your various devices.
### Download
-* [Windows x86_64](https://github.com/gen2brain/cbconvert/releases/latest/download/cbconvert-0.9.1-windows-x86_64.zip)
-* [Linux x86_64](https://github.com/gen2brain/cbconvert/releases/latest/download/cbconvert-0.9.1-linux-x86_64.tar.gz)
-* [Linux aarch64](https://github.com/gen2brain/cbconvert/releases/latest/download/cbconvert-0.9.1-linux-aarch64.tar.gz)
-* [macOS x86_64](https://github.com/gen2brain/cbconvert/releases/latest/download/cbconvert-0.9.1-darwin-x86_64.zip)
-* [macOS aarch64](https://github.com/gen2brain/cbconvert/releases/latest/download/cbconvert-0.9.1-darwin-aarch64.zip)
+* [Windows x86_64](https://github.com/gen2brain/cbconvert/releases/latest/download/cbconvert-1.0.0-windows-x86_64.zip)
+* [Linux x86_64](https://github.com/gen2brain/cbconvert/releases/latest/download/cbconvert-1.0.0-linux-x86_64.tar.gz)
+* [macOS x86_64](https://github.com/gen2brain/cbconvert/releases/latest/download/cbconvert-1.0.0-darwin-x86_64.zip)
+* [macOS aarch64](https://github.com/gen2brain/cbconvert/releases/latest/download/cbconvert-1.0.0-darwin-aarch64.zip)
### Using cbconvert in file managers to generate FreeDesktop thumbnails
-Copy cbconvert cli binary to your PATH and create file ~/.local/share/thumbnailers/cbconvert.thumbnailer:
+Copy `cbconvert` cli binary to your PATH and create file `~/.local/share/thumbnailers/cbconvert.thumbnailer`:
```
[Thumbnailer Entry]
TryExec=cbconvert
Exec=cbconvert thumbnail --quiet --width %s --outfile %o %i
-MimeType=application/pdf;application/x-cb7;application/x-cbt;application/epub+zip;application/vnd.comicbook-rar;application/vnd.comicbook+zip;application/x-mobipocket-ebook;
+MimeType=application/pdf;application/x-cb7;application/x-cbt;application/epub+zip;application/vnd.comicbook-rar;application/vnd.comicbook+zip;application/x-mobipocket-ebook;application/vnd.ms-xpsdocument;
```
This is what it looks like in the PCManFM file manager:
-
+
### Using command line app
@@ -199,3 +202,7 @@ This table maps quality settings for JPEG to the respective AVIF and WEBP qualit
Install ImageMagick7 (with libheif/libjxl support) and MuPDF libraries and headers and then install to GOBIN:
`go install -tags extlib github.com/gen2brain/cbconvert/cmd/cbconvert@latest`
+
+For GUI app, check [IUP requirements](https://github.com/gen2brain/iup-go), and then install:
+
+`go install -tags extlib github.com/gen2brain/cbconvert/cmd/cbconvert-gui@latest`
diff --git a/cmd/cbconvert-gui/assets/icon.png b/cmd/cbconvert-gui/assets/icon.png
new file mode 100644
index 0000000..6e2eb74
Binary files /dev/null and b/cmd/cbconvert-gui/assets/icon.png differ
diff --git a/cmd/cbconvert-gui/assets/loading.gif b/cmd/cbconvert-gui/assets/loading.gif
new file mode 100644
index 0000000..b201e6f
Binary files /dev/null and b/cmd/cbconvert-gui/assets/loading.gif differ
diff --git a/cmd/cbconvert-gui/dist/linux/cbconvert.desktop b/cmd/cbconvert-gui/dist/linux/cbconvert.desktop
new file mode 100644
index 0000000..4696c5d
--- /dev/null
+++ b/cmd/cbconvert-gui/dist/linux/cbconvert.desktop
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Name=CBconvert
+GenericName=A Comic Book converter
+Comment=A comic converter with support for .cb*, .pdf, .xps, .epub, .mobi and directories.
+Exec=cbconvert-gui
+Icon=cbconvert
+Terminal=false
+Type=Application
+StartupNotify=true
+Categories=Graphics;Utility;
diff --git a/cmd/cbconvert-gui/dist/linux/cbconvert.png b/cmd/cbconvert-gui/dist/linux/cbconvert.png
new file mode 100644
index 0000000..915e02f
Binary files /dev/null and b/cmd/cbconvert-gui/dist/linux/cbconvert.png differ
diff --git a/cmd/cbconvert-gui/dist/linux/cbconvert.thumbnailer b/cmd/cbconvert-gui/dist/linux/cbconvert.thumbnailer
new file mode 100644
index 0000000..6ab3b12
--- /dev/null
+++ b/cmd/cbconvert-gui/dist/linux/cbconvert.thumbnailer
@@ -0,0 +1,4 @@
+[Thumbnailer Entry]
+TryExec=cbconvert
+Exec=cbconvert thumbnail --quiet --width %s --outfile %o %i
+MimeType=application/pdf;application/x-cb7;application/x-cbt;application/epub+zip;application/vnd.comicbook-rar;application/vnd.comicbook+zip;application/x-mobipocket-ebook;application/vnd.ms-xpsdocument;
diff --git a/cmd/cbconvert-gui/dist/linux/flatpak/01-mupdf-shared.patch b/cmd/cbconvert-gui/dist/linux/flatpak/01-mupdf-shared.patch
new file mode 100644
index 0000000..f043330
--- /dev/null
+++ b/cmd/cbconvert-gui/dist/linux/flatpak/01-mupdf-shared.patch
@@ -0,0 +1,60 @@
+diff -ur mupdf-1.23.3-source.orig/Makefile mupdf-1.23.3-source/Makefile
+--- mupdf-1.23.3-source.orig/Makefile 2023-09-05 13:51:19.000000000 +0200
++++ mupdf-1.23.3-source/Makefile 2023-09-08 09:28:01.165486441 +0200
+@@ -3,7 +3,7 @@
+ -include user.make
+
+ ifndef build
+- build := release
++ build := debug
+ endif
+
+ default: all
+@@ -290,17 +290,19 @@
+ $(THREAD_LIB) : $(THREAD_OBJ)
+ $(PKCS7_LIB) : $(PKCS7_OBJ)
+ else
+-MUPDF_LIB = $(OUT)/libmupdf.a
++MUPDF_LIB = libmupdf.so
+ LIBS_TO_INSTALL_IN_LIB = $(MUPDF_LIB) $(THIRD_LIB)
+-THIRD_LIB = $(OUT)/libmupdf-third.a
++THIRD_LIB =
++MUPDF_STATIC = $(OUT)/libmupdf.a
+ ifneq ($(USE_SYSTEM_GLUT),yes)
+ THIRD_GLUT_LIB = $(OUT)/libmupdf-glut.a
+ endif
+ THREAD_LIB = $(OUT)/libmupdf-threads.a
+ PKCS7_LIB = $(OUT)/libmupdf-pkcs7.a
+
+-$(MUPDF_LIB) : $(MUPDF_OBJ)
+-$(THIRD_LIB) : $(THIRD_OBJ)
++$(MUPDF_LIB) : $(MUPDF_OBJ) $(THIRD_OBJ)
++ $(QUIET_LINK) $(CC) $(LDFLAGS) --shared -Wl,-soname -Wl,$(MUPDF_LIB) -o $@ $^ $(THIRD_LIBS) $(LIBS)
++$(MUPDF_STATIC): $(MUPDF_OBJ) $(THIRD_OBJ)
+ $(THIRD_GLUT_LIB) : $(THIRD_GLUT_OBJ)
+ $(THREAD_LIB) : $(THREAD_OBJ)
+ $(PKCS7_LIB) : $(PKCS7_OBJ)
+diff -ur mupdf-1.23.3-source.orig/Makethird mupdf-1.23.3-source/Makethird
+--- mupdf-1.23.3-source.orig/Makethird 2023-09-05 13:51:19.000000000 +0200
++++ mupdf-1.23.3-source/Makethird 2023-09-08 01:16:56.785811250 +0200
+@@ -2,16 +2,16 @@
+
+ ifeq ($(USE_SYSTEM_LIBS),yes)
+ USE_SYSTEM_FREETYPE := yes
+- USE_SYSTEM_GUMBO := yes
++ USE_SYSTEM_GUMBO := no
+ USE_SYSTEM_HARFBUZZ := yes
+- USE_SYSTEM_JBIG2DEC := yes
++ USE_SYSTEM_JBIG2DEC := no
+ USE_SYSTEM_JPEGXR := no # not available
+ USE_SYSTEM_LCMS2 := no # lcms2mt is strongly preferred
+ USE_SYSTEM_LIBJPEG := yes
+ USE_SYSTEM_MUJS := no # not available
+- USE_SYSTEM_OPENJPEG := yes
++ USE_SYSTEM_OPENJPEG := no
+ USE_SYSTEM_ZLIB := yes
+- USE_SYSTEM_GLUT := yes
++ USE_SYSTEM_GLUT := no
+ USE_SYSTEM_CURL := yes
+ USE_SYSTEM_LEPTONICA := yes
+ USE_SYSTEM_TESSERACT := yes
diff --git a/cmd/cbconvert-gui/dist/linux/flatpak/io.github.gen2brain.cbconvert.desktop b/cmd/cbconvert-gui/dist/linux/flatpak/io.github.gen2brain.cbconvert.desktop
new file mode 100644
index 0000000..75f9c4e
--- /dev/null
+++ b/cmd/cbconvert-gui/dist/linux/flatpak/io.github.gen2brain.cbconvert.desktop
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Name=CBconvert
+GenericName=A Comic Book converter
+Comment=A comic converter with support for .cb*, .pdf, .xps, .epub, .mobi and directories
+Exec=cbconvert-gui
+Icon=io.github.gen2brain.cbconvert
+Terminal=false
+Type=Application
+StartupNotify=true
+Categories=Graphics;
diff --git a/cmd/cbconvert-gui/dist/linux/flatpak/io.github.gen2brain.cbconvert.metainfo.xml b/cmd/cbconvert-gui/dist/linux/flatpak/io.github.gen2brain.cbconvert.metainfo.xml
new file mode 100644
index 0000000..1f4598a
--- /dev/null
+++ b/cmd/cbconvert-gui/dist/linux/flatpak/io.github.gen2brain.cbconvert.metainfo.xml
@@ -0,0 +1,44 @@
+
++ A comic book converter with support for .cb*, .pdf, .xps, .epub, .mobi and directories. + Images can be converted to JPEG, PNG, TIFF, WEBP, AVIF, JXL or 4-Bit BMP (16 colors) file format. +
+
+
+Linux
+
+
+macOS
+
+
+Linux Motif
+
diff --git a/cmd/cbconvert-gui/screenshots/linux-01.jpg b/cmd/cbconvert-gui/screenshots/linux-01.jpg
new file mode 100644
index 0000000..3034e67
Binary files /dev/null and b/cmd/cbconvert-gui/screenshots/linux-01.jpg differ
diff --git a/cmd/cbconvert-gui/screenshots/linux-02.jpg b/cmd/cbconvert-gui/screenshots/linux-02.jpg
new file mode 100644
index 0000000..123cd04
Binary files /dev/null and b/cmd/cbconvert-gui/screenshots/linux-02.jpg differ
diff --git a/cmd/cbconvert-gui/screenshots/macos-01.jpg b/cmd/cbconvert-gui/screenshots/macos-01.jpg
new file mode 100644
index 0000000..c83e62d
Binary files /dev/null and b/cmd/cbconvert-gui/screenshots/macos-01.jpg differ
diff --git a/cmd/cbconvert-gui/screenshots/motif-01.jpg b/cmd/cbconvert-gui/screenshots/motif-01.jpg
new file mode 100644
index 0000000..d8f0bbe
Binary files /dev/null and b/cmd/cbconvert-gui/screenshots/motif-01.jpg differ
diff --git a/cmd/cbconvert-gui/screenshots/windows-01.jpg b/cmd/cbconvert-gui/screenshots/windows-01.jpg
new file mode 100644
index 0000000..4e88f46
Binary files /dev/null and b/cmd/cbconvert-gui/screenshots/windows-01.jpg differ
diff --git a/cmd/cbconvert/make.bash b/cmd/cbconvert/make.bash
index ed0abf6..976a76d 100755
--- a/cmd/cbconvert/make.bash
+++ b/cmd/cbconvert/make.bash
@@ -5,9 +5,11 @@ MINGW_x86_64="/usr/x86_64-w64-mingw32"
MACOS_x86_64="/usr/x86_64-apple-darwin"
MACOS_aarch64="/usr/aarch64-apple-darwin"
-VERSION="`git --git-dir ../../.git describe --tags --abbrev=0 2>/dev/null || echo '0.0.0'`"
+VERSION="$(git --git-dir ../../.git describe --tags --abbrev=0 2>/dev/null || echo '0.0.0')"
-BUILDDIR="cbconvert-${VERSION}"; mkdir -p ${BUILDDIR}
+BUILDDIR="cbconvert-${VERSION}"
+
+mkdir -p "${BUILDDIR}"
CC=x86_64-pc-linux-gnu-gcc \
PKG_CONFIG="x86_64-pc-linux-gnu-pkg-config" \
PKG_CONFIG_PATH="$GLIBC_x86_64/usr/lib64/pkgconfig" \
@@ -15,46 +17,46 @@ PKG_CONFIG_LIBDIR="$GLIBC_x86_64/usr/lib64/pkgconfig" \
CGO_CFLAGS="-I$GLIBC_x86_64/usr/include" \
CGO_LDFLAGS="-L$GLIBC_x86_64/usr/lib64" \
CGO_ENABLED=1 GOOS=linux GOARCH=amd64 \
-go build -trimpath -tags 'extlib pkgconfig' -v -o ${BUILDDIR}/cbconvert -ldflags "-linkmode external -s -w -X main.appVersion=${VERSION} '-extldflags=-static'" && \
-cp ../../README.md ../../AUTHORS ../../COPYING ${BUILDDIR} && tar -czf "${BUILDDIR}-linux-x86_64.tar.gz" ${BUILDDIR}
-rm -rf ${BUILDDIR}
+go build -trimpath -tags 'extlib pkgconfig' -v -o "${BUILDDIR}"/cbconvert -ldflags "-linkmode external -s -w -X main.appVersion=${VERSION} '-extldflags=-static'" && \
+cp ../../README.md ../../AUTHORS ../../COPYING "${BUILDDIR}" && tar -czf "${BUILDDIR}-linux-x86_64.tar.gz" "${BUILDDIR}"
+rm -rf "${BUILDDIR}"
-BUILDDIR="cbconvert-${VERSION}"; mkdir -p ${BUILDDIR}
+mkdir -p "${BUILDDIR}"
CC=x86_64-w64-mingw32-gcc \
PKG_CONFIG="/usr/bin/x86_64-w64-mingw32-pkg-config" \
PKG_CONFIG_PATH="$MINGW_x86_64/usr/lib/pkgconfig" \
PKG_CONFIG_LIBDIR="$MINGW_x86_64/usr/lib/pkgconfig" \
CGO_CFLAGS="-I$MINGW_x86_64/usr/include" \
-CGO_LDFLAGS="-L$MINGW_x86_64/usr/lib" \
+CGO_LDFLAGS="-L$MINGW_x86_64/usr/lib -ljxl -ljxl_dec -ljxl_profiler -ljxl_threads" \
CGO_ENABLED=1 GOOS=windows GOARCH=amd64 \
-go build -trimpath -tags 'extlib pkgconfig' -v -o ${BUILDDIR}/cbconvert.exe -ldflags "-s -w -X main.appVersion=${VERSION} '-extldflags=-static -Wl,--allow-multiple-definition'" && \
-cp ../../README.md ../../AUTHORS ../../COPYING ${BUILDDIR} && zip -rq "${BUILDDIR}-windows-x86_64.zip" ${BUILDDIR}
-rm -rf ${BUILDDIR}
+go build -trimpath -tags 'extlib pkgconfig' -v -o "${BUILDDIR}"/cbconvert.exe -ldflags "-s -w -X main.appVersion=${VERSION} '-extldflags=-static -Wl,--allow-multiple-definition'" && \
+cp ../../README.md ../../AUTHORS ../../COPYING "${BUILDDIR}" && zip -rq "${BUILDDIR}-windows-x86_64.zip" "${BUILDDIR}"
+rm -rf "${BUILDDIR}"
export OSXCROSS_PKG_CONFIG_USE_NATIVE_VARIABLES=1
-BUILDDIR="cbconvert-${VERSION}"; mkdir -p ${BUILDDIR}
+mkdir -p "${BUILDDIR}"
PATH=${PATH}:${MACOS_x86_64}/bin \
CC=x86_64-apple-darwin21.1-clang \
PKG_CONFIG="x86_64-apple-darwin21.1-pkg-config" \
PKG_CONFIG_PATH="$MACOS_x86_64/SDK/MacOSX12.1.sdk/usr/lib/pkgconfig" \
PKG_CONFIG_LIBDIR="$MACOS_x86_64/SDK/MacOSX12.1.sdk/usr/lib/pkgconfig" \
CGO_CFLAGS="-I$MACOS_x86_64/usr/include -I$MACOS_x86_64/macports/pkgs/opt/local/include" \
-CGO_LDFLAGS="-L$MACOS_x86_64/SDK/MacOSX12.1.sdk/usr/lib -L$MACOS_x86_64/macports/pkgs/opt/local/lib -mmacosx-version-min=10.13" \
+CGO_LDFLAGS="-L$MACOS_x86_64/SDK/MacOSX12.1.sdk/usr/lib -L$MACOS_x86_64/macports/pkgs/opt/local/lib -mmacosx-version-min=10.15" \
CGO_ENABLED=1 GOOS=darwin GOARCH=amd64 \
-go build -trimpath -tags 'extlib pkgconfig' -v -o ${BUILDDIR}/cbconvert -ldflags "-linkmode external -s -w -X main.appVersion=${VERSION}" && \
-cp ../../README.md ../../AUTHORS ../../COPYING ${BUILDDIR} && zip -rq "${BUILDDIR}-darwin-x86_64.zip" ${BUILDDIR}
-rm -rf ${BUILDDIR}
+go build -trimpath -tags 'extlib pkgconfig' -v -o "${BUILDDIR}"/cbconvert -ldflags "-linkmode external -s -w -X main.appVersion=${VERSION}" && \
+cp ../../README.md ../../AUTHORS ../../COPYING "${BUILDDIR}" && zip -rq "${BUILDDIR}-darwin-x86_64.zip" "${BUILDDIR}"
+rm -rf "${BUILDDIR}"
export OSXCROSS_PKG_CONFIG_USE_NATIVE_VARIABLES=1
-BUILDDIR="cbconvert-${VERSION}"; mkdir -p ${BUILDDIR}
+mkdir -p "${BUILDDIR}"
PATH=${PATH}:${MACOS_aarch64}/bin \
CC=aarch64-apple-darwin21.1-clang \
PKG_CONFIG="aarch64-apple-darwin21.1-pkg-config" \
PKG_CONFIG_PATH="$MACOS_aarch64/SDK/MacOSX12.1.sdk/usr/lib/pkgconfig" \
PKG_CONFIG_LIBDIR="$MACOS_aarch64/SDK/MacOSX12.1.sdk/usr/lib/pkgconfig" \
CGO_CFLAGS="-I$MACOS_aarch64/usr/include -I$MACOS_aarch64/macports/pkgs/opt/local/include" \
-CGO_LDFLAGS="-L$MACOS_aarch64/SDK/MacOSX12.1.sdk/usr/lib -L$MACOS_aarch64/macports/pkgs/opt/local/lib -mmacosx-version-min=10.13" \
+CGO_LDFLAGS="-L$MACOS_aarch64/SDK/MacOSX12.1.sdk/usr/lib -L$MACOS_aarch64/macports/pkgs/opt/local/lib -mmacosx-version-min=10.15" \
CGO_ENABLED=1 GOOS=darwin GOARCH=arm64 \
-go build -trimpath -tags 'extlib pkgconfig' -v -o ${BUILDDIR}/cbconvert -ldflags "-linkmode external -s -w -X main.appVersion=${VERSION}" && \
-cp ../../README.md ../../AUTHORS ../../COPYING ${BUILDDIR} && zip -rq "${BUILDDIR}-darwin-aarch64.zip" ${BUILDDIR}
-rm -rf ${BUILDDIR}
+go build -trimpath -tags 'extlib pkgconfig' -v -o "${BUILDDIR}"/cbconvert -ldflags "-linkmode external -s -w -X main.appVersion=${VERSION}" && \
+cp ../../README.md ../../AUTHORS ../../COPYING "${BUILDDIR}" && zip -rq "${BUILDDIR}-darwin-aarch64.zip" "${BUILDDIR}"
+rm -rf "${BUILDDIR}"
diff --git a/cmd/cbconvert/screenshots/thumbnails.jpg b/cmd/cbconvert/screenshots/thumbnails.jpg
new file mode 100644
index 0000000..719b137
Binary files /dev/null and b/cmd/cbconvert/screenshots/thumbnails.jpg differ