Move to multiple files

This commit is contained in:
Matthias Beyer 2017-05-20 15:12:10 +02:00
parent 2c5cd09ea5
commit bca30cc900
7 changed files with 229 additions and 101 deletions

View file

@ -0,0 +1,36 @@
//
// imag - the personal information management suite for the commandline
// Copyright (C) 2015, 2016 Matthias Beyer <mail@beyermatthias.de> and contributors
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
// License as published by the Free Software Foundation; version
// 2.1 of the License.
//
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
// Lesser General Public License for more details.
//
// You should have received a copy of the GNU Lesser General Public
// License along with this library; if not, write to the Free Software
// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
//
/// The accuracy with which the compiler should compile the time specification
#[derive(Clone, PartialEq, Eq, PartialOrd, Ord, Debug)]
pub enum Accuracy {
Year,
Month,
Day,
Hour,
Minute,
Second
}
impl Default for Accuracy {
fn default() -> Accuracy {
Accuracy::Second
}
}

View file

@ -0,0 +1,74 @@
//
// imag - the personal information management suite for the commandline
// Copyright (C) 2015, 2016 Matthias Beyer <mail@beyermatthias.de> and contributors
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
// License as published by the Free Software Foundation; version
// 2.1 of the License.
//
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
// Lesser General Public License for more details.
//
// You should have received a copy of the GNU Lesser General Public
// License along with this library; if not, write to the Free Software
// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
//
use chrono::naive::datetime::NaiveDateTime;
use libimagstore::storeid::StoreId;
use datepath::accuracy::Accuracy;
use datepath::format::Format;
use datepath::result::Result;
/// A builder for the DatePath object which can then be used to compile a time definition into a
/// StoreId.
#[derive(Builder, Debug)]
#[builder(setter(prefix = "with"))]
pub struct DatePathCompilerBuilder {
/// The accuracy which should be used to compile the time definition.
///
/// For example a `Accuracy::Hour` will ignore the minute and second from the time definition,
/// a `Accuracy::Month` will ignore days, hours, minutes and seconds.
#[builder(default)]
accuracy : Accuracy,
/// The formatter which shall be used to compile the time specification.
#[builder(default)]
format : Format,
}
pub struct DatePathCompiler {
accuracy : Accuracy,
format : Format,
}
impl DatePathCompiler {
/// Compile a NaiveDateTime object into a StoreId object.
///
/// # More information
///
/// See the documentations of the `Format` and the `Accuracy` types as well.
///
/// # Warnings
///
/// This does _not_ guarantee that the StoreId can be created, is not yet in the store or
/// anything else. Overall, this is just a `spec->path` compiler which is really stupid.
///
/// # Return value
///
/// The `StoreId` object on success.
///
pub fn compile(&self, datetime: &NaiveDateTime) -> Result<StoreId> {
unimplemented!()
}
}

View file

@ -0,0 +1,29 @@
//
// imag - the personal information management suite for the commandline
// Copyright (C) 2015, 2016 Matthias Beyer <mail@beyermatthias.de> and contributors
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
// License as published by the Free Software Foundation; version
// 2.1 of the License.
//
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
// Lesser General Public License for more details.
//
// You should have received a copy of the GNU Lesser General Public
// License along with this library; if not, write to the Free Software
// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
//
/// Error module for the DatePathCompiler type
generate_error_module! {
generate_error_types!(DatePathCompilerError, DatePathCompilerErrorKind,
DatePathCompilerError => "Unknown DatePathCompiler error"
);
}
pub use self::error::DatePathCompilerError;
pub use self::error::DatePathCompilerErrorKind;
pub use self::error::MapErrInto;

View file

@ -17,65 +17,6 @@
// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
//
/// Error module for the DatePathCompiler type
generate_error_module! {
generate_error_types!(DatePathCompilerError, DatePathCompilerErrorKind,
DatePathCompilerError => "Unknown DatePathCompiler error"
);
}
pub use self::error::DatePathCompilerError;
pub use self::error::DatePathCompilerErrorKind;
pub use self::error::MapErrInto;
/// Result type for this module.
pub mod result {
use super::error::DatePathCompilerError as DPCE;
use std::result::Result as RResult;
pub type Result<T> = RResult<T, DPCE>;
}
use result::Result;
use chrono::naive::datetime::NaiveDateTime;
use libimagstore::storeid::StoreId;
/// A builder for the DatePath object which can then be used to compile a time definition into a
/// StoreId.
#[derive(Builder, Debug)]
#[builder(setter(prefix = "with"))]
pub struct DatePathCompilerBuilder {
/// The accuracy which should be used to compile the time definition.
///
/// For example a `Accuracy::Hour` will ignore the minute and second from the time definition,
/// a `Accuracy::Month` will ignore days, hours, minutes and seconds.
#[builder(default)]
accuracy : Accuracy,
/// The formatter which shall be used to compile the time specification.
#[builder(default)]
format : Format,
}
/// The accuracy with which the compiler should compile the time specification
#[derive(Clone, PartialEq, Eq, PartialOrd, Ord, Debug)]
pub enum Accuracy {
Year,
Month,
Day,
Hour,
Minute,
Second
}
impl Default for Accuracy {
fn default() -> Accuracy {
Accuracy::Second
}
}
/// The format which should be used to compile the datetime spec into a StoreId object.
///
/// # Warning
@ -149,45 +90,3 @@ impl Default for Format {
}
}
pub struct DatePathCompiler {
accuracy : Accuracy,
format : Format,
}
impl DatePathCompiler {
/// Compile a NaiveDateTime object into a StoreId object.
///
/// # More information
///
/// See the documentations of the `Format` and the `Accuracy` types as well.
///
/// # Warnings
///
/// This does _not_ guarantee that the StoreId can be created, is not yet in the store or
/// anything else. Overall, this is just a `spec->path` compiler which is really stupid.
///
/// # Return value
///
/// The `StoreId` object on success.
///
fn compile(&self, datetime: &NaiveDateTime) -> Result<StoreId> {
unimplemented!()
}
}
//
// Extension Trait for NaiveDateTime
//
pub trait ToStoreId {
fn to_store_id(&self, compiler: &DatePathCompiler) -> Result<StoreId>;
}
impl ToStoreId for NaiveDateTime {
fn to_store_id(&self, compiler: &DatePathCompiler) -> Result<StoreId> {
compiler.compile(self)
}
}

View file

@ -0,0 +1,26 @@
//
// imag - the personal information management suite for the commandline
// Copyright (C) 2015, 2016 Matthias Beyer <mail@beyermatthias.de> and contributors
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
// License as published by the Free Software Foundation; version
// 2.1 of the License.
//
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
// Lesser General Public License for more details.
//
// You should have received a copy of the GNU Lesser General Public
// License along with this library; if not, write to the Free Software
// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
//
pub mod accuracy;
pub mod compiler;
pub mod error;
pub mod format;
pub mod result;
pub mod to_store_id;

View file

@ -0,0 +1,25 @@
//
// imag - the personal information management suite for the commandline
// Copyright (C) 2015, 2016 Matthias Beyer <mail@beyermatthias.de> and contributors
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
// License as published by the Free Software Foundation; version
// 2.1 of the License.
//
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
// Lesser General Public License for more details.
//
// You should have received a copy of the GNU Lesser General Public
// License along with this library; if not, write to the Free Software
// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
//
/// Result type for this module.
use super::error::DatePathCompilerError as DPCE;
use std::result::Result as RResult;
pub type Result<T> = RResult<T, DPCE>;

View file

@ -0,0 +1,39 @@
//
// imag - the personal information management suite for the commandline
// Copyright (C) 2015, 2016 Matthias Beyer <mail@beyermatthias.de> and contributors
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
// License as published by the Free Software Foundation; version
// 2.1 of the License.
//
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
// Lesser General Public License for more details.
//
// You should have received a copy of the GNU Lesser General Public
// License along with this library; if not, write to the Free Software
// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
//
use chrono::naive::datetime::NaiveDateTime;
use libimagstore::storeid::StoreId;
use datepath::result::Result;
use datepath::compiler::DatePathCompiler;
//
// Extension Trait for NaiveDateTime
//
pub trait ToStoreId {
fn to_store_id(&self, modname: &str, compiler: &DatePathCompiler) -> Result<StoreId>;
}
impl ToStoreId for NaiveDateTime {
fn to_store_id(&self, modname: &str, compiler: &DatePathCompiler) -> Result<StoreId> {
compiler.compile(modname, self)
}
}