1
0
Fork 0
mirror of synced 2024-05-02 19:44:09 +12:00
This commit is contained in:
Rafał Mikrut 2024-01-19 22:44:17 +01:00
parent 419146331f
commit acef930a87
7 changed files with 84 additions and 120 deletions

4
.gitignore vendored
View file

@ -18,4 +18,6 @@ ci_tester/Cargo.lock
krokiet/Cargo.lock
krokiet/target
*.json
*.mm_profdata
*.mm_profdata
perf.data
perf.data.old

162
Cargo.lock generated
View file

@ -122,9 +122,9 @@ dependencies = [
[[package]]
name = "anstream"
version = "0.6.8"
version = "0.6.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "628a8f9bd1e24b4e0db2b4bc2d000b001e7dd032d54afa60a68836aeec5aa54a"
checksum = "6e2e1ebcb11de5c03c67de28a7df593d32191b44939c482e97702baaaa6ab6a5"
dependencies = [
"anstyle",
"anstyle-parse",
@ -944,7 +944,7 @@ dependencies = [
[[package]]
name = "const-field-offset"
version = "0.1.3"
source = "git+https://github.com/slint-ui/slint.git#7a295d1b75121fa1b21996588511c98772488fe4"
source = "git+https://github.com/slint-ui/slint.git#f809b3ff41b643b6896e2af493160d8f7f2880f3"
dependencies = [
"const-field-offset-macro",
"field-offset",
@ -953,7 +953,7 @@ dependencies = [
[[package]]
name = "const-field-offset-macro"
version = "0.1.3"
source = "git+https://github.com/slint-ui/slint.git#7a295d1b75121fa1b21996588511c98772488fe4"
source = "git+https://github.com/slint-ui/slint.git#f809b3ff41b643b6896e2af493160d8f7f2880f3"
dependencies = [
"proc-macro2",
"quote",
@ -1979,9 +1979,9 @@ checksum = "42703706b716c37f96a77aea830392ad231f44c9e9a67872fa5548707e11b11c"
[[package]]
name = "fun_time"
version = "0.3.3"
version = "0.3.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "783fdd8402ab5955698d66b0ba307bb2d3b3bfb911a4dfe7bd6bbc7f140be6a5"
checksum = "bee194d43605ea83cca7af42af5f9001fab1a8e2220cb8a012e21dda6167fdb0"
dependencies = [
"fun_time_derive",
"log",
@ -1989,9 +1989,9 @@ dependencies = [
[[package]]
name = "fun_time_derive"
version = "0.3.3"
version = "0.3.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a3d89b974360ce9cd00ef9dd26353bc6f1ec9ff12d95e741ad83b36385f3a736"
checksum = "71555fd2db00938d82d29d8fa62a2ae80aed2c162c328d775f79e98d9212f013"
dependencies = [
"darling",
"log",
@ -2660,7 +2660,7 @@ dependencies = [
[[package]]
name = "i-slint-backend-linuxkms"
version = "1.4.0"
source = "git+https://github.com/slint-ui/slint.git#7a295d1b75121fa1b21996588511c98772488fe4"
source = "git+https://github.com/slint-ui/slint.git#f809b3ff41b643b6896e2af493160d8f7f2880f3"
dependencies = [
"calloop",
"drm 0.9.0",
@ -2680,7 +2680,7 @@ dependencies = [
[[package]]
name = "i-slint-backend-selector"
version = "1.4.0"
source = "git+https://github.com/slint-ui/slint.git#7a295d1b75121fa1b21996588511c98772488fe4"
source = "git+https://github.com/slint-ui/slint.git#f809b3ff41b643b6896e2af493160d8f7f2880f3"
dependencies = [
"cfg-if",
"i-slint-backend-linuxkms",
@ -2693,7 +2693,7 @@ dependencies = [
[[package]]
name = "i-slint-backend-winit"
version = "1.4.0"
source = "git+https://github.com/slint-ui/slint.git#7a295d1b75121fa1b21996588511c98772488fe4"
source = "git+https://github.com/slint-ui/slint.git#f809b3ff41b643b6896e2af493160d8f7f2880f3"
dependencies = [
"bytemuck",
"cfg-if",
@ -2727,7 +2727,7 @@ dependencies = [
[[package]]
name = "i-slint-common"
version = "1.4.0"
source = "git+https://github.com/slint-ui/slint.git#7a295d1b75121fa1b21996588511c98772488fe4"
source = "git+https://github.com/slint-ui/slint.git#f809b3ff41b643b6896e2af493160d8f7f2880f3"
dependencies = [
"cfg-if",
"derive_more",
@ -2738,7 +2738,7 @@ dependencies = [
[[package]]
name = "i-slint-compiler"
version = "1.4.0"
source = "git+https://github.com/slint-ui/slint.git#7a295d1b75121fa1b21996588511c98772488fe4"
source = "git+https://github.com/slint-ui/slint.git#f809b3ff41b643b6896e2af493160d8f7f2880f3"
dependencies = [
"by_address",
"codemap",
@ -2767,7 +2767,7 @@ dependencies = [
[[package]]
name = "i-slint-core"
version = "1.4.0"
source = "git+https://github.com/slint-ui/slint.git#7a295d1b75121fa1b21996588511c98772488fe4"
source = "git+https://github.com/slint-ui/slint.git#f809b3ff41b643b6896e2af493160d8f7f2880f3"
dependencies = [
"auto_enums",
"bytemuck",
@ -2810,7 +2810,7 @@ dependencies = [
[[package]]
name = "i-slint-core-macros"
version = "1.4.0"
source = "git+https://github.com/slint-ui/slint.git#7a295d1b75121fa1b21996588511c98772488fe4"
source = "git+https://github.com/slint-ui/slint.git#f809b3ff41b643b6896e2af493160d8f7f2880f3"
dependencies = [
"quote",
"syn 2.0.48",
@ -2819,7 +2819,7 @@ dependencies = [
[[package]]
name = "i-slint-renderer-femtovg"
version = "1.4.0"
source = "git+https://github.com/slint-ui/slint.git#7a295d1b75121fa1b21996588511c98772488fe4"
source = "git+https://github.com/slint-ui/slint.git#f809b3ff41b643b6896e2af493160d8f7f2880f3"
dependencies = [
"cfg-if",
"const-field-offset",
@ -2851,7 +2851,7 @@ dependencies = [
[[package]]
name = "i-slint-renderer-skia"
version = "1.4.0"
source = "git+https://github.com/slint-ui/slint.git#7a295d1b75121fa1b21996588511c98772488fe4"
source = "git+https://github.com/slint-ui/slint.git#f809b3ff41b643b6896e2af493160d8f7f2880f3"
dependencies = [
"ash",
"bytemuck",
@ -2880,8 +2880,7 @@ dependencies = [
"unicode-segmentation",
"vtable",
"vulkano",
"winapi",
"wio",
"windows 0.52.0",
]
[[package]]
@ -3135,12 +3134,9 @@ dependencies = [
[[package]]
name = "input-sys"
version = "1.17.0"
version = "1.18.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "05f6c2a17e8aba7217660e32863af87b0febad811d4b8620ef76b386603fddc2"
dependencies = [
"libc",
]
checksum = "bd4f5b4d1c00331c5245163aacfe5f20be75b564c7112d45893d4ae038119eb0"
[[package]]
name = "instant"
@ -4650,20 +4646,6 @@ dependencies = [
"bytemuck",
]
[[package]]
name = "ring"
version = "0.17.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "688c63d65483050968b2a8937f7995f443e27041a0f7700aa59b0822aedebb74"
dependencies = [
"cc",
"getrandom",
"libc",
"spin",
"untrusted",
"windows-sys 0.48.0",
]
[[package]]
name = "rle-decode-fast"
version = "1.0.3"
@ -4833,28 +4815,6 @@ dependencies = [
"windows-sys 0.52.0",
]
[[package]]
name = "rustls"
version = "0.21.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f9d5a6813c0759e4609cd494e8e725babae6a2ca7b62a5536a13daaec6fcb7ba"
dependencies = [
"log",
"ring",
"rustls-webpki",
"sct",
]
[[package]]
name = "rustls-webpki"
version = "0.101.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765"
dependencies = [
"ring",
"untrusted",
]
[[package]]
name = "rustversion"
version = "1.0.14"
@ -4936,16 +4896,6 @@ version = "1.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
[[package]]
name = "sct"
version = "0.7.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414"
dependencies = [
"ring",
"untrusted",
]
[[package]]
name = "sctk-adwaita"
version = "0.8.1"
@ -5112,9 +5062,9 @@ checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d"
[[package]]
name = "skia-bindings"
version = "0.69.0"
version = "0.70.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8b4b5af96ee7d895763fa606f4531fddfb11de034217edd0c7beb9ea181efe5b"
checksum = "4bc61a106126a429bb4775ce5fbe23b2bcaa74d1a9c484997f4700de31480b44"
dependencies = [
"bindgen",
"cc",
@ -5125,20 +5075,18 @@ dependencies = [
"serde_json",
"tar",
"toml 0.8.8",
"ureq",
]
[[package]]
name = "skia-safe"
version = "0.69.0"
version = "0.70.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4a3d25acaedea0a8ed1dac52f383fc90276f5679a68e3f84c5fb7f7bde8934ff"
checksum = "3201eba92bca1f83864f5c3a48309bcfee7e0590bebd7826e7ab0a49aa24a750"
dependencies = [
"bitflags 2.4.2",
"lazy_static",
"skia-bindings",
"winapi",
"wio",
"windows 0.52.0",
]
[[package]]
@ -5153,7 +5101,7 @@ dependencies = [
[[package]]
name = "slint"
version = "1.4.0"
source = "git+https://github.com/slint-ui/slint.git#7a295d1b75121fa1b21996588511c98772488fe4"
source = "git+https://github.com/slint-ui/slint.git#f809b3ff41b643b6896e2af493160d8f7f2880f3"
dependencies = [
"const-field-offset",
"i-slint-backend-selector",
@ -5169,7 +5117,7 @@ dependencies = [
[[package]]
name = "slint-build"
version = "1.4.0"
source = "git+https://github.com/slint-ui/slint.git#7a295d1b75121fa1b21996588511c98772488fe4"
source = "git+https://github.com/slint-ui/slint.git#f809b3ff41b643b6896e2af493160d8f7f2880f3"
dependencies = [
"i-slint-compiler",
"spin_on",
@ -5180,7 +5128,7 @@ dependencies = [
[[package]]
name = "slint-macros"
version = "1.4.0"
source = "git+https://github.com/slint-ui/slint.git#7a295d1b75121fa1b21996588511c98772488fe4"
source = "git+https://github.com/slint-ui/slint.git#f809b3ff41b643b6896e2af493160d8f7f2880f3"
dependencies = [
"i-slint-compiler",
"proc-macro2",
@ -5199,9 +5147,9 @@ dependencies = [
[[package]]
name = "smallvec"
version = "1.12.0"
version = "1.13.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2593d31f82ead8df961d8bd23a64c2ccf2eb5dd34b0a34bfb4dd54011c72009e"
checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7"
[[package]]
name = "smithay-client-toolkit"
@ -6139,9 +6087,9 @@ dependencies = [
[[package]]
name = "unicode-properties"
version = "0.1.0"
version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c7f91c8b21fbbaa18853c3d0801c78f4fc94cdb976699bb03e832e75f7fd22f0"
checksum = "e4259d9d4425d9f0661581b804cb85fe66a4c631cadd8f490d1c13a35d5d9291"
[[package]]
name = "unicode-script"
@ -6167,28 +6115,6 @@ version = "0.1.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85"
[[package]]
name = "untrusted"
version = "0.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1"
[[package]]
name = "ureq"
version = "2.9.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f8cdd25c339e200129fe4de81451814e5228c9b771d57378817d6117cc2b3f97"
dependencies = [
"base64",
"flate2",
"log",
"once_cell",
"rustls",
"rustls-webpki",
"url",
"webpki-roots",
]
[[package]]
name = "url"
version = "2.5.0"
@ -6276,9 +6202,9 @@ checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a"
[[package]]
name = "uuid"
version = "1.6.1"
version = "1.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5e395fcf16a7a3d8127ec99782007af141946b4795001f876d54fb0d55978560"
checksum = "f00cc9702ca12d3c81455259621e676d0f7251cec66a21e98fe2e9a37db93b2a"
[[package]]
name = "valuable"
@ -6327,7 +6253,7 @@ dependencies = [
[[package]]
name = "vtable"
version = "0.1.11"
source = "git+https://github.com/slint-ui/slint.git#7a295d1b75121fa1b21996588511c98772488fe4"
source = "git+https://github.com/slint-ui/slint.git#f809b3ff41b643b6896e2af493160d8f7f2880f3"
dependencies = [
"const-field-offset",
"portable-atomic",
@ -6338,7 +6264,7 @@ dependencies = [
[[package]]
name = "vtable-macro"
version = "0.1.10"
source = "git+https://github.com/slint-ui/slint.git#7a295d1b75121fa1b21996588511c98772488fe4"
source = "git+https://github.com/slint-ui/slint.git#f809b3ff41b643b6896e2af493160d8f7f2880f3"
dependencies = [
"proc-macro2",
"quote",
@ -6601,12 +6527,6 @@ dependencies = [
"wasm-bindgen",
]
[[package]]
name = "webpki-roots"
version = "0.25.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1778a42e8b3b90bff8d0f5032bf22250792889a5cdc752aa0020c84abe3aaf10"
[[package]]
name = "weezl"
version = "0.1.7"
@ -6683,6 +6603,16 @@ dependencies = [
"windows-targets 0.48.5",
]
[[package]]
name = "windows"
version = "0.52.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e48a53791691ab099e5e2ad123536d0fff50652600abaf43bbf952894110d0be"
dependencies = [
"windows-core",
"windows-targets 0.52.0",
]
[[package]]
name = "windows-core"
version = "0.52.0"

View file

@ -10,9 +10,9 @@
### CLI
- Providing full static rust binary with [Eyra](https://github.com/sunfishcode/eyra) - [#1102](https://github.com/qarmin/czkawka/pull/1102)
- Fixed duplicated `-c` argument, now saving as compact json is handled via `-C` - [#1153](https://github.com/qarmin/czkawka/pull/1153)
- Added progress bar - [#TODO]()
- Clean and safe cancelling of scan - [#TODO]()
- Unification of CLI arguments - [#TODO]()
- Added scan progress bar - [#1183](https://github.com/qarmin/czkawka/pull/1183)
- Clean and safe cancelling of scan - [#1183](https://github.com/qarmin/czkawka/pull/1183)
- Unification of CLI arguments - [#1183](https://github.com/qarmin/czkawka/pull/1183)
### Krokiet GUI
- Initial release of new gui - [#1102](https://github.com/qarmin/czkawka/pull/1102)
@ -31,6 +31,7 @@
- Unifying code for collecting files to scan - [#1159](https://github.com/qarmin/czkawka/pull/1159)
- Decrease memory usage when collecting files by removing unused fields in custom file entries structs - [#1159](https://github.com/qarmin/czkawka/pull/1159)
- Decrease a little size of cache by few percents and improve loading/saving speed - [#1159](https://github.com/qarmin/czkawka/pull/1159)
- Added ability to remove from scan files with excluded extensions - [#1184](https://github.com/qarmin/czkawka/pull/1102)
## Version 6.1.0 - 15.10.2023r
- BREAKING CHANGE - Changed cache saving method, deduplicated, optimized and simplified procedure(all files needs to be hashed again) - [#1072](https://github.com/qarmin/czkawka/pull/1072), [#1086](https://github.com/qarmin/czkawka/pull/1086)

View file

@ -192,12 +192,18 @@ upper_allowed_extensions_tooltip =
Usage example ".exe, IMAGE, VIDEO, .rar, 7z" - this means that images (e.g. jpg, png), videos (e.g. avi, mp4), exe, rar, and 7z files will be scanned.
upper_disabled_extensions_tooltip =
List of disabled files which will be ignored in scan.
When using both allowed and disabled extensions, this one has higher priority, so file will not be checked.
upper_excluded_items_tooltip =
Excluded items must contain * wildcard and should be separated by commas.
This is slower than Excluded Directories, so use it carefully.
upper_excluded_items = Excluded Items:
upper_allowed_extensions = Allowed Extensions:
upper_disabled_extensions = Disabled Extensions:
# Popovers

View file

@ -23,6 +23,7 @@ pub struct GuiUpperNotebook {
pub entry_excluded_items: gtk4::Entry,
pub entry_allowed_extensions: gtk4::Entry,
pub entry_disabled_extensions: gtk4::Entry,
pub check_button_recursive: gtk4::CheckButton,
@ -35,6 +36,7 @@ pub struct GuiUpperNotebook {
pub label_excluded_items: gtk4::Label,
pub label_allowed_extensions: gtk4::Label,
pub label_disabled_extensions: gtk4::Label,
pub entry_general_minimal_size: gtk4::Entry,
pub entry_general_maximal_size: gtk4::Entry,
@ -64,6 +66,7 @@ impl GuiUpperNotebook {
tree_view_excluded_directories.add_controller(gc_tree_view_excluded_directories.clone());
let entry_allowed_extensions: gtk4::Entry = builder.object("entry_allowed_extensions").unwrap();
let entry_disabled_extensions: gtk4::Entry = builder.object("entry_disabled_extensions").unwrap();
let entry_excluded_items: gtk4::Entry = builder.object("entry_excluded_items").unwrap();
let check_button_recursive: gtk4::CheckButton = builder.object("check_button_recursive").unwrap();
@ -77,6 +80,7 @@ impl GuiUpperNotebook {
let label_excluded_items: gtk4::Label = builder.object("label_excluded_items").unwrap();
let label_allowed_extensions: gtk4::Label = builder.object("label_allowed_extensions").unwrap();
let label_disabled_extensions: gtk4::Label = builder.object("label_disabled_extensions").unwrap();
let entry_general_minimal_size: gtk4::Entry = builder.object("entry_general_minimal_size").unwrap();
let entry_general_maximal_size: gtk4::Entry = builder.object("entry_general_maximal_size").unwrap();
@ -103,6 +107,7 @@ impl GuiUpperNotebook {
gc_tree_view_excluded_directories,
entry_excluded_items,
entry_allowed_extensions,
entry_disabled_extensions,
check_button_recursive,
buttons_manual_add_included_directory,
buttons_add_included_directory,
@ -112,6 +117,7 @@ impl GuiUpperNotebook {
buttons_remove_excluded_directory,
label_excluded_items,
label_allowed_extensions,
label_disabled_extensions,
entry_general_minimal_size,
entry_general_maximal_size,
label_general_size_bytes,
@ -141,11 +147,14 @@ impl GuiUpperNotebook {
self.label_allowed_extensions.set_tooltip_text(Some(&flg!("upper_allowed_extensions_tooltip")));
self.entry_allowed_extensions.set_tooltip_text(Some(&flg!("upper_allowed_extensions_tooltip")));
self.label_disabled_extensions.set_tooltip_text(Some(&flg!("upper_disabled_extensions_tooltip")));
self.entry_disabled_extensions.set_tooltip_text(Some(&flg!("upper_disabled_extensions_tooltip")));
self.label_excluded_items.set_tooltip_text(Some(&flg!("upper_excluded_items_tooltip")));
self.entry_excluded_items.set_tooltip_text(Some(&flg!("upper_excluded_items_tooltip")));
self.label_excluded_items.set_label(&flg!("upper_excluded_items"));
self.label_allowed_extensions.set_label(&flg!("upper_allowed_extensions"));
self.label_disabled_extensions.set_label(&flg!("upper_disabled_extensions"));
self.label_general_size_bytes.set_label(&flg!("main_label_size_bytes"));
self.label_general_min_size.set_label(&flg!("main_label_min_size"));

View file

@ -242,6 +242,8 @@
(5,237,"GtkScale","scale_similarity_same_music",117,None,None,None,9,None),
(5,238,"GtkLabel","label_same_music_seconds",117,None,None,None,6,None),
(5,239,"GtkLabel","label_same_music_similarity",117,None,None,None,8,None),
(5,240,"GtkLabel","label_disabled_extensions",46,None,None,None,2,None),
(5,241,"GtkEntry","entry_disabled_extensions",46,None,None,None,3,None),
(6,1,"GtkPopover","popover_right_click",None,None,None,None,None,None),
(6,2,"GtkBox",None,1,None,None,None,None,None),
(6,3,"GtkButton","buttons_popover_right_click_open_file",2,None,None,None,None,None),
@ -797,6 +799,9 @@
(5,239,"GtkLabel","label","Max difference",None,None,None,None,None,None,None,None,None),
(5,239,"GtkWidget","margin-end","5",None,None,None,None,None,None,None,None,None),
(5,239,"GtkWidget","margin-start","5",None,None,None,None,None,None,None,None,None),
(5,240,"GtkLabel","label","Disabled Extensions","yes",None,None,None,None,None,None,None,None),
(5,241,"GtkWidget","focusable","1",None,None,None,None,None,None,None,None,None),
(5,241,"GtkWidget","hexpand","1",None,None,None,None,None,None,None,None,None),
(6,1,"GtkPopover","child",None,None,None,None,None,2,None,None,None,None),
(6,1,"GtkPopover","position","left",None,None,None,None,None,None,None,None,None),
(6,2,"GtkOrientable","orientation","vertical",None,None,None,None,None,None,None,None,None),

View file

@ -269,6 +269,17 @@
<property name="hexpand">1</property>
</object>
</child>
<child>
<object class="GtkLabel" id="label_disabled_extensions">
<property name="label" translatable="yes">Disabled Extensions</property>
</object>
</child>
<child>
<object class="GtkEntry" id="entry_disabled_extensions">
<property name="focusable">1</property>
<property name="hexpand">1</property>
</object>
</child>
</object>
</child>
<child>