diff options
author | Lars Wirzenius <liw@liw.fi> | 2020-12-26 10:05:58 +0200 |
---|---|---|
committer | Lars Wirzenius <liw@liw.fi> | 2020-12-26 10:26:58 +0200 |
commit | 62b533e319f8a67db908a541c48b2d3a25edeb58 (patch) | |
tree | 866cae345a0c76538f0ff07df01f4c16e69e6bb2 /src/client.rs | |
parent | 6cf8ec1898e70ba3e625f647f3dc3bf3f820299a (diff) | |
download | obnam2-62b533e319f8a67db908a541c48b2d3a25edeb58.tar.gz |
refactor: rename FileSystemEntry::path to pathbuf
This is a step towards changing how filenames are stored in FileSystemEntry.
Diffstat (limited to 'src/client.rs')
-rw-r--r-- | src/client.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/client.rs b/src/client.rs index af8d65e..3149ec5 100644 --- a/src/client.rs +++ b/src/client.rs @@ -62,7 +62,7 @@ impl BackupClient { ) -> anyhow::Result<(FilesystemEntry, Vec<ChunkId>)> { debug!("entry: {:?}", e); let ids = match e.kind() { - FilesystemKind::Regular => self.read_file(e.path(), size)?, + FilesystemKind::Regular => self.read_file(e.pathbuf(), size)?, FilesystemKind::Directory => vec![], FilesystemKind::Symlink => vec![], }; @@ -70,7 +70,7 @@ impl BackupClient { } pub fn upload_generation(&self, filename: &Path, size: usize) -> anyhow::Result<ChunkId> { - let ids = self.read_file(filename, size)?; + let ids = self.read_file(filename.to_path_buf(), size)?; let gen = GenerationChunk::new(ids); let data = gen.to_data_chunk()?; let meta = ChunkMeta::new_generation(&sha256(data.data()), "timestamp"); @@ -78,7 +78,7 @@ impl BackupClient { Ok(gen_id) } - fn read_file(&self, filename: &Path, size: usize) -> anyhow::Result<Vec<ChunkId>> { + fn read_file(&self, filename: PathBuf, size: usize) -> anyhow::Result<Vec<ChunkId>> { info!("uploading {}", filename.display()); let file = std::fs::File::open(filename)?; let chunker = Chunker::new(size, file); |