From a2a7478f5b6d8c3295416c2c1f36863e99f273de Mon Sep 17 00:00:00 2001 From: ChristianVisintin Date: Sun, 6 Dec 2020 22:56:40 +0100 Subject: [PATCH] Published new rust-ftp as ftp4 --- Cargo.lock | 9 +++++---- Cargo.toml | 2 +- src/filetransfer/ftp_transfer.rs | 6 +++--- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index a356fa5..6adee2f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -145,9 +145,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" [[package]] -name = "ftp" -version = "3.0.1" -source = "git+https://github.com/ChristianVisintin/rust-ftp#63b06ef1b21cd7bd0a44682e514144e67c071d0e" +name = "ftp4" +version = "4.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "412a5da44e30489a1790749f34044d53bbc4ff0cf8d789ee37be4b6befeb7c23" dependencies = [ "chrono", "lazy_static", @@ -668,7 +669,7 @@ dependencies = [ "bytesize", "chrono", "crossterm", - "ftp", + "ftp4", "getopts", "hostname", "lazy_static", diff --git a/Cargo.toml b/Cargo.toml index bfcb7b2..dae2902 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -16,7 +16,7 @@ readme = "README.md" [dependencies] crossterm = "0.18.2" -ftp = { git = "https://github.com/ChristianVisintin/rust-ftp", features = ["secure"] } +ftp4 = { version = "^4.0.0", features = ["secure"] } getopts = "0.2.21" ssh2 = "0.9.0" tui = { version = "0.13.0", features = ["crossterm"], default-features = false } diff --git a/src/filetransfer/ftp_transfer.rs b/src/filetransfer/ftp_transfer.rs index 94b4aab..6428953 100644 --- a/src/filetransfer/ftp_transfer.rs +++ b/src/filetransfer/ftp_transfer.rs @@ -25,7 +25,7 @@ // Dependencies extern crate chrono; -extern crate ftp; +extern crate ftp4; extern crate regex; use super::{FileTransfer, FileTransferError, FileTransferErrorType}; @@ -33,8 +33,8 @@ use crate::fs::{FsDirectory, FsEntry, FsFile}; use crate::utils::lstime_to_systime; // Includes -use ftp::native_tls::TlsConnector; -use ftp::FtpStream; +use ftp4::native_tls::TlsConnector; +use ftp4::FtpStream; use regex::Regex; use std::io::{Read, Write}; use std::path::{Path, PathBuf};