diff options
author | Lars Wirzenius <liw@liw.fi> | 2021-08-01 20:34:35 +0300 |
---|---|---|
committer | Lars Wirzenius <liw@liw.fi> | 2021-08-01 20:55:04 +0300 |
commit | 2bc07b176bcf63f94bf6f1cca0ade2505958a15d (patch) | |
tree | e1dcf85cc76051baf44a63c1105ced26935109c2 /src/client.rs | |
parent | 0835677f33fe8fa89ee96e4c1b45e5711e10b461 (diff) | |
download | obnam2-2bc07b176bcf63f94bf6f1cca0ade2505958a15d.tar.gz |
refactor: add a type alias for generation ids
This will make it harder to accidentally use a string. Can still be
confused with a chunk id.
Sponsored-by: author
Diffstat (limited to 'src/client.rs')
-rw-r--r-- | src/client.rs | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/src/client.rs b/src/client.rs index ca0104f..b866471 100644 --- a/src/client.rs +++ b/src/client.rs @@ -6,7 +6,7 @@ use crate::chunkmeta::ChunkMeta; use crate::cipher::{CipherEngine, CipherError}; use crate::config::{ClientConfig, ClientConfigError}; use crate::fsentry::{FilesystemEntry, FilesystemKind}; -use crate::generation::{FinishedGeneration, LocalGeneration, LocalGenerationError}; +use crate::generation::{FinishedGeneration, GenId, LocalGeneration, LocalGenerationError}; use crate::genlist::GenerationList; use chrono::{DateTime, Local}; @@ -101,16 +101,15 @@ impl AsyncBackupClient { self.chunk_client.fetch_chunk(chunk_id).await } - async fn fetch_generation_chunk(&self, gen_id: &str) -> Result<GenerationChunk, ClientError> { - let chunk_id = ChunkId::recreate(gen_id); - let chunk = self.fetch_chunk(&chunk_id).await?; + async fn fetch_generation_chunk(&self, gen_id: &GenId) -> Result<GenerationChunk, ClientError> { + let chunk = self.fetch_chunk(gen_id).await?; let gen = GenerationChunk::from_data_chunk(&chunk)?; Ok(gen) } pub async fn fetch_generation( &self, - gen_id: &str, + gen_id: &GenId, dbname: &Path, ) -> Result<LocalGeneration, ClientError> { let gen = self.fetch_generation_chunk(gen_id).await?; @@ -323,16 +322,15 @@ impl BackupClient { self.chunk_client.fetch_chunk(chunk_id) } - fn fetch_generation_chunk(&self, gen_id: &str) -> Result<GenerationChunk, ClientError> { - let chunk_id = ChunkId::recreate(gen_id); - let chunk = self.fetch_chunk(&chunk_id)?; + fn fetch_generation_chunk(&self, gen_id: &GenId) -> Result<GenerationChunk, ClientError> { + let chunk = self.fetch_chunk(gen_id)?; let gen = GenerationChunk::from_data_chunk(&chunk)?; Ok(gen) } pub fn fetch_generation( &self, - gen_id: &str, + gen_id: &GenId, dbname: &Path, ) -> Result<LocalGeneration, ClientError> { let gen = self.fetch_generation_chunk(gen_id)?; |