Skip to content

Commit 7cb355a

Browse files
authored
6.0.0 version (#988)
* 4.10 and build heif for all * 4.10 * Disable heif in windows build * A1 * B1
1 parent 55b2744 commit 7cb355a

32 files changed

+639
-150
lines changed

.github/workflows/linux_gui.yml

+7
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,13 @@ jobs:
3131
RUSTFLAGS: "-C debuginfo=0"
3232
if: ${{ (matrix.type == 'release') && (matrix.toolchain == '1.67.1') }}
3333

34+
- name: Store Linux GUI Heif
35+
uses: actions/upload-artifact@v3
36+
with:
37+
name: czkawka_gui-${{ runner.os }}-${{ matrix.toolchain }}-heif
38+
path: target/release/czkawka_gui
39+
if: ${{ matrix.type == 'release' }}
40+
3441
- name: Build Release
3542
run: cargo build --release
3643
env:

.github/workflows/windows.yml

+20-3
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,12 @@ env:
1010

1111
jobs:
1212
container:
13+
strategy:
14+
matrix:
15+
use_heif: [ non_heif ] #, heif ] - heif problems with mingw
1316
runs-on: ubuntu-22.04
1417
container:
15-
image: ghcr.io/piegamesde/gtk4-cross:gtk-4.8
18+
image: ghcr.io/mglolenstine/gtk4-cross:gtk-4.10
1619
steps:
1720
- uses: actions/checkout@v1
1821
- name: Install additional dependencies
@@ -33,6 +36,18 @@ jobs:
3336
with:
3437
path: target
3538
key: windows-build-target
39+
40+
- name: Cross compile for Windows Heif
41+
run: |
42+
#!/bin/bash
43+
set -euo pipefail
44+
export PKG_CONFIG_PATH=/usr/lib64/pkgconfig:/usr/share/pkgconfig:$MINGW_PREFIX/lib/pkgconfig/:/usr/x86_64-w64-mingw32/lib/pkgconfig/
45+
cargo build --target=x86_64-pc-windows-gnu --release --locked --features heif
46+
mkdir -p package
47+
cp target/x86_64-pc-windows-gnu/release/czkawka_gui.exe package/
48+
cp target/x86_64-pc-windows-gnu/release/czkawka_cli.exe package/
49+
if: ${{ matrix.use_heif == 'heif' }}
50+
3651
- name: Cross compile for Windows
3752
run: |
3853
#!/bin/bash
@@ -42,6 +57,8 @@ jobs:
4257
mkdir -p package
4358
cp target/x86_64-pc-windows-gnu/release/czkawka_gui.exe package/
4459
cp target/x86_64-pc-windows-gnu/release/czkawka_cli.exe package/
60+
if: ${{ matrix.use_heif == 'non_heif' }}
61+
4562
- name: Package
4663
run: |
4764
#!/bin/bash
@@ -67,7 +84,7 @@ jobs:
6784
- name: Upload artifacts
6885
uses: actions/upload-artifact@v3
6986
with:
70-
name: czkawka-windows-${{ github.sha }}
87+
name: czkawka-windows-${{ github.sha }}-${{ matrix.use_heif }}
7188
path: |
7289
./package
7390
if-no-files-found: error
@@ -76,7 +93,7 @@ jobs:
7693
container_console_window:
7794
runs-on: ubuntu-22.04
7895
container:
79-
image: ghcr.io/piegamesde/gtk4-cross:gtk-4.8
96+
image: ghcr.io/mglolenstine/gtk4-cross:gtk-4.10
8097
steps:
8198
- uses: actions/checkout@v1
8299
- name: Install additional dependencies

Cargo.lock

+10-10
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Changelog.md

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1-
## Version 5.2.0 - ?
1+
## Version 6.0.0 - 11.06.2023r
22
- Add finding similar audio files by content - [#970](https://github.com/qarmin/czkawka/pull/970)
33
- Allow to find duplicates by name/size at once - [#956](https://github.com/qarmin/czkawka/pull/956)
4+
- Fix, simplify and speed up finding similar images - [#983](https://github.com/qarmin/czkawka/pull/956)
45
- Fixed bug when cache for music tags not worked - [#970](https://github.com/qarmin/czkawka/pull/970)
56
- Allow to set number of threads from CLI - [#972](https://github.com/qarmin/czkawka/pull/972)
67
- Fix problem with invalid item sorting in bad extensions mode - [#972](https://github.com/qarmin/czkawka/pull/972)

czkawka_cli/Cargo.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "czkawka_cli"
3-
version = "5.1.0"
3+
version = "6.0.0"
44
authors = ["Rafał Mikrut <[email protected]>"]
55
edition = "2021"
66
rust-version = "1.67.1"
@@ -17,7 +17,7 @@ image_hasher = "1.2"
1717

1818
[dependencies.czkawka_core]
1919
path = "../czkawka_core"
20-
version = "5.1.0"
20+
version = "6.0.0"
2121
features = []
2222

2323
[features]

czkawka_core/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "czkawka_core"
3-
version = "5.1.0"
3+
version = "6.0.0"
44
authors = ["Rafał Mikrut <[email protected]>"]
55
edition = "2021"
66
rust-version = "1.67.1"

czkawka_core/src/broken_files.rs

+1-2
Original file line numberDiff line numberDiff line change
@@ -379,9 +379,8 @@ impl BrokenFiles {
379379
let err = validate_pdf_error(&mut file_entry, e);
380380
if let PdfError::InvalidPassword = err {
381381
return None;
382-
} else {
383-
break;
384382
}
383+
break;
385384
}
386385
}
387386
}

0 commit comments

Comments
 (0)