From bfbef18117854a67f24c49cc345b8c5959b76bdf Mon Sep 17 00:00:00 2001 From: DioCrafts Date: Thu, 27 Mar 2025 23:41:56 +0100 Subject: [PATCH] fix warnings --- Cargo.lock | 89 ++++++++++++++------------ Cargo.toml | 30 ++++----- src/application/mod.rs | 4 -- src/application/services/mod.rs | 2 - src/infrastructure/repositories/mod.rs | 1 - src/main.rs | 4 +- 6 files changed, 65 insertions(+), 65 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index e8f367d2..3c50d3f4 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -378,9 +378,9 @@ checksum = "d71b6127be86fdcfddb610f7182ac57211d4b18a3e9c82eb2d17662f2227ad6a" [[package]] name = "cc" -version = "1.2.16" +version = "1.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be714c154be609ec7f5dad223a33bf1482fff90472de28f7362806e6d4832b8c" +checksum = "1fcb57c740ae1daf453ae85f16e37396f672b039e00d9d866e07ddb24e328e3a" dependencies = [ "shlex", ] @@ -510,9 +510,9 @@ dependencies = [ [[package]] name = "deranged" -version = "0.4.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c9e6a11ca8224451684bc0d7d5a7adbf8f2fd6887261a1cfc3c0432f9d4068e" +checksum = "28cfac68e08048ae1883171632c2aef3ebc555621ae56fbccce1cbf22dd7f058" dependencies = [ "powerfmt", ] @@ -791,14 +791,14 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.3.1" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43a49c392881ce6d5c3b8cb70f98717b7c07aabbdff06687b9030dbfbe2725f8" +checksum = "73fea8450eea4bac3940448fb7ae50d91f034f941199fcd9d909a5a07aa455f0" dependencies = [ "cfg-if", "libc", - "wasi 0.13.3+wasi-0.2.2", - "windows-targets 0.52.6", + "r-efi", + "wasi 0.14.2+wasi-0.2.4", ] [[package]] @@ -1042,14 +1042,15 @@ dependencies = [ [[package]] name = "iana-time-zone" -version = "0.1.61" +version = "0.1.62" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "235e081f3925a06703c2d0117ea8b91f042756fd6e7a6e5d901e8ca1a996b220" +checksum = "b2fd658b06e56721792c5df4475705b6cda790e9298d19d2f8af083457bcd127" dependencies = [ "android_system_properties", "core-foundation-sys", "iana-time-zone-haiku", "js-sys", + "log", "wasm-bindgen", "windows-core", ] @@ -1104,9 +1105,9 @@ dependencies = [ [[package]] name = "icu_locid_transform_data" -version = "1.5.0" +version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fdc8ff3388f852bede6b579ad4e978ab004f139284d7b28715f773507b946f6e" +checksum = "7515e6d781098bf9f7205ab3fc7e9709d34554ae0b21ddbcb5febfa4bc7df11d" [[package]] name = "icu_normalizer" @@ -1128,9 +1129,9 @@ dependencies = [ [[package]] name = "icu_normalizer_data" -version = "1.5.0" +version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8cafbf7aa791e9b22bec55a167906f9e1215fd475cd22adfcf660e03e989516" +checksum = "c5e8338228bdc8ab83303f16b797e177953730f601a96c25d10cb3ab0daa0cb7" [[package]] name = "icu_properties" @@ -1149,9 +1150,9 @@ dependencies = [ [[package]] name = "icu_properties_data" -version = "1.5.0" +version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67a8effbc3dd3e4ba1afa8ad918d5684b8868b3b26500753effea8d2eed19569" +checksum = "85fb8799753b75aee8d2a21d7c14d9f38921b54b3dbda10f5a3c7a7b82dba5e2" [[package]] name = "icu_provider" @@ -1305,9 +1306,9 @@ dependencies = [ [[package]] name = "log" -version = "0.4.26" +version = "0.4.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30bde2b3dc3671ae49d8e2e9f044c7c005836e7a023ee57cffa25ab82764bb9e" +checksum = "13dc2df351e3202783a1fe0d44375f7295ffb4049267b0f3018346dc122a1d94" [[package]] name = "matchers" @@ -1773,7 +1774,7 @@ version = "0.2.21" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "85eae3c4ed2f50dcfe72643da4befc30deadb458a9b590d720cde2f2b1e97da9" dependencies = [ - "zerocopy 0.8.23", + "zerocopy 0.8.24", ] [[package]] @@ -1820,6 +1821,12 @@ dependencies = [ "proc-macro2", ] +[[package]] +name = "r-efi" +version = "5.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "74765f6d916ee2faa39bc8e68e4f3ed8949b48cccdac59983d287a7cb71ce9c5" + [[package]] name = "rand" version = "0.8.5" @@ -2020,7 +2027,7 @@ checksum = "822ee9188ac4ec04a2f0531e55d035fb2de73f18b41a63c70c2712503b6fb13c" dependencies = [ "once_cell", "rustls-pki-types", - "rustls-webpki 0.103.0", + "rustls-webpki 0.103.1", "subtle", "zeroize", ] @@ -2061,9 +2068,9 @@ dependencies = [ [[package]] name = "rustls-webpki" -version = "0.103.0" +version = "0.103.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0aa4eeac2588ffff23e9d7a7e9b3f971c5fb5b7ebc9452745e0c232c64f83b2f" +checksum = "fef8b8769aaccf73098557a87cd1816b4f9c7c16811c9c77142aa695c16f2c03" dependencies = [ "ring", "rustls-pki-types", @@ -2599,12 +2606,12 @@ dependencies = [ [[package]] name = "tempfile" -version = "3.19.0" +version = "3.19.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "488960f40a3fd53d72c2a29a58722561dee8afdd175bd88e3db4677d7b2ba600" +checksum = "7437ac7763b9b123ccf33c338a5cc1bac6f69b45a136c19bdd8a65e3916435bf" dependencies = [ "fastrand", - "getrandom 0.3.1", + "getrandom 0.3.2", "once_cell", "rustix", "windows-sys 0.59.0", @@ -2668,9 +2675,9 @@ dependencies = [ [[package]] name = "time" -version = "0.3.40" +version = "0.3.41" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d9c75b47bdff86fa3334a3db91356b8d7d86a9b839dab7d0bdc5c3d3a077618" +checksum = "8a7619e19bc266e0f9c5e6686659d394bc57973859340060a69221e57dbc0c40" dependencies = [ "deranged", "itoa", @@ -2689,9 +2696,9 @@ checksum = "c9e9a38711f559d9e3ce1cdb06dd7c5b8ea546bc90052da6d06bb76da74bb07c" [[package]] name = "time-macros" -version = "0.2.21" +version = "0.2.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29aa485584182073ed57fd5004aa09c371f021325014694e432313345865fd04" +checksum = "3526739392ec93fd8b359c8e98514cb3e8e021beb4e5f597b00a0221f8ed8a49" dependencies = [ "num-conv", "time-core", @@ -3026,7 +3033,7 @@ version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "458f7a779bf54acc9f347480ac654f68407d3aab21269a6e3c9f922acd9e2da9" dependencies = [ - "getrandom 0.3.1", + "getrandom 0.3.2", "serde", ] @@ -3065,9 +3072,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasi" -version = "0.13.3+wasi-0.2.2" +version = "0.14.2+wasi-0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26816d2e1a4a36a2940b96c5296ce403917633dff8f3440e9b236ed6f6bacad2" +checksum = "9683f9a5a998d873c0d21fcbe3c083009670149a8fab228644b8bd36b2c48cb3" dependencies = [ "wit-bindgen-rt", ] @@ -3167,9 +3174,9 @@ checksum = "5f20c57d8d7db6d3b86154206ae5d8fba62dd39573114de97c2cb0578251f8e1" [[package]] name = "whoami" -version = "1.5.2" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "372d5b87f58ec45c384ba03563b03544dc5fadc3983e434b286913f5b4a9bb6d" +checksum = "6994d13118ab492c3c80c1f81928718159254c53c472bf9ce36f8dae4add02a7" dependencies = [ "redox_syscall", "wasite", @@ -3455,9 +3462,9 @@ checksum = "271414315aff87387382ec3d271b52d7ae78726f5d44ac98b4f4030c91880486" [[package]] name = "wit-bindgen-rt" -version = "0.33.0" +version = "0.39.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3268f3d866458b787f390cf61f4bbb563b922d091359f9608842999eaee3943c" +checksum = "6f42320e61fe2cfd34354ecb597f86f413484a798ba44a8ca1165c58d42da6c1" dependencies = [ "bitflags", ] @@ -3509,11 +3516,11 @@ dependencies = [ [[package]] name = "zerocopy" -version = "0.8.23" +version = "0.8.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd97444d05a4328b90e75e503a34bad781f14e28a823ad3557f0750df1ebcbc6" +checksum = "2586fea28e186957ef732a5f8b3be2da217d65c5969d4b1e17f973ebbe876879" dependencies = [ - "zerocopy-derive 0.8.23", + "zerocopy-derive 0.8.24", ] [[package]] @@ -3529,9 +3536,9 @@ dependencies = [ [[package]] name = "zerocopy-derive" -version = "0.8.23" +version = "0.8.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6352c01d0edd5db859a63e2605f4ea3183ddbd15e2c4a9e7d32184df75e4f154" +checksum = "a996a8f63c5c4448cd959ac1bab0aaa3306ccfd060472f85943ee0750f0169be" dependencies = [ "proc-macro2", "quote", diff --git a/Cargo.toml b/Cargo.toml index dae0b0eb..3a19b582 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -11,37 +11,37 @@ harness = true axum = { version = "0.8.1", features = ["multipart", "http1", "tokio"] } tokio = { version = "1.44.1", features = ["full"] } tokio-util = { version = "0.7.14", features = ["io", "codec"] } -tokio-stream = { version = "0.1.15", features = ["fs"] } -bytes = "1.6.0" -tempfile = "3.10.1" +tokio-stream = { version = "0.1.17", features = ["fs"] } +bytes = "1.10.1" +tempfile = "3.19.1" tower = "0.5.2" tower-http = { version = "0.6.2", features = ["fs", "compression-gzip", "trace", "cors", "add-extension", "request-id"] } -flate2 = "1.0.28" +flate2 = "1.1.0" tracing = "0.1.41" tracing-subscriber = { version = "0.3.19", features = ["env-filter"] } -chrono = { version = "0.4.37", features = ["serde"] } -http-body = "0.4.5" +chrono = { version = "0.4.40", features = ["serde"] } +http-body = "0.4.6" serde = { version = "1.0.219", features = ["derive"] } serde_json = "1.0.140" futures = "0.3.31" -async-stream = "0.3.5" +async-stream = "0.3.6" mime_guess = "2.0.5" uuid = { version = "1.16.0", features = ["v4", "serde"] } async-trait = "0.1.88" thiserror = "2.0.12" -reqwest = { version = "0.12.5", features = ["json", "multipart"] } +reqwest = { version = "0.12.15", features = ["json", "multipart"] } mockall = { version = "0.12.1", optional = true } rand = "0.8.5" -pin-project-lite = "0.2.13" -sqlx = { version = "0.7.3", features = ["postgres", "runtime-tokio", "tls-rustls", "chrono", "uuid", "json"] } -anyhow = "1.0.81" -jsonwebtoken = "9.2.0" +pin-project-lite = "0.2.16" +sqlx = { version = "0.7.4", features = ["postgres", "runtime-tokio", "tls-rustls", "chrono", "uuid", "json"] } +anyhow = "1.0.97" +jsonwebtoken = "9.3.1" argon2 = "0.5.3" rand_core = { version = "0.6.4", features = ["std"] } -time = "0.3.34" -axum-extra = { version = "0.9.2", features = ["cookie"] } +time = "0.3.41" +axum-extra = { version = "0.9.6", features = ["cookie"] } axum-server = "0.6.0" -hyper = { version = "1.2.0", features = ["full"] } +hyper = { version = "1.6.0", features = ["full"] } [features] default = [] diff --git a/src/application/mod.rs b/src/application/mod.rs index 69d133bc..b4dcec3c 100644 --- a/src/application/mod.rs +++ b/src/application/mod.rs @@ -4,7 +4,3 @@ pub mod services; pub mod transactions; // Re-exportaciones para facilitar el acceso a los principales puertos -pub use ports::inbound::FolderUseCase; -pub use ports::file_ports::{FileUploadUseCase, FileRetrievalUseCase, FileManagementUseCase, FileUseCaseFactory}; -pub use ports::outbound::{FolderStoragePort, IdMappingPort}; -pub use ports::storage_ports::{FileReadPort, FileWritePort, FilePathResolutionPort, StorageVerificationPort, DirectoryManagementPort}; diff --git a/src/application/services/mod.rs b/src/application/services/mod.rs index 90b2f0ea..747e4bc0 100644 --- a/src/application/services/mod.rs +++ b/src/application/services/mod.rs @@ -21,5 +21,3 @@ pub use file_upload_service::FileUploadService; pub use file_retrieval_service::FileRetrievalService; pub use file_management_service::FileManagementService; pub use file_use_case_factory::AppFileUseCaseFactory; -pub use trash_service::TrashService; -pub use search_service::SearchService; diff --git a/src/infrastructure/repositories/mod.rs b/src/infrastructure/repositories/mod.rs index 542ac403..e978f132 100644 --- a/src/infrastructure/repositories/mod.rs +++ b/src/infrastructure/repositories/mod.rs @@ -19,5 +19,4 @@ pub use file_metadata_manager::FileMetadataManager; pub use file_path_resolver::FilePathResolver; pub use file_fs_read_repository::FileFsReadRepository; pub use file_fs_write_repository::FileFsWriteRepository; -pub use trash_fs_repository::TrashFsRepository; pub use pg::{UserPgRepository, SessionPgRepository}; \ No newline at end of file diff --git a/src/main.rs b/src/main.rs index 6dc131f0..c54836b2 100644 --- a/src/main.rs +++ b/src/main.rs @@ -303,7 +303,7 @@ async fn main() -> Result<(), Box> { } async fn restore_from_trash(&self, file_id: &str, original_path: &str) -> domain::repositories::file_repository::FileRepositoryResult<()> { - use crate::domain::services::path_service::StoragePath; + tracing::info!("Restoring file from trash: {} to {}", file_id, original_path); @@ -551,7 +551,7 @@ async fn main() -> Result<(), Box> { let metadata_manager = Arc::new(infrastructure::repositories::FileMetadataManager::default()); let path_resolver_stub = Arc::new(infrastructure::repositories::FilePathResolver::default_stub()); - let mut repository_services = common::di::RepositoryServices { + let repository_services = common::di::RepositoryServices { folder_repository: Arc::new(FolderFsRepository::new( storage_path.clone(), storage_mediator_stub.clone(),