diff --git a/czkawka_cli/src/commands.rs b/czkawka_cli/src/commands.rs index b31148e..736a33e 100644 --- a/czkawka_cli/src/commands.rs +++ b/czkawka_cli/src/commands.rs @@ -7,13 +7,13 @@ use czkawka_core::common_tool::DeleteMethod; use czkawka_core::duplicate::HashType; use czkawka_core::same_music::MusicSimilarity; use czkawka_core::similar_images::SimilarityPreset; -use czkawka_core::MAIN_SEPARATOR; +use czkawka_core::CZKAWKA_VERSION; #[derive(clap::Parser)] #[clap( name = "czkawka", help_template = HELP_TEMPLATE, - version = MAIN_SEPARATOR + version = CZKAWKA_VERSION )] pub struct Args { #[command(subcommand)] diff --git a/czkawka_core/src/common.rs b/czkawka_core/src/common.rs index 6c47810..b0515ba 100644 --- a/czkawka_core/src/common.rs +++ b/czkawka_core/src/common.rs @@ -36,7 +36,7 @@ use crate::common_messages::Messages; use crate::common_tool::DeleteMethod; use crate::common_traits::ResultEntry; use crate::duplicate::make_hard_link; -use crate::MAIN_SEPARATOR; +use crate::CZKAWKA_VERSION; static NUMBER_OF_THREADS: state::InitCell = state::InitCell::new(); pub const DEFAULT_THREAD_SIZE: usize = 8 * 1024 * 1024; // 8 MB @@ -78,7 +78,7 @@ pub fn print_version_mode() { let info = os_info::get(); info!( - "App version: {MAIN_SEPARATOR}, {debug_release} mode, rust {rust_version}, os {} {} [{} {}], {processors} cpu/threads", + "App version: {CZKAWKA_VERSION}, {debug_release} mode, rust {rust_version}, os {} {} [{} {}], {processors} cpu/threads", info.os_type(), info.version(), std::env::consts::ARCH, diff --git a/czkawka_core/src/lib.rs b/czkawka_core/src/lib.rs index c4e36dd..947b785 100644 --- a/czkawka_core/src/lib.rs +++ b/czkawka_core/src/lib.rs @@ -29,4 +29,4 @@ pub mod common_tool; pub mod common_traits; pub mod localizer_core; -pub const MAIN_SEPARATOR: &str = env!("CARGO_PKG_VERSION"); +pub const CZKAWKA_VERSION: &str = env!("CARGO_PKG_VERSION"); diff --git a/krokiet/src/common.rs b/krokiet/src/common.rs index caf63da..6d3fcb7 100644 --- a/krokiet/src/common.rs +++ b/krokiet/src/common.rs @@ -1,8 +1,6 @@ use std::path::PathBuf; -use crate::CurrentTab; -use crate::ExcludedDirectoriesModel; -use crate::IncludedDirectoriesModel; +use crate::{CurrentTab, ExcludedDirectoriesModel, IncludedDirectoriesModel}; use slint::{ModelRc, SharedString, VecModel}; // Remember to match updated this according to ui/main_lists.slint and connect_scan.rs files