CodeMirror
/
czkawka
mirror of
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix some typos in words and remove empty space

This commit is contained in:
Rafał Mikrut 2020-09-26 17:16:12 +02:00
parent 8161a1c59b
commit 85432f1c18
7 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
README.md
View File

@ -32,7 +32,7 @@ This is my first ever project in Rust so probably a lot of things are written in
- GTK Gui
- Selection of records(don't know how to do this)
- Popups
- Choosing directories(include, excluded)
- Choosing directories(included, excluded)
- Popup with type of deleted records
- Add Czkawka name to main window(now is czkawka_gui)
- Run in another thread searching to be able to pause
@ -81,8 +81,8 @@ Next, this included and excluded folders are optimized due to tree structure of
- Folders which contains another folders are combined(separately for included and excluded) - `/home/pulpet` and `/home/pulpet/a` are combined to `/home/pulpet`
- Included folders which are located inside excluded ones are delete - Included folder `/etc/tomcat/` is deleted because excluded folder is `/etc/`
- Non existed directories are being removed
- Excluded path which are outside include path are deleted - Exclude path `/etc/` is removed if included path is `/home/`
If after optimization there is no include folders, then program ends with non zero value(TODO, this should be handled by returning value).
- Excluded path which are outside included path are deleted - Excluded path `/etc/` is removed if included path is `/home/`
If after optimization there is no included folders, then program ends with non zero value(TODO, this should be handled by returning value).
Next with provided by user minimal size of checked size `-s`, program checks recursively(TODO should be an option to turn off a recursion) included folders and checks files by sizes and put it files with same sizes to different boxes.
Next boxes which contains only one element are removed because files inside are not duplicated.

6
czkawka_core/src/big_file.rs
View File

@ -270,7 +270,7 @@ impl BigFile {
self.directories.optimize_directories(self.recursive_search, &mut self.text_messages);
}
/// Setting include directories, at least one must be provided
/// Setting included directories, at least one must be provided
pub fn set_included_directory(&mut self, included_directory: String) {
self.directories.set_included_directory(included_directory, &mut self.text_messages);
}
@ -354,7 +354,7 @@ impl SaveResults for BigFile {
for (size, files) in self.big_files.iter().rev() {
for file_entry in files {
file.write_all(format!("{} ({}) - {}\n", size.file_size(options::BINARY).unwrap(), size, file_entry.path.clone()).as_bytes()).unwrap();
file.write_all(format!("{} ({}) - {}\n", size.file_size(options::BINARY).unwrap(), size, file_entry.path.clone()).as_bytes()).unwrap();
}
}
} else {
@ -371,7 +371,7 @@ impl PrintResults for BigFile {
for (size, vector) in self.big_files.iter().rev() {
// TODO Align all to same width
for entry in vector {
println!("{} ({}) - {}", size.file_size(options::BINARY).unwrap(), size, entry.path);
println!("{} ({}) - {}", size.file_size(options::BINARY).unwrap(), size, entry.path);
}
}
Common::print_time(start_time, SystemTime::now(), "print_duplicated_entries".to_string());

26
czkawka_core/src/common_directory.rs
View File

@ -15,7 +15,7 @@ impl Directories {
}
}
/// Setting include directories, at least one must be provided
/// Setting included directories, at least one must be provided
pub fn set_included_directory(&mut self, mut included_directory: String, text_messages: &mut Messages) -> bool {
let start_time: SystemTime = SystemTime::now();
@ -35,19 +35,19 @@ impl Directories {
continue;
}
if directory.contains('*') {
text_messages.warnings.push("Include Directory Warning: Wildcards in path are not supported, ignoring ".to_string() + directory.as_str());
text_messages.warnings.push("Included Directory Warning: Wildcards in path are not supported, ignoring ".to_string() + directory.as_str());
continue;
}
if !directory.starts_with('/') {
text_messages.warnings.push("Include Directory Warning: Relative path are not supported, ignoring ".to_string() + directory.as_str());
text_messages.warnings.push("Included Directory Warning: Relative path are not supported, ignoring ".to_string() + directory.as_str());
continue;
}
if !Path::new(&directory).exists() {
text_messages.warnings.push("Include Directory Warning: Provided folder path must exits, ignoring ".to_string() + directory.as_str());
text_messages.warnings.push("Included Directory Warning: Provided folder path must exits, ignoring ".to_string() + directory.as_str());
continue;
}
if !Path::new(&directory).is_dir() {
text_messages.warnings.push("Include Directory Warning: Provided path must point at the directory, ignoring ".to_string() + directory.as_str());
text_messages.warnings.push("Included Directory Warning: Provided path must point at the directory, ignoring ".to_string() + directory.as_str());
continue;
}
@ -60,7 +60,7 @@ impl Directories {
}
if checked_directories.is_empty() {
text_messages.errors.push("Include Directory ERROR: Not found even one correct path to include which is required.".to_string());
text_messages.errors.push("Included Directory ERROR: Not found even one correct path to included which is required.".to_string());
return false;
}
@ -88,23 +88,23 @@ impl Directories {
continue;
}
if directory == "/" {
text_messages.errors.push("Exclude Directory ERROR: Excluding / is pointless, because it means that no files will be scanned.".to_string());
text_messages.errors.push("Excluded Directory ERROR: Excluding / is pointless, because it means that no files will be scanned.".to_string());
break;
}
if directory.contains('*') {
text_messages.warnings.push("Exclude Directory Warning: Wildcards in path are not supported, ignoring ".to_string() + directory.as_str());
text_messages.warnings.push("Excluded Directory Warning: Wildcards in path are not supported, ignoring ".to_string() + directory.as_str());
continue;
}
if !directory.starts_with('/') {
text_messages.warnings.push("Exclude Directory Warning: Relative path are not supported, ignoring ".to_string() + directory.as_str());
text_messages.warnings.push("Excluded Directory Warning: Relative path are not supported, ignoring ".to_string() + directory.as_str());
continue;
}
if !Path::new(&directory).exists() {
text_messages.warnings.push("Exclude Directory Warning: Provided folder path must exits, ignoring ".to_string() + directory.as_str());
text_messages.warnings.push("Excluded Directory Warning: Provided folder path must exits, ignoring ".to_string() + directory.as_str());
continue;
}
if !Path::new(&directory).is_dir() {
text_messages.warnings.push("Exclude Directory Warning: Provided path must point at the directory, ignoring ".to_string() + directory.as_str());
text_messages.warnings.push("Excluded Directory Warning: Provided path must point at the directory, ignoring ".to_string() + directory.as_str());
continue;
}
@ -179,7 +179,7 @@ impl Directories {
optimized_excluded = Vec::<String>::new();
}
// Remove include directories which are inside any exclude directory
// Remove included directories which are inside any excluded directory
for id in &self.included_directories {
let mut is_inside: bool = false;
for ed in &self.excluded_directories {
@ -215,7 +215,7 @@ impl Directories {
self.excluded_directories = optimized_excluded;
optimized_excluded = Vec::<String>::new();
// Excluded paths must are inside include path, because
// Excluded paths must are inside included path, because
for ed in &self.excluded_directories {
let mut is_inside: bool = false;
for id in &self.included_directories {

4
czkawka_core/src/empty_folder.rs
View File

@ -24,7 +24,7 @@ pub struct FolderEntry {
pub modified_date: SystemTime,
}
/// Struct to store most basics info about all folder
/// Struct to store most basics info about all folder
pub struct EmptyFolder {
information: Info,
delete_folders: bool,
@ -250,7 +250,7 @@ impl EmptyFolder {
Common::print_time(start_time, SystemTime::now(), "delete_files".to_string());
}
/// Set include dir which needs to be relative, exists etc.
/// Set included dir which needs to be relative, exists etc.
pub fn set_included_directory(&mut self, included_directory: String) {
self.directories.set_included_directory(included_directory, &mut self.text_messages);
}

2
czkawka_gui/Cargo.toml
View File

@ -18,6 +18,6 @@ chrono = "0.4"
[dependencies.gtk]
version = "0.9.2"
default-features = false # just in case
default-features = false # just in case
features = ["v3_18"]

2
czkawka_gui/src/main.rs
View File

@ -136,7 +136,7 @@ fn main() {
buttons_save.hide();
buttons_delete.hide();
// Set Include Directory
// Set Included Directory
{
let col_types: [glib::types::Type; 2] = [glib::types::Type::String, glib::types::Type::String];
let list_store: gtk::ListStore = gtk::ListStore::new(&col_types);

8
czkawka_gui_orbtk/src/main.rs
View File

@ -16,11 +16,11 @@ fn main() {
.columns(Columns::create().push(105.0).push(67.0))
.rows(Rows::create().push(50.0).push(32.0).push(32.0).push(32.0).push(32.0))
.margin((84, 40))
.child(TextBlock::new().text("Include Directory:").v_align("center").h_align("start").attach(Grid::column(0)).attach(Grid::row(0)).build(ctx))
.child(TextBlock::new().text("Included Directory:").v_align("center").h_align("start").attach(Grid::column(0)).attach(Grid::row(0)).build(ctx))
.child(
TextBox::new()
.id("included_directory")
.water_mark("Include Directory")
.water_mark("Included Directory")
.v_align("center")
.h_align("start")
.attach(Grid::column(1))
@ -28,11 +28,11 @@ fn main() {
.min_width(300.0)
.build(ctx),
)
.child(TextBlock::new().text("Exclude Directory:").v_align("center").h_align("start").attach(Grid::column(0)).attach(Grid::row(1)).build(ctx))
.child(TextBlock::new().text("Excluded Directory:").v_align("center").h_align("start").attach(Grid::column(0)).attach(Grid::row(1)).build(ctx))
.child(
TextBox::new()
.id("excluded_directory")
.water_mark("Exclude Directory")
.water_mark("Excluded Directory")
.v_align("center")
.h_align("start")
.attach(Grid::column(1))