Skip to content

Commit e509270

Browse files
committed
Revert "Pass"
This reverts commit 4b7ab5c.
1 parent 4bfc44c commit e509270

17 files changed

Lines changed: 33 additions & 928 deletions

File tree

Cargo.lock

Lines changed: 0 additions & 15 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

czkawka_cli/src/commands.rs

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -505,27 +505,6 @@ pub struct SimilarVideosArgs {
505505
long_help = "Duration of video scanning in seconds. Longer duration provides more accurate results but takes more time. Allowed values are predefined in the application."
506506
)]
507507
pub scan_duration: u32,
508-
#[clap(
509-
long,
510-
default_value = "vid-dup-finder",
511-
help = "Similarity engine: vid-dup-finder (default), perceptual, audio",
512-
long_help = "Algorithm used to detect similar videos. 'vid-dup-finder' is the original engine. 'perceptual' uses sliding-window pHash (similarrio_videoo). 'audio' uses Chromaprint audio fingerprinting."
513-
)]
514-
pub engine: String,
515-
#[clap(
516-
long,
517-
default_value = "balanced",
518-
help = "Perceptual engine preset: fastest, fast, balanced, thorough, maximum",
519-
long_help = "Quality/speed preset for the 'perceptual' engine. fastest=30 frames, fast=100, balanced=300, thorough=600, maximum=1200."
520-
)]
521-
pub perceptual_preset: String,
522-
#[clap(
523-
long,
524-
default_value = "full",
525-
help = "Audio engine preset: full, fast-2min, skip-intros",
526-
long_help = "Preset for the 'audio' engine. 'full' uses the whole audio track. 'fast-2min' limits to 120 s. 'skip-intros' skips first 120 s for videos longer than 600 s."
527-
)]
528-
pub audio_preset: String,
529508
}
530509

531510
#[derive(Debug, clap::Args)]

czkawka_cli/src/main.rs

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ use czkawka_core::tools::exif_remover::{ExifRemover, ExifRemoverParameters, Exif
2525
use czkawka_core::tools::invalid_symlinks::InvalidSymlinks;
2626
use czkawka_core::tools::same_music::{SameMusic, SameMusicParameters};
2727
use czkawka_core::tools::similar_images::{SimilarImages, SimilarImagesParameters};
28-
use czkawka_core::tools::similar_videos::{SimilarVideos, SimilarVideosEngine, SimilarVideosParameters};
28+
use czkawka_core::tools::similar_videos::{SimilarVideos, SimilarVideosParameters};
2929
use czkawka_core::tools::temporary::Temporary;
3030
use czkawka_core::tools::video_optimizer::{
3131
HardwareEncoder, VideoCropFixParams, VideoCropParams, VideoCroppingMechanism, VideoOptimizer, VideoOptimizerFixParams, VideoOptimizerParameters, VideoTranscodeFixParams,
@@ -331,13 +331,8 @@ fn similar_videos(similar_videos: SimilarVideosArgs, stop_flag: &Arc<AtomicBool>
331331
skip_forward_amount,
332332
crop_detect,
333333
scan_duration,
334-
engine,
335-
perceptual_preset,
336-
audio_preset,
337334
} = similar_videos;
338335

339-
let similarity_engine = SimilarVideosEngine::from_str_opt(&engine, &perceptual_preset, &audio_preset).unwrap_or_default();
340-
341336
let params = SimilarVideosParameters::new(
342337
tolerance,
343338
ignore_same_size.ignore_same_size,
@@ -349,7 +344,6 @@ fn similar_videos(similar_videos: SimilarVideosArgs, stop_flag: &Arc<AtomicBool>
349344
10, // creating thumbnails in CLI, makes almost no sense
350345
false, // creating thumbnails in CLI, makes almost no sense
351346
2, // creating thumbnails in CLI, makes almost no sense
352-
similarity_engine,
353347
);
354348
let mut tool = SimilarVideos::new(params);
355349

czkawka_core/Cargo.toml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,6 @@ tempfile = "3.13"
5151
vid_dup_finder_lib = "0.4"
5252
filetime = "0.2.26"
5353

54-
# Perceptual video / audio similarity (alternative engine)
55-
similarrio_videoo = { path = "../../similarrio_videoo", features = ["audio"] }
56-
5754
# For extracting video properties using ffprobe CLI
5855
# https://github.com/theduke/ffprobe-rs/issues/33
5956
#ffprobe = "0.4.0"

czkawka_core/src/common/cache.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,6 @@ pub(crate) const CACHE_IMAGE_VERSION: u8 = 100;
3030
pub(crate) const CACHE_VIDEO_VERSION: u8 = 110;
3131
pub(crate) const CACHE_BROKEN_FILES_VERSION: u8 = 120;
3232
pub(crate) const CACHE_VIDEO_OPTIMIZE_VERSION: u8 = 110;
33-
pub(crate) const CACHE_PERCEPTUAL_VIDEO_VERSION: u8 = 100;
34-
pub(crate) const CACHE_AUDIO_VIDEO_VERSION: u8 = 100;
3533

3634
const MEMORY_LIMIT: u64 = 8 * 1024 * 1024 * 1024;
3735
const CLEANING_TIMESTAMPS_FILE: &str = "cleaning_timestamps.json";

0 commit comments

Comments
 (0)