From 6171eba0f735fca4d9c98e9d727d7a52e5dffd4f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafa=C5=82=20Mikrut?= <41945903+qarmin@users.noreply.github.com> Date: Mon, 10 Jan 2022 17:58:18 +0100 Subject: [PATCH] Don't include all possible icons in Windows builds (#540) * Don't include all possible icons in Windows builds * ABba * B * Stonker * ABEC * Update to latest --- .github/workflows/windows.yml | 342 +++++++++++++++++--- Cargo.lock | 105 ++++-- czkawka_core/Cargo.toml | 14 +- czkawka_gui/Cargo.toml | 10 +- data/com.github.qarmin.czkawka.metainfo.xml | 9 +- 5 files changed, 385 insertions(+), 95 deletions(-) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 8e66280..3d50e90 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -84,7 +84,6 @@ jobs: - target/release/czkawka_cli dup -d "$(pwd)/TestSuite" -D aen -m 1024 python misc/check_results.py TestSuite 7 8 @@ -148,7 +147,7 @@ jobs: python misc/check_results.py TestSuite 14 8 if: ${{ matrix.type == 'release' }} - windows-gui: + windows-gui-release-normal-app: strategy: matrix: toolchain: [ stable ] @@ -162,50 +161,9 @@ jobs: toolchain: ${{ matrix.toolchain }} override: true - - uses: actions/cache@v2 - with: - path: | - target - key: windows-gui-${{github.ref}}-${{github.sha}} - restore-keys: | - windows-gui-${{github.ref}}-${{github.sha}} - - 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" - - 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" - - 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 - - mkdir $GTK_APP - cp target/x86_64-pc-windows-gnu/release/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 - - zip -r gtk_app.zip $GTK_APP - env: - CARGO_INCREMENTAL: 0 - RUSTFLAGS: "-C debuginfo=0 -D warnings" - if: ${{ matrix.type == 'debug'}} - - name: Build GUI Release Cross Compile run: | rustup target add x86_64-pc-windows-gnu @@ -247,15 +205,307 @@ jobs: 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" - if: ${{ matrix.type == 'release'}} - name: Store Windows GUI CrossComplile uses: actions/upload-artifact@v2 with: - name: czkawka_gui-Windows-${{ matrix.toolchain }} + name: czkawka_gui-release-normal-app-${{ matrix.toolchain }} path: gtk_app.zip - if: ${{ matrix.type == 'release' }} + + windows-gui-release-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 Release 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 --release + + strip target/x86_64-pc-windows-gnu/release/czkawka_gui.exe + + mkdir $GTK_APP + cp target/x86_64-pc-windows-gnu/release/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-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 \ No newline at end of file diff --git a/Cargo.lock b/Cargo.lock index 4847113..aee48e9 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -200,21 +200,21 @@ dependencies = [ "cfg-if 0.1.10", "constant_time_eq", "crypto-mac", - "digest", + "digest 0.9.0", ] [[package]] name = "blake3" -version = "1.2.0" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "526c210b4520e416420759af363083471656e819a75e831b8d2c9d5a584f2413" +checksum = "882e99e4a0cb2ae6cb6e442102e8e6b7131718d94110e64c3e6a34ea9b106f37" dependencies = [ "arrayref", "arrayvec 0.7.2", "cc", "cfg-if 1.0.0", "constant_time_eq", - "digest", + "digest 0.10.1", ] [[package]] @@ -233,10 +233,19 @@ dependencies = [ ] [[package]] -name = "bumpalo" -version = "3.8.0" +name = "block-buffer" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f1e260c3a9040a7c19a12468758f4c16f31a81a1fe087482be9570ec864bb6c" +checksum = "f1d36a02058e76b040de25a4464ba1c80935655595b661505c8b39b664828b95" +dependencies = [ + "generic-array", +] + +[[package]] +name = "bumpalo" +version = "3.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4a45a46ab1f2412e53d3a0ade76ffad2025804294569aae387231a0cd6e0899" [[package]] name = "bytemuck" @@ -483,9 +492,9 @@ dependencies = [ [[package]] name = "crossbeam-channel" -version = "0.5.1" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06ed27e177f16d65f0f0c22a213e17c696ace5dd64b14258b52f9417ccb52db4" +checksum = "e54ea8bc3fb1ee042f5aace6e3c6e025d3874866da222930f70ce62aceba0bfa" dependencies = [ "cfg-if 1.0.0", "crossbeam-utils", @@ -504,9 +513,9 @@ dependencies = [ [[package]] name = "crossbeam-epoch" -version = "0.9.5" +version = "0.9.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ec02e091aa634e2c3ada4a392989e7c3116673ef0ac5b72232439094d73b7fd" +checksum = "97242a70df9b89a65d0b6df3c4bf5b9ce03c5b7309019777fbde37e7537f8762" dependencies = [ "cfg-if 1.0.0", "crossbeam-utils", @@ -517,14 +526,23 @@ dependencies = [ [[package]] name = "crossbeam-utils" -version = "0.8.5" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d82cfc11ce7f2c3faef78d8a684447b40d503d9681acebed6cb728d45940c4db" +checksum = "cfcae03edb34f947e64acdb1c33ec169824e20657e9ecb61cef6c8c74dcb8120" dependencies = [ "cfg-if 1.0.0", "lazy_static", ] +[[package]] +name = "crypto-common" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "683d6b536309245c849479fba3da410962a43ed8e51c26b729208ec0ac2798d0" +dependencies = [ + "generic-array", +] + [[package]] name = "crypto-mac" version = "0.8.0" @@ -552,7 +570,7 @@ dependencies = [ "bincode", "bitflags", "bk-tree", - "blake3 1.2.0", + "blake3 1.3.0", "crc32fast", "crossbeam-channel", "directories-next", @@ -668,6 +686,18 @@ dependencies = [ "generic-array", ] +[[package]] +name = "digest" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b697d66081d42af4fba142d56918a3cb21dc8eb63372c6b85d14f44fb9c5979b" +dependencies = [ + "block-buffer 0.10.0", + "crypto-common", + "generic-array", + "subtle", +] + [[package]] name = "directories-next" version = "2.0.0" @@ -706,6 +736,15 @@ dependencies = [ "syn", ] +[[package]] +name = "fastrand" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "779d043b6a0b90cc4c0ed7ee380a6504394cee7efd7db050e3774eee387324b2" +dependencies = [ + "instant", +] + [[package]] name = "ffmpeg_cmdline_utils" version = "0.1.0" @@ -955,9 +994,9 @@ dependencies = [ [[package]] name = "generic-array" -version = "0.14.4" +version = "0.14.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "501466ecc8a30d1d3b7fc9229b122b2ce8ed6e9d9223f1138d4babb253e51817" +checksum = "fd48d33ec7f05fbfa152300fdad764757cbded343c1aa1cff2fbaf4134851803" dependencies = [ "typenum", "version_check", @@ -1318,9 +1357,9 @@ dependencies = [ [[package]] name = "indexmap" -version = "1.7.0" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc633605454125dec4b66843673f01c7df2b89479b32e0ed634e43a91cff62a5" +checksum = "282a6247722caba404c065016bbfa522806e51714c34f5dfc3e4a3a46fcb4223" dependencies = [ "autocfg", "hashbrown", @@ -2342,18 +2381,18 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.132" +version = "1.0.133" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b9875c23cf305cd1fd7eb77234cbb705f21ea6a72c637a5c6db5fe4b8e7f008" +checksum = "97565067517b60e2d1ea8b268e59ce036de907ac523ad83a0475da04e818989a" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.132" +version = "1.0.133" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ecc0db5cb2556c0e558887d9bbdcf6ac4471e83ff66cf696e5419024d1606276" +checksum = "ed201699328568d8d08208fdd080e3ff594e6c422e438b6705905da01005d537" dependencies = [ "proc-macro2", "quote", @@ -2362,9 +2401,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.73" +version = "1.0.74" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bcbd0344bc6533bc7ec56df11d42fb70f1b912351c0825ccb7211b59d8af7cf5" +checksum = "ee2bb9cd061c5865d345bb02ca49fcef1391741b672b54a0bf7b679badec3142" dependencies = [ "itoa", "ryu", @@ -2385,14 +2424,14 @@ dependencies = [ [[package]] name = "sha2" -version = "0.9.8" +version = "0.9.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b69f9a4c9740d74c5baa3fd2e547f9525fa8088a8a958e0ca2409a514e33f5fa" +checksum = "4d58a1e1bf39749807d89cf2d98ac2dfa0ff1cb3faa38fbb64dd88ac8013d800" dependencies = [ - "block-buffer", + "block-buffer 0.9.0", "cfg-if 1.0.0", "cpufeatures", - "digest", + "digest 0.9.0", "opaque-debug", ] @@ -2505,9 +2544,9 @@ checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601" [[package]] name = "syn" -version = "1.0.84" +version = "1.0.85" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ecb2e6da8ee5eb9a61068762a32fa9619cc591ceb055b3687f4cd4051ec2e06b" +checksum = "a684ac3dcd8913827e18cd09a68384ee66c1de24157e3c556c9ab16d85695fb7" dependencies = [ "proc-macro2", "quote", @@ -2534,13 +2573,13 @@ dependencies = [ [[package]] name = "tempfile" -version = "3.2.0" +version = "3.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dac1c663cfc93810f88aed9b8941d48cabf856a1b111c29a40439018d870eb22" +checksum = "5cdb1ef4eaeeaddc8fbd371e5017057064af0911902ef36b39801f67cc6d79e4" dependencies = [ "cfg-if 1.0.0", + "fastrand", "libc", - "rand", "redox_syscall", "remove_dir_all", "winapi", diff --git a/czkawka_core/Cargo.toml b/czkawka_core/Cargo.toml index 7dab9bc..fb90d72 100644 --- a/czkawka_core/Cargo.toml +++ b/czkawka_core/Cargo.toml @@ -28,7 +28,7 @@ bitflags = "1.3.2" audiotags = "0.2.7182" # Futures - needed by async progress sender -futures = "0.3.17" +futures = "0.3.19" # Needed by broken files zip = "0.5.13" @@ -36,7 +36,7 @@ rodio = { version = "0.14.0", optional = true } # Hashes for duplicate files blake3 = "1.2.0" -crc32fast = "1.2.1" +crc32fast = "1.3.0" xxhash-rust = { version = "0.8.2", features = ["xxh3"] } tempfile = "3.2.0" @@ -46,15 +46,15 @@ vid_dup_finder_lib = "0.1.0" ffmpeg_cmdline_utils = "0.1.0" # Saving/Loading Cache -serde = "1.0.130" +serde = "1.0.133" bincode = "1.3.3" -serde_json = "1.0.72" +serde_json = "1.0.74" # Language i18n-embed = { version = "0.13", features = ["fluent-system", "desktop-requester"] } -i18n-embed-fl = "0.6" -rust-embed = "6.2.0" -once_cell = "1.8.0" +i18n-embed-fl = "0.6.1" +rust-embed = "6.3.0" +once_cell = "1.9.0" # Raw image files rawloader = "0.37.0" diff --git a/czkawka_gui/Cargo.toml b/czkawka_gui/Cargo.toml index 9a1438e..2461045 100644 --- a/czkawka_gui/Cargo.toml +++ b/czkawka_gui/Cargo.toml @@ -20,13 +20,13 @@ chrono = "0.4.19" crossbeam-channel = "0.5.1" # To get informations about progress -futures = "0.3.17" +futures = "0.3.19" # For saving/loading config files to specific directories directories-next = "2.0.0" # For opening files -open = "2.0.1" +open = "2.0.2" # To get image preview image = "0.23.14" @@ -45,9 +45,9 @@ fs_extra = "1.2.0" # Language i18n-embed = { version = "0.13", features = ["fluent-system", "desktop-requester"] } -i18n-embed-fl = "0.6" -rust-embed = "6.2.0" -once_cell = "1.8.0" +i18n-embed-fl = "0.6.1" +rust-embed = "6.3.0" +once_cell = "1.9.0" [target.'cfg(windows)'.dependencies] winapi = { version = "0.3.9", features = ["combaseapi", "objbase", "shobjidl_core", "windef", "winerror", "wtypesbase", "winuser"] } diff --git a/data/com.github.qarmin.czkawka.metainfo.xml b/data/com.github.qarmin.czkawka.metainfo.xml index 8596a70..bf513dc 100644 --- a/data/com.github.qarmin.czkawka.metainfo.xml +++ b/data/com.github.qarmin.czkawka.metainfo.xml @@ -7,15 +7,15 @@ MIT

- Czkawka is written in Rust, simple, fast and easy to use app to remove unnecessary files from your computer. + Czkawka is simple, fast and easy to use app to remove unnecessary files from your computer.

com.github.qarmin.czkawka.desktop - https://user-images.githubusercontent.com/41945903/105611697-04735e00-5db7-11eb-833b-120eff81cf48.png - https://user-images.githubusercontent.com/41945903/105611700-06d5b800-5db7-11eb-93b7-8e121150cf0f.png - https://user-images.githubusercontent.com/41945903/105611698-05a48b00-5db7-11eb-9f2e-c95a3b0bb11f.png + https://user-images.githubusercontent.com/41945903/147875238-7f82fa27-c6dd-47e7-87ed-e253fb2cbc3e.png + https://user-images.githubusercontent.com/41945903/147875239-bcf9776c-885d-45ac-ba82-5a426d8e1647.png + https://user-images.githubusercontent.com/41945903/147875243-e654e683-37f7-46fa-8321-119a4c5775e7.png @@ -26,4 +26,5 @@ https://github.com/qarmin/czkawka https://github.com/qarmin/czkawka/issues https://github.com/sponsors/qarmin + https://crowdin.com/project/czkawka