From dab8979eaf06213016e5a9ced5ba596708048b40 Mon Sep 17 00:00:00 2001 From: Piyush Mishra Date: Sat, 15 Jan 2022 16:27:44 +0530 Subject: [PATCH] removed trash, instead deleteing permanantly --- Cargo.lock | 177 --------------------------------------------------- Cargo.toml | 1 - src/utils.rs | 6 +- 3 files changed, 3 insertions(+), 181 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 74c85d9..2b26e50 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -67,19 +67,6 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" -[[package]] -name = "chrono" -version = "0.4.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "670ad68c9088c2a963aaa298cb369688cf3f9465ce5e2d4ca10e6e0098a1ce73" -dependencies = [ - "libc", - "num-integer", - "num-traits", - "time", - "winapi", -] - [[package]] name = "clap" version = "3.0.5" @@ -143,12 +130,6 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b" -[[package]] -name = "const-sha1" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb58b6451e8c2a812ad979ed1d83378caa5e927eef2622017a45f251457c2c9d" - [[package]] name = "conv" version = "0.3.3" @@ -286,16 +267,6 @@ dependencies = [ "lazy_static", ] -[[package]] -name = "form_urlencoded" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fc25a87fa4fd2094bffb06925852034d90a17f0d1e05197d4956d3555752191" -dependencies = [ - "matches", - "percent-encoding", -] - [[package]] name = "getrandom" version = "0.1.16" @@ -349,17 +320,6 @@ dependencies = [ "libc", ] -[[package]] -name = "idna" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "418a0a6fab821475f634efe3ccc45c013f742efe03d853e8d3355d5cb850ecf8" -dependencies = [ - "matches", - "unicode-bidi", - "unicode-normalization", -] - [[package]] name = "image" version = "0.23.14" @@ -442,30 +402,6 @@ version = "0.2.112" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1b03d17f364a3a042d5e5d46b053bbbf82c92c9430c592dd4c064dc6ee997125" -[[package]] -name = "log" -version = "0.4.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51b9bbe6c47d51fc3e1a9b945965946b4c44142ab8792c50835a980d362c2710" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "malloc_buf" -version = "0.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62bb907fe88d54d8d9ce32a3cceab4218ed2f6b7d35617cafe9adf84e43919cb" -dependencies = [ - "libc", -] - -[[package]] -name = "matches" -version = "0.1.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3e378b66a060d48947b590737b30a1be76706c8dd7b8ba0f2fe3989c68a853f" - [[package]] name = "matrixmultiply" version = "0.1.15" @@ -606,15 +542,6 @@ dependencies = [ "libc", ] -[[package]] -name = "objc" -version = "0.2.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "915b1b472bc21c53464d6c8461c9d3af805ba1ef837e1cac254428f4a77177b1" -dependencies = [ - "malloc_buf", -] - [[package]] name = "os_str_bytes" version = "6.0.0" @@ -639,12 +566,6 @@ version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0744126afe1a6dd7f394cb50a716dbe086cb06e255e53d8d0185d82828358fb5" -[[package]] -name = "percent-encoding" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e" - [[package]] name = "png" version = "0.16.8" @@ -671,7 +592,6 @@ dependencies = [ "rusttype", "serde", "serde_json", - "trash", ] [[package]] @@ -934,85 +854,18 @@ dependencies = [ "weezl", ] -[[package]] -name = "time" -version = "0.1.43" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca8a50ef2360fbd1eeb0ecd46795a87a19024eb4b53c5dc916ca1fd95fe62438" -dependencies = [ - "libc", - "winapi", -] - -[[package]] -name = "tinyvec" -version = "1.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c1c1d5a42b6245520c249549ec267180beaffcc0615401ac8e31853d4b6d8d2" -dependencies = [ - "tinyvec_macros", -] - -[[package]] -name = "tinyvec_macros" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" - -[[package]] -name = "trash" -version = "2.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43d914d78ef2b3fa25b439047f39ae5476ff44e543f088054b096c780966b7e7" -dependencies = [ - "chrono", - "libc", - "log", - "objc", - "scopeguard", - "url", - "windows", -] - [[package]] name = "ttf-parser" version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3e5d7cd7ab3e47dda6e56542f4bbf3824c15234958c6e1bd6aaa347e93499fdc" -[[package]] -name = "unicode-bidi" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a01404663e3db436ed2746d9fefef640d868edae3cceb81c3b8d5732fda678f" - -[[package]] -name = "unicode-normalization" -version = "0.1.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d54590932941a9e9266f0832deed84ebe1bf2e4c9e4a3554d393d18f5e854bf9" -dependencies = [ - "tinyvec", -] - [[package]] name = "unicode-xid" version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8ccb82d61f80a663efe1f787a51b16b5a51e3314d6ac365b08639f52387b33f3" -[[package]] -name = "url" -version = "2.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a507c383b2d33b5fc35d1861e77e6b383d158b2da5e14fe51b83dfedf6fd578c" -dependencies = [ - "form_urlencoded", - "idna", - "matches", - "percent-encoding", -] - [[package]] name = "version_check" version = "0.9.4" @@ -1067,33 +920,3 @@ name = "winapi-x86_64-pc-windows-gnu" version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" - -[[package]] -name = "windows" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "361f3533a83ee1a28c9be59683f40043db02dbedf6479ce8795657386195c97f" -dependencies = [ - "const-sha1", - "windows_gen", - "windows_macros", -] - -[[package]] -name = "windows_gen" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54154dbc515d58723f6b6053c12f1065da7389f733660581b2391bd1af480452" -dependencies = [ - "syn", -] - -[[package]] -name = "windows_macros" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f7794c652845dc466cb8dc1b86c08345707c8144bc53e9086430047c7d33b76" -dependencies = [ - "syn", - "windows_gen", -] diff --git a/Cargo.toml b/Cargo.toml index 0662689..5ef5469 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -16,4 +16,3 @@ serde_json = "1.0" serde = { version = "1.0", features = ["derive"] } lazy_static = "1.4" dirs = "4.0.0" -trash = "2.0.3" diff --git a/src/utils.rs b/src/utils.rs index be6a34f..89acb3c 100644 --- a/src/utils.rs +++ b/src/utils.rs @@ -218,15 +218,15 @@ impl ImageContainer { .unwrap(), ); - if path_original.exists() && trash::delete(path_original).is_err() { + if path_original.exists() && fs::remove_file(path_original).is_err() { dialog::message_default("Failed to delete image!"); } - if path_conf.exists() && trash::delete(path_conf).is_err() { + if path_conf.exists() && fs::remove_file(path_conf).is_err() { dialog::message_default("Failed to delete image conf!"); } - if export.exists() && trash::delete(export).is_err() { + if export.exists() && fs::remove_file(export).is_err() { dialog::message_default("Failed to delete exported image!"); } }