Zip update (#667)

2 years ago · 574cc78b12
parent 39b2f4bc36
commit 574cc78b12
4 changed files with 312 additions and 199 deletions
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@ -328,184 +328,184 @@ jobs:
          name: czkawka_gui-release-console-${{ matrix.toolchain }}
          path: gtk_app.zip

-  windows-gui-debug-normal-app:
-    strategy:
-      matrix:
-        toolchain: [ stable ]
-        type: [ release ]
-    runs-on: ubuntu-20.04
-    steps:
-      - uses: actions/checkout@v2
-
-      - uses: actions-rs/toolchain@v1
-        with:
-          toolchain: ${{ matrix.toolchain }}
-          override: true
-
-      - name: Install Gtk, Mingw, unzip, zip and wget
-        run: sudo apt-get update; sudo apt install mingw-w64 libgtk-3-dev unzip wget zip -y
-
-      - name: Build GUI Debug Cross Compile
-        run: |
-          rustup target add x86_64-pc-windows-gnu
-
-          echo "[target.x86_64-pc-windows-gnu]" > ~/.cargo/config
-          echo "linker = \"x86_64-w64-mingw32-gcc\"" >> ~/.cargo/config
-          echo "ar = \"x86_64-w64-mingw32-gcc-ar\"" >> ~/.cargo/config
-
-          GTK_LIBRARY="$(pwd)/gtk_library"
-          GTK_APP="$(pwd)/gtk_app"
-          GTK_THEME="$(pwd)/gtk_theme"
-
-          wget https://github.com/qarmin/gtk_library_store/releases/download/3.24.0/mingw64.zip
-          unzip mingw64.zip -d $GTK_LIBRARY
-          GTK_LIBRARY="$GTK_LIBRARY/mingw64"
-
-          wget https://github.com/nrhodes91/AdMin/archive/master.zip
-          unzip master.zip -d $GTK_THEME
-
-          PKG_CONFIG_ALLOW_CROSS=1 PKG_CONFIG_PATH="$GTK_LIBRARY/lib/pkgconfig" RUSTFLAGS="-L $GTK_LIBRARY/lib" cargo build --target=x86_64-pc-windows-gnu --bin czkawka_gui
-
-          strip target/x86_64-pc-windows-gnu/debug/czkawka_gui.exe
-
-          mkdir $GTK_APP
-          cp target/x86_64-pc-windows-gnu/debug/czkawka_gui.exe $GTK_APP
-          cp $GTK_LIBRARY/bin/*.dll $GTK_APP
-          mkdir -p $GTK_APP/share/glib-2.0/schemas
-          mkdir $GTK_APP/share/icons
-          cp $GTK_LIBRARY/share/glib-2.0/schemas/* $GTK_APP/share/glib-2.0/schemas
-          cp -r $GTK_LIBRARY/share/icons/* $GTK_APP/share/icons
-          mkdir $GTK_APP/lib
-          cp -r $GTK_LIBRARY/lib/gdk-pixbuf-2.0 $GTK_APP/lib
-
-          mkdir -p $GTK_APP/share/themes
-          mkdir -p $GTK_APP/share/gtk-3.0
-          echo "[Settings]" > $GTK_APP/share/gtk-3.0/settings.ini
-          echo "gtk-theme-name = admin-gtk3-dark-osx" >> $GTK_APP/share/gtk-3.0/settings.ini
-          echo "gtk-font-name = Segoe UI 10" >> $GTK_APP/share/gtk-3.0/settings.ini
-          echo "gtk-xft-rgba = rgb" >> $GTK_APP/share/gtk-3.0/settings.ini
-          cp $GTK_THEME/AdMin-master/admin-gtk3-dark-osx $GTK_APP/share/themes -r -L
-
-          # This part is only unique for Czkawka
-          # This code allows to check which icons are used in Czkawka
-          # cd czkawka/ui
-          # rg icon-name
-          rm -rf $GTK_APP/share/icons/Adwaita/16x16
-          rm -rf $GTK_APP/share/icons/Adwaita/22x22
-          rm -rf $GTK_APP/share/icons/Adwaita/24x24
-          rm -rf $GTK_APP/share/icons/Adwaita/256x256
-          rm -rf $GTK_APP/share/icons/Adwaita/32x32
-          rm -rf $GTK_APP/share/icons/Adwaita/48x48
-          rm -rf $GTK_APP/share/icons/Adwaita/512x512
-          rm -rf $GTK_APP/share/icons/Adwaita/64x64
-          rm -rf $GTK_APP/share/icons/Adwaita/8x8
-          rm -rf $GTK_APP/share/icons/Adwaita/96x96
-          rm -rf $GTK_APP/share/icons/Adwaita/cursors
-          rm -rf $GTK_APP/share/icons/Adwaita/scalable
-          rm -rf $GTK_APP/share/icons/Adwaita/scalable-up-to-32
-          rm -rf $GTK_APP/share/icons/hicolor
-          wget https://github.com/qarmin/gtk_library_store/releases/download/3.24.0/czkawka_icons.zip
-          unzip czkawka_icons.zip -d $GTK_APP/share/icons/Adwaita
-
-          zip -r gtk_app.zip $GTK_APP
-        env:
-          CARGO_INCREMENTAL: 0
-          RUSTFLAGS: "-C debuginfo=0 -D warnings"
-
-      - name: Store Windows GUI CrossComplile
-        uses: actions/upload-artifact@v2
-        with:
-          name: czkawka_gui-debug-normal-app-${{ matrix.toolchain }}
-          path: gtk_app.zip
-
-
-  windows-gui-debug-console:
-    strategy:
-      matrix:
-        toolchain: [ stable ]
-        type: [ release ]
-    runs-on: ubuntu-20.04
-    steps:
-      - uses: actions/checkout@v2
-
-      - uses: actions-rs/toolchain@v1
-        with:
-          toolchain: ${{ matrix.toolchain }}
-          override: true
-
-      - name: Install Gtk, Mingw, unzip, zip and wget
-        run: sudo apt-get update; sudo apt install mingw-w64 libgtk-3-dev unzip wget zip -y
-
-      - name: Build GUI Debug Cross Compile
-        run: |
-          sed -i 's/windows_subsystem = "windows"/windows_subsystem = "console"/' czkawka_gui/src/main.rs 
-          rustup target add x86_64-pc-windows-gnu
-
-          echo "[target.x86_64-pc-windows-gnu]" > ~/.cargo/config
-          echo "linker = \"x86_64-w64-mingw32-gcc\"" >> ~/.cargo/config
-          echo "ar = \"x86_64-w64-mingw32-gcc-ar\"" >> ~/.cargo/config
-
-          GTK_LIBRARY="$(pwd)/gtk_library"
-          GTK_APP="$(pwd)/gtk_app"
-          GTK_THEME="$(pwd)/gtk_theme"
-
-          wget https://github.com/qarmin/gtk_library_store/releases/download/3.24.0/mingw64.zip
-          unzip mingw64.zip -d $GTK_LIBRARY
-          GTK_LIBRARY="$GTK_LIBRARY/mingw64"
-
-          wget https://github.com/nrhodes91/AdMin/archive/master.zip
-          unzip master.zip -d $GTK_THEME
-
-          PKG_CONFIG_ALLOW_CROSS=1 PKG_CONFIG_PATH="$GTK_LIBRARY/lib/pkgconfig" RUSTFLAGS="-L $GTK_LIBRARY/lib" cargo build --target=x86_64-pc-windows-gnu --bin czkawka_gui
-
-          strip target/x86_64-pc-windows-gnu/debug/czkawka_gui.exe
-
-          mkdir $GTK_APP
-          cp target/x86_64-pc-windows-gnu/debug/czkawka_gui.exe $GTK_APP
-          cp $GTK_LIBRARY/bin/*.dll $GTK_APP
-          mkdir -p $GTK_APP/share/glib-2.0/schemas
-          mkdir $GTK_APP/share/icons
-          cp $GTK_LIBRARY/share/glib-2.0/schemas/* $GTK_APP/share/glib-2.0/schemas
-          cp -r $GTK_LIBRARY/share/icons/* $GTK_APP/share/icons
-          mkdir $GTK_APP/lib
-          cp -r $GTK_LIBRARY/lib/gdk-pixbuf-2.0 $GTK_APP/lib
-
-          mkdir -p $GTK_APP/share/themes
-          mkdir -p $GTK_APP/share/gtk-3.0
-          echo "[Settings]" > $GTK_APP/share/gtk-3.0/settings.ini
-          echo "gtk-theme-name = admin-gtk3-dark-osx" >> $GTK_APP/share/gtk-3.0/settings.ini
-          echo "gtk-font-name = Segoe UI 10" >> $GTK_APP/share/gtk-3.0/settings.ini
-          echo "gtk-xft-rgba = rgb" >> $GTK_APP/share/gtk-3.0/settings.ini
-          cp $GTK_THEME/AdMin-master/admin-gtk3-dark-osx $GTK_APP/share/themes -r -L
-
-          # This part is only unique for Czkawka
-          # This code allows to check which icons are used in Czkawka
-          # cd czkawka/ui
-          # rg icon-name
-          rm -rf $GTK_APP/share/icons/Adwaita/16x16
-          rm -rf $GTK_APP/share/icons/Adwaita/22x22
-          rm -rf $GTK_APP/share/icons/Adwaita/24x24
-          rm -rf $GTK_APP/share/icons/Adwaita/256x256
-          rm -rf $GTK_APP/share/icons/Adwaita/32x32
-          rm -rf $GTK_APP/share/icons/Adwaita/48x48
-          rm -rf $GTK_APP/share/icons/Adwaita/512x512
-          rm -rf $GTK_APP/share/icons/Adwaita/64x64
-          rm -rf $GTK_APP/share/icons/Adwaita/8x8
-          rm -rf $GTK_APP/share/icons/Adwaita/96x96
-          rm -rf $GTK_APP/share/icons/Adwaita/cursors
-          rm -rf $GTK_APP/share/icons/Adwaita/scalable
-          rm -rf $GTK_APP/share/icons/Adwaita/scalable-up-to-32
-          rm -rf $GTK_APP/share/icons/hicolor
-          wget https://github.com/qarmin/gtk_library_store/releases/download/3.24.0/czkawka_icons.zip
-          unzip czkawka_icons.zip -d $GTK_APP/share/icons/Adwaita
-
-          zip -r gtk_app.zip $GTK_APP
-        env:
-          CARGO_INCREMENTAL: 0
-          RUSTFLAGS: "-C debuginfo=0 -D warnings"
-
-      - name: Store Windows GUI CrossComplile
-        uses: actions/upload-artifact@v2
-        with:
-          name: czkawka_gui-debug-console-${{ matrix.toolchain }}
-          path: gtk_app.zip
+#  windows-gui-debug-normal-app:
+#    strategy:
+#      matrix:
+#        toolchain: [ stable ]
+#        type: [ release ]
+#    runs-on: ubuntu-20.04
+#    steps:
+#      - uses: actions/checkout@v2
+#
+#      - uses: actions-rs/toolchain@v1
+#        with:
+#          toolchain: ${{ matrix.toolchain }}
+#          override: true
+#
+#      - name: Install Gtk, Mingw, unzip, zip and wget
+#        run: sudo apt-get update; sudo apt install mingw-w64 libgtk-3-dev unzip wget zip -y
+#
+#      - name: Build GUI Debug Cross Compile
+#        run: |
+#          rustup target add x86_64-pc-windows-gnu
+#
+#          echo "[target.x86_64-pc-windows-gnu]" > ~/.cargo/config
+#          echo "linker = \"x86_64-w64-mingw32-gcc\"" >> ~/.cargo/config
+#          echo "ar = \"x86_64-w64-mingw32-gcc-ar\"" >> ~/.cargo/config
+#
+#          GTK_LIBRARY="$(pwd)/gtk_library"
+#          GTK_APP="$(pwd)/gtk_app"
+#          GTK_THEME="$(pwd)/gtk_theme"
+#
+#          wget https://github.com/qarmin/gtk_library_store/releases/download/3.24.0/mingw64.zip
+#          unzip mingw64.zip -d $GTK_LIBRARY
+#          GTK_LIBRARY="$GTK_LIBRARY/mingw64"
+#
+#          wget https://github.com/nrhodes91/AdMin/archive/master.zip
+#          unzip master.zip -d $GTK_THEME
+#
+#          PKG_CONFIG_ALLOW_CROSS=1 PKG_CONFIG_PATH="$GTK_LIBRARY/lib/pkgconfig" RUSTFLAGS="-L $GTK_LIBRARY/lib" cargo build --target=x86_64-pc-windows-gnu --bin czkawka_gui
+#
+#          strip target/x86_64-pc-windows-gnu/debug/czkawka_gui.exe
+#
+#          mkdir $GTK_APP
+#          cp target/x86_64-pc-windows-gnu/debug/czkawka_gui.exe $GTK_APP
+#          cp $GTK_LIBRARY/bin/*.dll $GTK_APP
+#          mkdir -p $GTK_APP/share/glib-2.0/schemas
+#          mkdir $GTK_APP/share/icons
+#          cp $GTK_LIBRARY/share/glib-2.0/schemas/* $GTK_APP/share/glib-2.0/schemas
+#          cp -r $GTK_LIBRARY/share/icons/* $GTK_APP/share/icons
+#          mkdir $GTK_APP/lib
+#          cp -r $GTK_LIBRARY/lib/gdk-pixbuf-2.0 $GTK_APP/lib
+#
+#          mkdir -p $GTK_APP/share/themes
+#          mkdir -p $GTK_APP/share/gtk-3.0
+#          echo "[Settings]" > $GTK_APP/share/gtk-3.0/settings.ini
+#          echo "gtk-theme-name = admin-gtk3-dark-osx" >> $GTK_APP/share/gtk-3.0/settings.ini
+#          echo "gtk-font-name = Segoe UI 10" >> $GTK_APP/share/gtk-3.0/settings.ini
+#          echo "gtk-xft-rgba = rgb" >> $GTK_APP/share/gtk-3.0/settings.ini
+#          cp $GTK_THEME/AdMin-master/admin-gtk3-dark-osx $GTK_APP/share/themes -r -L
+#
+#          # This part is only unique for Czkawka
+#          # This code allows to check which icons are used in Czkawka
+#          # cd czkawka/ui
+#          # rg icon-name
+#          rm -rf $GTK_APP/share/icons/Adwaita/16x16
+#          rm -rf $GTK_APP/share/icons/Adwaita/22x22
+#          rm -rf $GTK_APP/share/icons/Adwaita/24x24
+#          rm -rf $GTK_APP/share/icons/Adwaita/256x256
+#          rm -rf $GTK_APP/share/icons/Adwaita/32x32
+#          rm -rf $GTK_APP/share/icons/Adwaita/48x48
+#          rm -rf $GTK_APP/share/icons/Adwaita/512x512
+#          rm -rf $GTK_APP/share/icons/Adwaita/64x64
+#          rm -rf $GTK_APP/share/icons/Adwaita/8x8
+#          rm -rf $GTK_APP/share/icons/Adwaita/96x96
+#          rm -rf $GTK_APP/share/icons/Adwaita/cursors
+#          rm -rf $GTK_APP/share/icons/Adwaita/scalable
+#          rm -rf $GTK_APP/share/icons/Adwaita/scalable-up-to-32
+#          rm -rf $GTK_APP/share/icons/hicolor
+#          wget https://github.com/qarmin/gtk_library_store/releases/download/3.24.0/czkawka_icons.zip
+#          unzip czkawka_icons.zip -d $GTK_APP/share/icons/Adwaita
+#
+#          zip -r gtk_app.zip $GTK_APP
+#        env:
+#          CARGO_INCREMENTAL: 0
+#          RUSTFLAGS: "-C debuginfo=0 -D warnings"
+#
+#      - name: Store Windows GUI CrossComplile
+#        uses: actions/upload-artifact@v2
+#        with:
+#          name: czkawka_gui-debug-normal-app-${{ matrix.toolchain }}
+#          path: gtk_app.zip
+#
+#
+#  windows-gui-debug-console:
+#    strategy:
+#      matrix:
+#        toolchain: [ stable ]
+#        type: [ release ]
+#    runs-on: ubuntu-20.04
+#    steps:
+#      - uses: actions/checkout@v2
+#
+#      - uses: actions-rs/toolchain@v1
+#        with:
+#          toolchain: ${{ matrix.toolchain }}
+#          override: true
+#
+#      - name: Install Gtk, Mingw, unzip, zip and wget
+#        run: sudo apt-get update; sudo apt install mingw-w64 libgtk-3-dev unzip wget zip -y
+#
+#      - name: Build GUI Debug Cross Compile
+#        run: |
+#          sed -i 's/windows_subsystem = "windows"/windows_subsystem = "console"/' czkawka_gui/src/main.rs
+#          rustup target add x86_64-pc-windows-gnu
+#
+#          echo "[target.x86_64-pc-windows-gnu]" > ~/.cargo/config
+#          echo "linker = \"x86_64-w64-mingw32-gcc\"" >> ~/.cargo/config
+#          echo "ar = \"x86_64-w64-mingw32-gcc-ar\"" >> ~/.cargo/config
+#
+#          GTK_LIBRARY="$(pwd)/gtk_library"
+#          GTK_APP="$(pwd)/gtk_app"
+#          GTK_THEME="$(pwd)/gtk_theme"
+#
+#          wget https://github.com/qarmin/gtk_library_store/releases/download/3.24.0/mingw64.zip
+#          unzip mingw64.zip -d $GTK_LIBRARY
+#          GTK_LIBRARY="$GTK_LIBRARY/mingw64"
+#
+#          wget https://github.com/nrhodes91/AdMin/archive/master.zip
+#          unzip master.zip -d $GTK_THEME
+#
+#          PKG_CONFIG_ALLOW_CROSS=1 PKG_CONFIG_PATH="$GTK_LIBRARY/lib/pkgconfig" RUSTFLAGS="-L $GTK_LIBRARY/lib" cargo build --target=x86_64-pc-windows-gnu --bin czkawka_gui
+#
+#          strip target/x86_64-pc-windows-gnu/debug/czkawka_gui.exe
+#
+#          mkdir $GTK_APP
+#          cp target/x86_64-pc-windows-gnu/debug/czkawka_gui.exe $GTK_APP
+#          cp $GTK_LIBRARY/bin/*.dll $GTK_APP
+#          mkdir -p $GTK_APP/share/glib-2.0/schemas
+#          mkdir $GTK_APP/share/icons
+#          cp $GTK_LIBRARY/share/glib-2.0/schemas/* $GTK_APP/share/glib-2.0/schemas
+#          cp -r $GTK_LIBRARY/share/icons/* $GTK_APP/share/icons
+#          mkdir $GTK_APP/lib
+#          cp -r $GTK_LIBRARY/lib/gdk-pixbuf-2.0 $GTK_APP/lib
+#
+#          mkdir -p $GTK_APP/share/themes
+#          mkdir -p $GTK_APP/share/gtk-3.0
+#          echo "[Settings]" > $GTK_APP/share/gtk-3.0/settings.ini
+#          echo "gtk-theme-name = admin-gtk3-dark-osx" >> $GTK_APP/share/gtk-3.0/settings.ini
+#          echo "gtk-font-name = Segoe UI 10" >> $GTK_APP/share/gtk-3.0/settings.ini
+#          echo "gtk-xft-rgba = rgb" >> $GTK_APP/share/gtk-3.0/settings.ini
+#          cp $GTK_THEME/AdMin-master/admin-gtk3-dark-osx $GTK_APP/share/themes -r -L
+#
+#          # This part is only unique for Czkawka
+#          # This code allows to check which icons are used in Czkawka
+#          # cd czkawka/ui
+#          # rg icon-name
+#          rm -rf $GTK_APP/share/icons/Adwaita/16x16
+#          rm -rf $GTK_APP/share/icons/Adwaita/22x22
+#          rm -rf $GTK_APP/share/icons/Adwaita/24x24
+#          rm -rf $GTK_APP/share/icons/Adwaita/256x256
+#          rm -rf $GTK_APP/share/icons/Adwaita/32x32
+#          rm -rf $GTK_APP/share/icons/Adwaita/48x48
+#          rm -rf $GTK_APP/share/icons/Adwaita/512x512
+#          rm -rf $GTK_APP/share/icons/Adwaita/64x64
+#          rm -rf $GTK_APP/share/icons/Adwaita/8x8
+#          rm -rf $GTK_APP/share/icons/Adwaita/96x96
+#          rm -rf $GTK_APP/share/icons/Adwaita/cursors
+#          rm -rf $GTK_APP/share/icons/Adwaita/scalable
+#          rm -rf $GTK_APP/share/icons/Adwaita/scalable-up-to-32
+#          rm -rf $GTK_APP/share/icons/hicolor
+#          wget https://github.com/qarmin/gtk_library_store/releases/download/3.24.0/czkawka_icons.zip
+#          unzip czkawka_icons.zip -d $GTK_APP/share/icons/Adwaita
+#
+#          zip -r gtk_app.zip $GTK_APP
+#        env:
+#          CARGO_INCREMENTAL: 0
+#          RUSTFLAGS: "-C debuginfo=0 -D warnings"
+#
+#      - name: Store Windows GUI CrossComplile
+#        uses: actions/upload-artifact@v2
+#        with:
+#          name: czkawka_gui-debug-console-${{ matrix.toolchain }}
+#          path: gtk_app.zip
--- a/Cargo.lock
+++ b/Cargo.lock
@ -14,6 +14,18 @@ version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "aae1277d39aeec15cb388266ecc24b11c80469deae6067e17a1a7aa9e5c1f234"

+[[package]]
+name = "aes"
+version = "0.7.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9e8b47f52ea9bae42228d07ec09eb676433d7c4ed1ebdf0f1d1c29ed446f1ab8"
+dependencies = [
+ "cfg-if 1.0.0",
+ "cipher",
+ "cpufeatures",
+ "opaque-debug",
+]
+
 [[package]]
 name = "aho-corasick"
 version = "0.7.18"
@ -131,6 +143,12 @@ version = "0.20.0-alpha.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "149ea5dc24cb11513350770afebba32b68e3d2e356f9221351a2a1ee89112a82"

+[[package]]
+name = "base64ct"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8a32fd6af2b5827bce66c29053ba0e7c42b9dcab01835835058558c10851a46b"
+
 [[package]]
 name = "bincode"
 version = "1.3.3"
@ -357,10 +375,19 @@ dependencies = [
 "libc",
 "num-integer",
 "num-traits",
- "time",
+ "time 0.1.44",
 "winapi",
 ]

+[[package]]
+name = "cipher"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7ee52072ec15386f770805afd189a01c8841be8696bed250fa2f13c4c0d6dfb7"
+dependencies = [
+ "generic-array",
+]
+
 [[package]]
 name = "clang-sys"
 version = "1.3.1"
@ -619,9 +646,9 @@ dependencies = [

 [[package]]
 name = "darling"
-version = "0.13.2"
+version = "0.13.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4e92cb285610dd935f60ee8b4d62dd1988bd12b7ea50579bd6a138201525318e"
+checksum = "dbcc37e3091b4dfd0af76cb0087b9c89b8e03072abc28ae2efc8fdd733bfc5f5"
 dependencies = [
 "darling_core",
 "darling_macro",
@ -629,9 +656,9 @@ dependencies = [

 [[package]]
 name = "darling_core"
-version = "0.13.2"
+version = "0.13.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c29e95ab498b18131ea460b2c0baa18cbf041231d122b0b7bfebef8c8e88989"
+checksum = "9569a966dba8cd57879b8efd2bf82b5c56bb466e19767a69c560bddee1a27f5c"
 dependencies = [
 "fnv",
 "ident_case",
@ -643,9 +670,9 @@ dependencies = [

 [[package]]
 name = "darling_macro"
-version = "0.13.2"
+version = "0.13.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b21dd6b221dd547528bd6fb15f1a3b7ab03b9a06f76bff288a8c629bcfbe7f0e"
+checksum = "efae147148c6380157050146a2040b65dbe91bef6e97aaaa39ef0d469d2eb4af"
 dependencies = [
 "darling_core",
 "quote",
@ -1249,6 +1276,15 @@ dependencies = [
 "libc",
 ]

+[[package]]
+name = "hmac"
+version = "0.12.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e"
+dependencies = [
+ "digest 0.10.3",
+]
+
 [[package]]
 name = "hound"
 version = "3.4.0"
@ -1896,6 +1932,15 @@ dependencies = [
 "syn",
 ]

+[[package]]
+name = "num_threads"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "aba1801fb138d8e85e11d0fc70baf4fe1cdfffda7c6cd34a854905df588e5ed0"
+dependencies = [
+ "libc",
+]
+
 [[package]]
 name = "objc"
 version = "0.2.7"
@ -2061,6 +2106,17 @@ dependencies = [
 "windows-sys",
 ]

+[[package]]
+name = "password-hash"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1d791538a6dcc1e7cb7fe6f6b58aca40e7f79403c45b2bc274008b5e647af1d8"
+dependencies = [
+ "base64ct",
+ "rand_core",
+ "subtle",
+]
+
 [[package]]
 name = "paste"
 version = "1.0.7"
@ -2073,6 +2129,18 @@ version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8835116a5c179084a830efb3adc117ab007512b535bc1a21c991d3b32a6b44dd"

+[[package]]
+name = "pbkdf2"
+version = "0.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "271779f35b581956db91a3e55737327a03aa051e90b1c47aeb189508533adfd7"
+dependencies = [
+ "digest 0.10.3",
+ "hmac",
+ "password-hash",
+ "sha2 0.10.2",
+]
+
 [[package]]
 name = "peeking_take_while"
 version = "0.1.2"
@ -2201,9 +2269,9 @@ dependencies = [

 [[package]]
 name = "proc-macro2"
-version = "1.0.36"
+version = "1.0.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c7342d5883fbccae1cc37a2353b09c87c9b0f3afd73f5fb9bba687a1f733b029"
+checksum = "ec757218438d5fda206afc041538b2f6d889286160d649a86a24d37e1235afd1"
 dependencies = [
 "unicode-xid",
 ]
@ -2376,7 +2444,7 @@ version = "7.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ad22c7226e4829104deab21df575e995bfbc4adfad13a595e387477f238c1aec"
 dependencies = [
- "sha2",
+ "sha2 0.9.9",
 "walkdir",
 ]

@ -2534,6 +2602,17 @@ dependencies = [
 "yaml-rust",
 ]

+[[package]]
+name = "sha1"
+version = "0.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c77f4e7f65455545c2153c1253d25056825e77ee2533f0e41deb65a93a34852f"
+dependencies = [
+ "cfg-if 1.0.0",
+ "cpufeatures",
+ "digest 0.10.3",
+]
+
 [[package]]
 name = "sha2"
 version = "0.9.9"
@ -2547,6 +2626,17 @@ dependencies = [
 "opaque-debug",
 ]

+[[package]]
+name = "sha2"
+version = "0.10.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "55deaec60f81eefe3cce0dc50bda92d6d8e88f2a27df7c5033b42afeb1ed2676"
+dependencies = [
+ "cfg-if 1.0.0",
+ "cpufeatures",
+ "digest 0.10.3",
+]
+
 [[package]]
 name = "shlex"
 version = "0.1.1"
@ -2641,9 +2731,9 @@ checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601"

 [[package]]
 name = "syn"
-version = "1.0.90"
+version = "1.0.91"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "704df27628939572cd88d33f171cd6f896f4eaca85252c6e0a72d8d8287ee86f"
+checksum = "b683b2b825c8eef438b77c36a06dc262294da3d5a5813fac20da149241dcd44d"
 dependencies = [
 "proc-macro2",
 "quote",
@ -2748,6 +2838,24 @@ dependencies = [
 "winapi",
 ]

+[[package]]
+name = "time"
+version = "0.3.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c2702e08a7a860f005826c6815dcac101b19b5eb330c27fe4a5928fec1d20ddd"
+dependencies = [
+ "itoa",
+ "libc",
+ "num_threads",
+ "time-macros",
+]
+
+[[package]]
+name = "time-macros"
+version = "0.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "42657b1a6f4d817cda8e7a0ace261fe0cc946cf3a80314390b22cc61ae080792"
+
 [[package]]
 name = "tinystr"
 version = "0.3.4"
@ -3074,14 +3182,19 @@ dependencies = [

 [[package]]
 name = "zip"
-version = "0.5.13"
+version = "0.6.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "93ab48844d61251bb3835145c521d88aa4031d7139e8485990f60ca911fa0815"
+checksum = "bf225bcf73bb52cbb496e70475c7bd7a3f769df699c0020f6c7bd9a96dcf0b8d"
 dependencies = [
+ "aes",
 "byteorder",
 "bzip2",
+ "constant_time_eq",
 "crc32fast",
+ "crossbeam-utils",
 "flate2",
- "thiserror",
- "time",
+ "hmac",
+ "pbkdf2",
+ "sha1",
+ "time 0.3.9",
 ]
--- a/2
+++ b/2
@ -1,6 +1,6 @@
 MIT License

-Copyright (c) 2020-2021 Rafał Mikrut
+Copyright (c) 2020-2022 Rafał Mikrut

 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
--- a/czkawka_core/Cargo.toml
+++ b/czkawka_core/Cargo.toml
@ -31,7 +31,7 @@ lofty="0.5.3"
 futures = "0.3.21"

 # Needed by broken files
-zip = "0.5.13"
+zip = { version = "0.6.2", features=["aes-crypto", "bzip2", "deflate", "time"], default-features = false}
 rodio = { version = "0.15.0", optional = true }

 # Hashes for duplicate files