Merge branch 'qarmin:master' into master

Author: renner0e

.github/workflows/linux_cli.yml

@@ -12,7 +12,7 @@ jobs:
   linux-cli:
     strategy:
       matrix:
-        toolchain: [ stable, 1.75.0 ]
+        toolchain: [ stable, 1.79.0 ]
         type: [ release ]
     runs-on: ubuntu-20.04
     steps:

.github/workflows/linux_cli_eyra.yml

@@ -23,7 +23,7 @@ jobs:
 
       # New versions of nightly rust may call new unimplemented in eyra functions, so use const version
       - name: Setup rust version
-        run: rustup default nightly-2024-02-06
+        run: rustup default nightly-2024-09-25
 
       - name: Add eyra
         run: |

.github/workflows/linux_gui.yml

@@ -12,7 +12,7 @@ jobs:
   linux-krokiet-gui:
     strategy:
       matrix:
-        toolchain: [ stable, 1.75.0 ]
+        toolchain: [ stable, 1.79.0 ]
         type: [ release ]
     runs-on: ubuntu-20.04
     steps:
@@ -39,7 +39,7 @@ jobs:
   linux-krokiet-gui-heif:
     strategy:
       matrix:
-        toolchain: [ stable, 1.75.0 ]
+        toolchain: [ stable, 1.79.0 ]
         type: [ release ]
     runs-on: ubuntu-22.04
     steps:
@@ -69,7 +69,7 @@ jobs:
   linux-gui:
     strategy:
       matrix:
-        toolchain: [ stable, 1.75.0 ]
+        toolchain: [ stable, 1.79.0 ]
         type: [ release ]
     runs-on: ubuntu-22.04
     steps:
@@ -118,7 +118,7 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: Install Dependencies
-        run: sudo apt update || true; sudo apt install libgtk-4-dev libheif-dev librsvg2-dev wget fuse libfuse2 -y
+        run: sudo apt update || true; sudo apt install libgtk-4-dev libheif-dev librsvg2-dev wget fuse libfuse2 desktop-file-utils -y
 
       - name: Setup rust version
         run: rustup default ${{ matrix.toolchain }}
@@ -135,19 +135,30 @@ jobs:
           pwd
           wget -c "https://raw.githubusercontent.com/linuxdeploy/linuxdeploy-plugin-gtk/master/linuxdeploy-plugin-gtk.sh"
           wget -c "https://github.com/linuxdeploy/linuxdeploy/releases/download/continuous/linuxdeploy-x86_64.AppImage"
+          wget -c "https://github.com/AppImage/appimagetool/releases/download/continuous/appimagetool-x86_64.AppImage"
           chmod +x linuxdeploy-plugin-gtk.sh
           chmod +x linuxdeploy-x86_64.AppImage
+          chmod +x appimagetool-x86_64.AppImage
           mkdir -p AppDir/usr/bin
           pwd
           cp target/release/czkawka_gui AppDir/usr/bin
-          ./linuxdeploy-x86_64.AppImage --appdir AppDir --plugin gtk --output appimage --icon-file data/icons/com.github.qarmin.czkawka.svg --desktop-file data/com.github.qarmin.czkawka.desktop
+          ./linuxdeploy-x86_64.AppImage --appdir AppDir --plugin gtk --icon-file data/icons/com.github.qarmin.czkawka.svg --desktop-file data/com.github.qarmin.czkawka.desktop
+          ./appimagetool-x86_64.AppImage --comp zstd --mksquashfs-opt -Xcompression-level --mksquashfs-opt 20 \
+            -u "gh-releases-zsync|$GITHUB_REPOSITORY_OWNER|czkawka|latest|*.AppImage.zsync" \
+            ./AppDir
 
       - name: Store Linux Appimage GUI
         uses: actions/upload-artifact@v4
         with:
           name: czkawka_gui-appimage-${{ runner.os }}-${{ matrix.toolchain }}
           path: Czkawka*.AppImage
 
+      - name: Store Linux Appimage GUI Zsync
+        uses: actions/upload-artifact@v4
+        with:
+          name: czkawka_gui-appimage-${{ runner.os }}-${{ matrix.toolchain }}.zsync
+          path: Czkawka*.AppImage.zsync
+
       - name: Minimal AppImage
         run: |
           pwd

.github/workflows/mac.yml

@@ -59,27 +59,28 @@ jobs:
           path: target/release/krokiet
         if: ${{ matrix.type == 'release' }}
 
-      - name: Build Release Heif
-        run: cargo build --release --features heif
-        if: ${{ matrix.type == 'release'}}
-
-      - name: Store MacOS CLI Heif
-        uses: actions/upload-artifact@v4
-        with:
-          name: czkawka_cli-${{ runner.os }}-${{ matrix.toolchain }}-heif
-          path: target/release/czkawka_cli
-        if: ${{ matrix.type == 'release' }}
-
-      - name: Store MacOS GUI Heif
-        uses: actions/upload-artifact@v4
-        with:
-          name: czkawka_gui-${{ runner.os }}-${{ matrix.toolchain }}-heif
-          path: target/release/czkawka_gui
-        if: ${{ matrix.type == 'release' }}
-
-      - name: Store MacOS Krokiet Heif
-        uses: actions/upload-artifact@v4
-        with:
-          name: krokiet-${{ runner.os }}-${{ matrix.toolchain }}-heif
-          path: target/release/krokiet
-        if: ${{ matrix.type == 'release' }}
+# TODO - compilation is broken, not sure why
+#      - name: Build Release Heif
+#        run: cargo build --release --features heif
+#        if: ${{ matrix.type == 'release'}}
+#
+#      - name: Store MacOS CLI Heif
+#        uses: actions/upload-artifact@v4
+#        with:
+#          name: czkawka_cli-${{ runner.os }}-${{ matrix.toolchain }}-heif
+#          path: target/release/czkawka_cli
+#        if: ${{ matrix.type == 'release' }}
+#
+#      - name: Store MacOS GUI Heif
+#        uses: actions/upload-artifact@v4
+#        with:
+#          name: czkawka_gui-${{ runner.os }}-${{ matrix.toolchain }}-heif
+#          path: target/release/czkawka_gui
+#        if: ${{ matrix.type == 'release' }}
+#
+#      - name: Store MacOS Krokiet Heif
+#        uses: actions/upload-artifact@v4
+#        with:
+#          name: krokiet-${{ runner.os }}-${{ matrix.toolchain }}-heif
+#          path: target/release/krokiet
+#        if: ${{ matrix.type == 'release' }}