From 590275bbdb14ddf60542440182f72d633e680570 Mon Sep 17 00:00:00 2001 From: Lars Wirzenius Date: Sun, 16 Jan 2022 17:47:59 +0200 Subject: refactor: rename Chunker to FileChunks This should make it a little clearer that it can act as an iterator. Sponsored-by: author --- src/backup_run.rs | 4 ++-- src/chunker.rs | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/backup_run.rs b/src/backup_run.rs index 2286fca..3787494 100644 --- a/src/backup_run.rs +++ b/src/backup_run.rs @@ -3,7 +3,7 @@ use crate::backup_progress::BackupProgress; use crate::backup_reason::Reason; use crate::chunk::{GenerationChunk, GenerationChunkError}; -use crate::chunker::{Chunker, ChunkerError}; +use crate::chunker::{ChunkerError, FileChunks}; use crate::chunkid::ChunkId; use crate::client::{BackupClient, ClientError}; use crate::config::ClientConfig; @@ -358,7 +358,7 @@ impl<'a> BackupRun<'a> { let mut chunk_ids = vec![]; let file = std::fs::File::open(filename) .map_err(|err| ClientError::FileOpen(filename.to_path_buf(), err))?; - let chunker = Chunker::new(size, file, filename); + let chunker = FileChunks::new(size, file, filename); for item in chunker { let chunk = item?; if let Some(chunk_id) = self.client.has_chunk(chunk.meta()).await? { diff --git a/src/chunker.rs b/src/chunker.rs index e8e31e1..7954621 100644 --- a/src/chunker.rs +++ b/src/chunker.rs @@ -7,7 +7,7 @@ use std::io::prelude::*; use std::path::{Path, PathBuf}; /// Iterator over chunks in a file. -pub struct Chunker { +pub struct FileChunks { chunk_size: usize, buf: Vec, filename: PathBuf, @@ -22,7 +22,7 @@ pub enum ChunkerError { FileRead(PathBuf, std::io::Error), } -impl Chunker { +impl FileChunks { /// Create new iterator. pub fn new(chunk_size: usize, handle: std::fs::File, filename: &Path) -> Self { let mut buf = vec![]; @@ -61,7 +61,7 @@ impl Chunker { } } -impl Iterator for Chunker { +impl Iterator for FileChunks { type Item = Result; /// Return the next chunk, if any, or an error. -- cgit v1.2.1