From 7d40b68407ef2923144944e0c6fc52476be69624 Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Sun, 6 Dec 2015 12:49:02 +0100 Subject: [PATCH] Rename: StorageBackend -> Storage --- src/main.rs | 4 ++-- src/module/bm/commands.rs | 6 ++--- src/module/mod.rs | 4 ++-- src/storage/mod.rs | 46 +++++++++++++++++++-------------------- 4 files changed, 30 insertions(+), 30 deletions(-) diff --git a/src/main.rs b/src/main.rs index 20acbda0..2d2102b3 100644 --- a/src/main.rs +++ b/src/main.rs @@ -19,7 +19,7 @@ use module::Module; use module::ModuleError; use module::CommandEnv; use module::bm::BMModule; -use storage::StorageBackend; +use storage::Storage; mod cli; mod configuration; @@ -44,7 +44,7 @@ fn main() { debug!("Runtime : {:?}", &rt); - let backend = StorageBackend::new(&rt).unwrap_or_else(|e| { + let backend = Storage::new(&rt).unwrap_or_else(|e| { error!("Error: {}", e); exit(1); }); diff --git a/src/module/bm/commands.rs b/src/module/bm/commands.rs index 2ca11cc5..87ba320f 100644 --- a/src/module/bm/commands.rs +++ b/src/module/bm/commands.rs @@ -6,7 +6,7 @@ use regex::Regex; use module::{CommandEnv, CommandResult, Module, ModuleError}; use module::bm::header::{build_header, get_tags_from_header}; use runtime::Runtime; -use storage::StorageBackendError; +use storage::StorageError; use storage::file::File; use storage::json::parser::JsonHeaderParser; use storage::parser::Parser; @@ -86,13 +86,13 @@ pub fn remove_command(module: &Module, env: CommandEnv) -> CommandResult { warn!("Error occured in Filesystem operation: {}", err); err }) - .collect::>(); + .collect::>(); if errs.len() != 0 { warn!("{} Errors occured while removing {} files", errs.len(), nfiles); let moderr = ModuleError::new("File removal failed"); - // TODO : Collect StorageBackendErrors + // TODO : Collect StorageErrors Err(moderr) } else { diff --git a/src/module/mod.rs b/src/module/mod.rs index 7bd75fed..d298d832 100644 --- a/src/module/mod.rs +++ b/src/module/mod.rs @@ -7,7 +7,7 @@ use std::result::Result; use clap::ArgMatches; use runtime::Runtime; -use storage::StorageBackend; +use storage::Storage; pub mod bm; pub mod helpers; @@ -47,7 +47,7 @@ impl Display for ModuleError { pub struct CommandEnv<'a> { pub rt: &'a Runtime<'a>, - pub bk: &'a StorageBackend, + pub bk: &'a Storage, pub matches: &'a ArgMatches<'a, 'a>, } diff --git a/src/storage/mod.rs b/src/storage/mod.rs index 8bb13fe4..29bdda3a 100644 --- a/src/storage/mod.rs +++ b/src/storage/mod.rs @@ -22,23 +22,23 @@ use storage::file::File; use storage::file_id::*; use storage::parser::{FileHeaderParser, Parser}; -pub type BackendOperationResult = Result; +pub type BackendOperationResult = Result; -pub struct StorageBackend { +pub struct Storage { basepath: String, storepath: String, } -impl StorageBackend { +impl Storage { - pub fn new(rt: &Runtime) -> BackendOperationResult { - use self::StorageBackendError as SBE; + pub fn new(rt: &Runtime) -> BackendOperationResult { + use self::StorageError as SBE; let storepath = rt.get_rtp() + "/store/"; debug!("Trying to create {}", storepath); create_dir_all(&storepath).and_then(|_| { debug!("Creating succeeded, constructing backend instance"); - Ok(StorageBackend { + Ok(Storage { basepath: rt.get_rtp(), storepath: storepath.clone(), }) @@ -49,9 +49,9 @@ impl StorageBackend { }) } - pub fn iter_ids(&self, m: &Module) -> Result, StorageBackendError> + pub fn iter_ids(&self, m: &Module) -> Result, StorageError> { - use self::StorageBackendError as SBE; + use self::StorageError as SBE; let globstr = self.prefix_of_files_for_module(m) + "*.imag"; debug!("Globstring = {}", globstr); @@ -67,10 +67,10 @@ impl StorageBackend { } pub fn iter_files<'a, HP>(&self, m: &'a Module, p: &Parser) - -> Result>, StorageBackendError> + -> Result>, StorageError> where HP: FileHeaderParser { - use self::StorageBackendError as SBE; + use self::StorageError as SBE; self.iter_ids(m) .and_then(|ids| { @@ -79,7 +79,7 @@ impl StorageBackend { Ok(self.filter_map_ids_to_files(m, p, ids).into_iter()) }) .map_err(|e| { - debug!("StorageBackend::iter_ids() returned error = {:?}", e); + debug!("Storage::iter_ids() returned error = {:?}", e); SBE::new("iter_files()", "Cannot iter on files", None, Some(Box::new(e))) }) @@ -93,7 +93,7 @@ impl StorageBackend { pub fn put_file(&self, f: File, p: &Parser) -> BackendOperationResult where HP: FileHeaderParser { - use self::StorageBackendError as SBE; + use self::StorageError as SBE; let written = write_with_parser(&f, p); if written.is_err() { return Err(written.err().unwrap()); } @@ -126,7 +126,7 @@ impl StorageBackend { pub fn update_file(&self, f: File, p: &Parser) -> BackendOperationResult where HP: FileHeaderParser { - use self::StorageBackendError as SBE; + use self::StorageError as SBE; let contents = write_with_parser(&f, p); if contents.is_err() { return Err(contents.err().unwrap()); } @@ -203,7 +203,7 @@ impl StorageBackend { } pub fn remove_file(&self, m: &Module, file: File, checked: bool) -> BackendOperationResult { - use self::StorageBackendError as SBE; + use self::StorageError as SBE; if checked { error!("Checked remove not implemented yet. I will crash now"); @@ -259,23 +259,23 @@ impl StorageBackend { } #[derive(Debug)] -pub struct StorageBackendError { +pub struct StorageError { pub action: String, // The file system action in words pub desc: String, // A short description pub data_dump: Option, // Data dump, if any pub caused_by: Option>, // caused from this error } -impl StorageBackendError { +impl StorageError { fn new(action: S, desc: S, data: Option, cause: Option>) - -> StorageBackendError + -> StorageError where S: Into { - StorageBackendError { + StorageError { action: action.into(), desc: desc.into(), data_dump: data, @@ -285,7 +285,7 @@ impl StorageBackendError { } -impl Error for StorageBackendError { +impl Error for StorageError { fn description(&self) -> &str { &self.desc[..] @@ -297,18 +297,18 @@ impl Error for StorageBackendError { } -impl<'a> Display for StorageBackendError { +impl<'a> Display for StorageError { fn fmt(&self, f: &mut Formatter) -> FMTResult { - write!(f, "StorageBackendError[{}]: {}", + write!(f, "StorageError[{}]: {}", self.action, self.desc) } } -fn write_with_parser<'a, HP>(f: &File, p: &Parser) -> Result +fn write_with_parser<'a, HP>(f: &File, p: &Parser) -> Result where HP: FileHeaderParser { - use self::StorageBackendError as SBE; + use self::StorageError as SBE; p.write(f.contents()) .or_else(|err| {