Skip to content

Commit a0bb1be

Browse files
qarminqarmin
committed
W
1 parent 092dc6c commit a0bb1be

3 files changed

Lines changed: 54 additions & 46 deletions

File tree

‎.github/workflows/linux.yml‎

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -244,25 +244,33 @@ jobs:
244244
linux_czkawka_gui_minimal.AppImage
245245
token: ${{ secrets.PAT_REPOSITORY }}
246246

247-
linux-tests-on-minimal-rust-version:
247+
linux-tests:
248248
runs-on: ubuntu-22.04
249249
steps:
250250
- uses: actions/checkout@v4
251251

252-
- name: Install basic libraries
253-
run: sudo apt update || true; sudo apt install libgtk-4-dev libheif-dev libraw-dev ffmpeg -y
254-
255252
- name: Setup rust version
256253
run: rustup default 1.85.0
257254

258255
- name: Test
259256
run: |
260257
xvfb-run cargo test
261258
259+
linux-regression-tests-on-minimal-rust-version:
260+
runs-on: ubuntu-22.04
261+
steps:
262+
- uses: actions/checkout@v4
263+
264+
- name: Install basic libraries
265+
run: sudo apt update || true; sudo apt install libgtk-4-dev libheif-dev libraw-dev -y
266+
267+
- name: Setup rust version
268+
run: rustup default 1.85.0
269+
262270
- name: Build
263271
run: |
264-
cargo build
265-
cargo build --features "heif,libraw"
272+
cargo check
273+
cargo check --features "heif,libraw"
266274
267275
- name: Build test version
268276
run: cargo build --profile test --bin czkawka_cli

‎ci_tester/src/main.rs‎

Lines changed: 39 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -89,16 +89,16 @@ fn main() {
8989
}
9090
fn test_remove_videos_one_oldest() {
9191
info!("test_remove_videos_one_oldest");
92-
run_test(&["video", "-d", "TestFiles", "-D", "OO", "-T"], vec!["Videos/V3.webm"], vec![], vec![]);
92+
run_test(&["video", "-d", "TestFiles", "-D", "OO", "-W"], vec!["Videos/V3.webm"], vec![], vec![]);
9393
}
9494
fn test_remove_videos_one_newest() {
9595
info!("test_remove_videos_one_newest");
96-
run_test(&["video", "-d", "TestFiles", "-D", "ON", "-T"], vec!["Videos/V5.mp4"], vec![], vec![]);
96+
run_test(&["video", "-d", "TestFiles", "-D", "ON", "-W"], vec!["Videos/V5.mp4"], vec![], vec![]);
9797
}
9898
fn test_remove_videos_all_expect_oldest() {
9999
info!("test_remove_videos_all_expect_oldest");
100100
run_test(
101-
&["video", "-d", "TestFiles", "-D", "AEO", "-T"],
101+
&["video", "-d", "TestFiles", "-D", "AEO", "-W"],
102102
vec!["Videos/V1.mp4", "Videos/V2.mp4", "Videos/V5.mp4"],
103103
vec![],
104104
vec![],
@@ -107,24 +107,24 @@ fn test_remove_videos_all_expect_oldest() {
107107
fn test_remove_videos_all_expect_newest() {
108108
info!("test_remove_videos_all_expect_newest");
109109
run_test(
110-
&["video", "-d", "TestFiles", "-D", "AEN", "-T"],
110+
&["video", "-d", "TestFiles", "-D", "AEN", "-W"],
111111
vec!["Videos/V1.mp4", "Videos/V2.mp4", "Videos/V3.webm"],
112112
vec![],
113113
vec![],
114114
);
115115
}
116116
fn test_remove_videos_one_smallest() {
117117
info!("test_remove_videos_one_smallest");
118-
run_test(&["video", "-d", "TestFiles", "-D", "OS", "-T"], vec!["Videos/V2.mp4"], vec![], vec![]);
118+
run_test(&["video", "-d", "TestFiles", "-D", "OS", "-W"], vec!["Videos/V2.mp4"], vec![], vec![]);
119119
}
120120
fn test_remove_videos_one_biggest() {
121121
info!("test_remove_videos_one_biggest");
122-
run_test(&["video", "-d", "TestFiles", "-D", "OB", "-T"], vec!["Videos/V3.webm"], vec![], vec![]);
122+
run_test(&["video", "-d", "TestFiles", "-D", "OB", "-W"], vec!["Videos/V3.webm"], vec![], vec![]);
123123
}
124124
fn test_remove_videos_all_expect_smallest() {
125125
info!("test_remove_videos_all_expect_smallest");
126126
run_test(
127-
&["video", "-d", "TestFiles", "-D", "AES", "-T"],
127+
&["video", "-d", "TestFiles", "-D", "AES", "-W"],
128128
vec!["Videos/V1.mp4", "Videos/V3.webm", "Videos/V5.mp4"],
129129
vec![],
130130
vec![],
@@ -133,7 +133,7 @@ fn test_remove_videos_all_expect_smallest() {
133133
fn test_remove_videos_all_expect_biggest() {
134134
info!("test_remove_videos_all_expect_biggest");
135135
run_test(
136-
&["video", "-d", "TestFiles", "-D", "AEB", "-T"],
136+
&["video", "-d", "TestFiles", "-D", "AEB", "-W"],
137137
vec!["Videos/V1.mp4", "Videos/V2.mp4", "Videos/V5.mp4"],
138138
vec![],
139139
vec![],
@@ -143,7 +143,7 @@ fn test_remove_videos_all_expect_biggest() {
143143
fn test_remove_same_music_content_one_newest() {
144144
info!("test_remove_same_music_content_one_newest");
145145
run_test(
146-
&["music", "-d", "TestFiles", "-s", "CONTENT", "-l", "2.0", "-D", "ON", "-T"],
146+
&["music", "-d", "TestFiles", "-s", "CONTENT", "-l", "2.0", "-D", "ON", "-W"],
147147
vec!["Music/M2.mp3"],
148148
vec![],
149149
vec![],
@@ -152,7 +152,7 @@ fn test_remove_same_music_content_one_newest() {
152152
fn test_remove_same_music_content_all_expect_newest() {
153153
info!("test_remove_same_music_content_all_expect_newest");
154154
run_test(
155-
&["music", "-d", "TestFiles", "-s", "CONTENT", "-l", "2.0", "-D", "AEN", "-T"],
155+
&["music", "-d", "TestFiles", "-s", "CONTENT", "-l", "2.0", "-D", "AEN", "-W"],
156156
vec!["Music/M1.mp3", "Music/M3.flac", "Music/M5.mp3"],
157157
vec![],
158158
vec![],
@@ -162,7 +162,7 @@ fn test_remove_same_music_content_all_expect_newest() {
162162
fn test_remove_same_music_content_all_expect_oldest() {
163163
info!("test_remove_same_music_content_all_expect_oldest");
164164
run_test(
165-
&["music", "-d", "TestFiles", "-s", "CONTENT", "-l", "2.0", "-D", "AEO", "-T"],
165+
&["music", "-d", "TestFiles", "-s", "CONTENT", "-l", "2.0", "-D", "AEO", "-W"],
166166
vec!["Music/M1.mp3", "Music/M2.mp3", "Music/M3.flac"],
167167
vec![],
168168
vec![],
@@ -172,7 +172,7 @@ fn test_remove_same_music_content_all_expect_oldest() {
172172
fn test_remove_same_music_content_one_oldest() {
173173
info!("test_remove_same_music_content_one_oldest");
174174
run_test(
175-
&["music", "-d", "TestFiles", "-s", "CONTENT", "-l", "2.0", "-D", "OO", "-T"],
175+
&["music", "-d", "TestFiles", "-s", "CONTENT", "-l", "2.0", "-D", "OO", "-W"],
176176
vec!["Music/M5.mp3"],
177177
vec![],
178178
vec![],
@@ -181,7 +181,7 @@ fn test_remove_same_music_content_one_oldest() {
181181
fn test_remove_same_music_content_one_biggest() {
182182
info!("test_remove_same_music_content_one_biggest");
183183
run_test(
184-
&["music", "-d", "TestFiles", "-s", "CONTENT", "-l", "2.0", "-D", "OB", "-T"],
184+
&["music", "-d", "TestFiles", "-s", "CONTENT", "-l", "2.0", "-D", "OB", "-W"],
185185
vec!["Music/M3.flac"],
186186
vec![],
187187
vec![],
@@ -190,7 +190,7 @@ fn test_remove_same_music_content_one_biggest() {
190190
fn test_remove_same_music_content_all_expect_biggest() {
191191
info!("test_remove_same_music_content_all_expect_biggest");
192192
run_test(
193-
&["music", "-d", "TestFiles", "-s", "CONTENT", "-l", "2.0", "-D", "AEB", "-T"],
193+
&["music", "-d", "TestFiles", "-s", "CONTENT", "-l", "2.0", "-D", "AEB", "-W"],
194194
vec!["Music/M1.mp3", "Music/M2.mp3", "Music/M5.mp3"],
195195
vec![],
196196
vec![],
@@ -200,7 +200,7 @@ fn test_remove_same_music_content_all_expect_biggest() {
200200
fn test_remove_same_music_content_all_expect_smallest() {
201201
info!("test_remove_same_music_content_all_expect_smallest");
202202
run_test(
203-
&["music", "-d", "TestFiles", "-s", "CONTENT", "-l", "2.0", "-D", "AES", "-T"],
203+
&["music", "-d", "TestFiles", "-s", "CONTENT", "-l", "2.0", "-D", "AES", "-W"],
204204
vec!["Music/M1.mp3", "Music/M3.flac", "Music/M5.mp3"],
205205
vec![],
206206
vec![],
@@ -210,24 +210,24 @@ fn test_remove_same_music_content_all_expect_smallest() {
210210
fn test_remove_same_music_content_one_smallest() {
211211
info!("test_remove_same_music_content_one_smallest");
212212
run_test(
213-
&["music", "-d", "TestFiles", "-s", "CONTENT", "-l", "2.0", "-D", "OS", "-T"],
213+
&["music", "-d", "TestFiles", "-s", "CONTENT", "-l", "2.0", "-D", "OS", "-W"],
214214
vec!["Music/M2.mp3"],
215215
vec![],
216216
vec![],
217217
);
218218
}
219219
fn test_remove_same_music_tags_one_oldest() {
220220
info!("test_remove_same_music_one_oldest");
221-
run_test(&["music", "-d", "TestFiles", "-D", "OO", "-T"], vec!["Music/M5.mp3"], vec![], vec![]);
221+
run_test(&["music", "-d", "TestFiles", "-D", "OO", "-W"], vec!["Music/M5.mp3"], vec![], vec![]);
222222
}
223223
fn test_remove_same_music_tags_one_newest() {
224224
info!("test_remove_same_music_one_newest");
225-
run_test(&["music", "-d", "TestFiles", "-D", "ON", "-T"], vec!["Music/M2.mp3"], vec![], vec![]);
225+
run_test(&["music", "-d", "TestFiles", "-D", "ON", "-W"], vec!["Music/M2.mp3"], vec![], vec![]);
226226
}
227227
fn test_remove_same_music_tags_all_expect_oldest() {
228228
info!("test_remove_same_music_all_expect_oldest");
229229
run_test(
230-
&["music", "-d", "TestFiles", "-D", "AEO", "-T"],
230+
&["music", "-d", "TestFiles", "-D", "AEO", "-W"],
231231
vec!["Music/M1.mp3", "Music/M2.mp3", "Music/M3.flac"],
232232
vec![],
233233
vec![],
@@ -236,24 +236,24 @@ fn test_remove_same_music_tags_all_expect_oldest() {
236236
fn test_remove_same_music_tags_all_expect_newest() {
237237
info!("test_remove_same_music_all_expect_newest");
238238
run_test(
239-
&["music", "-d", "TestFiles", "-D", "AEN", "-T"],
239+
&["music", "-d", "TestFiles", "-D", "AEN", "-W"],
240240
vec!["Music/M1.mp3", "Music/M3.flac", "Music/M5.mp3"],
241241
vec![],
242242
vec![],
243243
);
244244
}
245245
fn test_remove_same_music_tags_one_smallest() {
246246
info!("test_remove_same_music_one_smallest");
247-
run_test(&["music", "-d", "TestFiles", "-D", "OS", "-T"], vec!["Music/M1.mp3"], vec![], vec![]);
247+
run_test(&["music", "-d", "TestFiles", "-D", "OS", "-W"], vec!["Music/M1.mp3"], vec![], vec![]);
248248
}
249249
fn test_remove_same_music_tags_one_biggest() {
250250
info!("test_remove_same_music_one_biggest");
251-
run_test(&["music", "-d", "TestFiles", "-D", "OB", "-T"], vec!["Music/M3.flac"], vec![], vec![]);
251+
run_test(&["music", "-d", "TestFiles", "-D", "OB", "-W"], vec!["Music/M3.flac"], vec![], vec![]);
252252
}
253253
fn test_remove_same_music_tags_all_expect_smallest() {
254254
info!("test_remove_same_music_all_expect_smallest");
255255
run_test(
256-
&["music", "-d", "TestFiles", "-D", "AES", "-T"],
256+
&["music", "-d", "TestFiles", "-D", "AES", "-W"],
257257
vec!["Music/M2.mp3", "Music/M3.flac", "Music/M5.mp3"],
258258
vec![],
259259
vec![],
@@ -262,7 +262,7 @@ fn test_remove_same_music_tags_all_expect_smallest() {
262262
fn test_remove_same_music_tags_all_expect_biggest() {
263263
info!("test_remove_same_music_all_expect_biggest");
264264
run_test(
265-
&["music", "-d", "TestFiles", "-D", "AEB", "-T"],
265+
&["music", "-d", "TestFiles", "-D", "AEB", "-W"],
266266
vec!["Music/M1.mp3", "Music/M2.mp3", "Music/M5.mp3"],
267267
vec![],
268268
vec![],
@@ -271,7 +271,7 @@ fn test_remove_same_music_tags_all_expect_biggest() {
271271
fn test_remove_duplicates_all_expect_oldest() {
272272
info!("test_remove_duplicates_all_expect_oldest");
273273
run_test(
274-
&["dup", "-d", "TestFiles", "-D", "AEO", "-T"],
274+
&["dup", "-d", "TestFiles", "-D", "AEO", "-W"],
275275
vec!["Images/A1.jpg", "Images/A5.jpg", "Music/M1.mp3", "Music/M2.mp3", "Videos/V1.mp4", "Videos/V5.mp4"],
276276
vec![],
277277
vec![],
@@ -280,7 +280,7 @@ fn test_remove_duplicates_all_expect_oldest() {
280280
fn test_remove_duplicates_all_expect_newest() {
281281
info!("test_remove_duplicates_all_expect_newest");
282282
run_test(
283-
&["dup", "-d", "TestFiles", "-D", "AEN", "-T"],
283+
&["dup", "-d", "TestFiles", "-D", "AEN", "-W"],
284284
vec!["Images/A2.jpg", "Images/A5.jpg", "Music/M1.mp3", "Music/M5.mp3", "Videos/V1.mp4", "Videos/V2.mp4"],
285285
vec![],
286286
vec![],
@@ -290,7 +290,7 @@ fn test_remove_duplicates_all_expect_newest() {
290290
fn test_remove_duplicates_one_newest() {
291291
info!("test_remove_duplicates_one_newest");
292292
run_test(
293-
&["dup", "-d", "TestFiles", "-D", "ON", "-T"],
293+
&["dup", "-d", "TestFiles", "-D", "ON", "-W"],
294294
vec!["Images/A1.jpg", "Music/M2.mp3", "Videos/V5.mp4"],
295295
vec![],
296296
vec![],
@@ -299,7 +299,7 @@ fn test_remove_duplicates_one_newest() {
299299
fn test_remove_duplicates_one_oldest() {
300300
info!("test_remove_duplicates_one_oldest");
301301
run_test(
302-
&["dup", "-d", "TestFiles", "-D", "OO", "-T"],
302+
&["dup", "-d", "TestFiles", "-D", "OO", "-W"],
303303
vec!["Images/A2.jpg", "Music/M5.mp3", "Videos/V2.mp4"],
304304
vec![],
305305
vec![],
@@ -308,7 +308,7 @@ fn test_remove_duplicates_one_oldest() {
308308
fn test_remove_duplicates_all_expect_smallest() {
309309
info!("test_remove_duplicates_all_expect_smallest");
310310
run_test(
311-
&["dup", "-d", "TestFiles", "-D", "AES", "-T"],
311+
&["dup", "-d", "TestFiles", "-D", "AES", "-W"],
312312
vec!["Images/A2.jpg", "Images/A5.jpg", "Music/M2.mp3", "Music/M5.mp3", "Videos/V2.mp4", "Videos/V5.mp4"],
313313
vec![],
314314
vec![],
@@ -317,7 +317,7 @@ fn test_remove_duplicates_all_expect_smallest() {
317317
fn test_remove_duplicates_all_expect_biggest() {
318318
info!("test_remove_duplicates_all_expect_biggest");
319319
run_test(
320-
&["dup", "-d", "TestFiles", "-D", "AEN", "-T"],
320+
&["dup", "-d", "TestFiles", "-D", "AEN", "-W"],
321321
vec!["Images/A2.jpg", "Images/A5.jpg", "Music/M1.mp3", "Music/M5.mp3", "Videos/V1.mp4", "Videos/V2.mp4"],
322322
vec![],
323323
vec![],
@@ -327,7 +327,7 @@ fn test_remove_duplicates_all_expect_biggest() {
327327
fn test_remove_duplicates_one_biggest() {
328328
info!("test_remove_duplicates_one_biggest");
329329
run_test(
330-
&["dup", "-d", "TestFiles", "-D", "ON", "-T"],
330+
&["dup", "-d", "TestFiles", "-D", "ON", "-W"],
331331
vec!["Images/A1.jpg", "Music/M2.mp3", "Videos/V5.mp4"],
332332
vec![],
333333
vec![],
@@ -336,7 +336,7 @@ fn test_remove_duplicates_one_biggest() {
336336
fn test_remove_duplicates_one_smallest() {
337337
info!("test_remove_duplicates_one_smallest");
338338
run_test(
339-
&["dup", "-d", "TestFiles", "-D", "OS", "-T"],
339+
&["dup", "-d", "TestFiles", "-D", "OS", "-W"],
340340
vec!["Images/A1.jpg", "Music/M1.mp3", "Videos/V1.mp4"],
341341
vec![],
342342
vec![],
@@ -345,16 +345,16 @@ fn test_remove_duplicates_one_smallest() {
345345

346346
fn test_symlinks_files() {
347347
info!("test_symlinks_files");
348-
run_test(&["symlinks", "-d", "TestFiles", "-D", "-T"], vec![], vec![], vec!["Symlinks/EmptyFiles"]);
348+
run_test(&["symlinks", "-d", "TestFiles", "-D", "-W"], vec![], vec![], vec!["Symlinks/EmptyFiles"]);
349349
}
350350
fn test_temporary_files() {
351351
info!("test_temporary_files");
352-
run_test(&["temp", "-d", "TestFiles", "-D", "-T"], vec!["Temporary/Boczze.cache"], vec![], vec![]);
352+
run_test(&["temp", "-d", "TestFiles", "-D", "-W"], vec!["Temporary/Boczze.cache"], vec![], vec![]);
353353
}
354354
fn test_empty_folders() {
355355
info!("test_empty_folders");
356356
run_test(
357-
&["empty-folders", "-d", "TestFiles", "-D", "-T"],
357+
&["empty-folders", "-d", "TestFiles", "-D", "-W"],
358358
vec![],
359359
vec!["EmptyFolders/One", "EmptyFolders/Two", "EmptyFolders/Two/TwoInside"],
360360
vec![],
@@ -364,7 +364,7 @@ fn test_empty_folders() {
364364
fn test_biggest_files() {
365365
info!("test_biggest_files");
366366
run_test(
367-
&["big", "-d", "TestFiles", "-n", "6", "-D", "-T"],
367+
&["big", "-d", "TestFiles", "-n", "6", "-D", "-W"],
368368
vec!["Music/M3.flac", "Music/M4.mp3", "Videos/V2.mp4", "Videos/V3.webm", "Videos/V1.mp4", "Videos/V5.mp4"],
369369
vec![],
370370
vec![],
@@ -374,7 +374,7 @@ fn test_biggest_files() {
374374
fn test_smallest_files() {
375375
info!("test_smallest_files");
376376
run_test(
377-
&["big", "-d", "TestFiles", "-J", "-n", "5", "-D", "-T"],
377+
&["big", "-d", "TestFiles", "-J", "-n", "5", "-D", "-W"],
378378
vec!["Broken/Br.jpg", "Broken/Br.mp3", "Broken/Br.pdf", "Broken/Br.zip", "EmptyFolders/ThreeButNot/KEKEKE"],
379379
vec![],
380380
vec![],
@@ -383,12 +383,12 @@ fn test_smallest_files() {
383383

384384
fn test_empty_files() {
385385
info!("test_empty_files");
386-
run_test(&["empty-files", "-d", "TestFiles", "-D", "-T"], vec!["EmptyFile"], vec![], vec![]);
386+
run_test(&["empty-files", "-d", "TestFiles", "-D", "-W"], vec!["EmptyFile"], vec![], vec![]);
387387
}
388388

389389
fn test_big_files() {
390390
info!("test_big_files");
391-
run_test(&["big", "-d", "TestFiles", "-n", "2", "-D", "-T"], vec!["Music/M4.mp3", "Videos/V3.webm"], vec![], vec![]);
391+
run_test(&["big", "-d", "TestFiles", "-n", "2", "-D", "-W"], vec!["Music/M4.mp3", "Videos/V3.webm"], vec![], vec![]);
392392
}
393393

394394
////////////////////////////////////

‎czkawka_cli/src/commands.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -482,7 +482,7 @@ pub struct CommonCliItems {
482482
pub exclude_other_filesystems: bool,
483483
#[clap(flatten)]
484484
pub do_not_print: DoNotPrint,
485-
#[clap(short = 'T', long, help = "Ignore error code when files are found")]
485+
#[clap(short = 'W', long, help = "Ignore error code when files are found")]
486486
pub ignore_error_code_on_found: bool,
487487
}
488488

0 commit comments

Comments
 (0)