Selaa lähdekoodia

Update Cargo.lock, apply changes for ffsend-api send2 branch

timvisee 6 vuotta sitten
vanhempi
commit
802c96df3f
4 muutettua tiedostoa jossa 189 lisäystä ja 161 poistoa
  1. 185 157
      Cargo.lock
  2. 2 2
      src/action/download.rs
  3. 1 1
      src/action/upload.rs
  4. 1 1
      src/progress.rs

Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 185 - 157
Cargo.lock


+ 2 - 2
src/action/download.rs

@@ -11,7 +11,7 @@ use ffsend_api::action::download::{Download as ApiDownload, Error as DownloadErr
 use ffsend_api::action::exists::{Error as ExistsError, Exists as ApiExists};
 use ffsend_api::action::exists::{Error as ExistsError, Exists as ApiExists};
 use ffsend_api::action::metadata::{Error as MetadataError, Metadata as ApiMetadata};
 use ffsend_api::action::metadata::{Error as MetadataError, Metadata as ApiMetadata};
 use ffsend_api::file::remote_file::{FileParseError, RemoteFile};
 use ffsend_api::file::remote_file::{FileParseError, RemoteFile};
-use ffsend_api::reader::ProgressReporter;
+use ffsend_api::pipe::ProgressReporter;
 #[cfg(feature = "archive")]
 #[cfg(feature = "archive")]
 use tempfile::{Builder as TempBuilder, NamedTempFile};
 use tempfile::{Builder as TempBuilder, NamedTempFile};
 
 
@@ -143,7 +143,7 @@ impl<'a> Download<'a> {
 
 
         // Execute an download action
         // Execute an download action
         let progress = if !matcher_main.quiet() {
         let progress = if !matcher_main.quiet() {
-            Some(&progress_reader)
+            Some(progress_reader)
         } else {
         } else {
             None
             None
         };
         };

+ 1 - 1
src/action/upload.rs

@@ -9,7 +9,7 @@ use failure::Fail;
 use ffsend_api::action::params::ParamsDataBuilder;
 use ffsend_api::action::params::ParamsDataBuilder;
 use ffsend_api::action::upload::{Error as UploadError, Upload as ApiUpload};
 use ffsend_api::action::upload::{Error as UploadError, Upload as ApiUpload};
 use ffsend_api::config::{UPLOAD_SIZE_MAX, UPLOAD_SIZE_MAX_RECOMMENDED};
 use ffsend_api::config::{UPLOAD_SIZE_MAX, UPLOAD_SIZE_MAX_RECOMMENDED};
-use ffsend_api::reader::ProgressReporter;
+use ffsend_api::pipe::ProgressReporter;
 use prettytable::{format::FormatBuilder, Cell, Row, Table};
 use prettytable::{format::FormatBuilder, Cell, Row, Table};
 #[cfg(feature = "archive")]
 #[cfg(feature = "archive")]
 use tempfile::{Builder as TempBuilder, NamedTempFile};
 use tempfile::{Builder as TempBuilder, NamedTempFile};

+ 1 - 1
src/progress.rs

@@ -4,7 +4,7 @@ use std::io::{stderr, Stderr};
 use std::time::Duration;
 use std::time::Duration;
 
 
 use self::pbr::{ProgressBar as Pbr, Units};
 use self::pbr::{ProgressBar as Pbr, Units};
-use ffsend_api::reader::ProgressReporter;
+use ffsend_api::pipe::ProgressReporter;
 
 
 /// The refresh rate of the progress bar, in milliseconds.
 /// The refresh rate of the progress bar, in milliseconds.
 const PROGRESS_BAR_FPS_MILLIS: u64 = 200;
 const PROGRESS_BAR_FPS_MILLIS: u64 = 200;

Kaikkia tiedostoja ei voida näyttää, sillä liian monta tiedostoa muuttui tässä diffissä