From adca7a4a1cbb9ff421b411f6946238dedb6288dd Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Sat, 29 Jun 2019 21:51:58 +0200 Subject: Remove old implementation Signed-off-by: Matthias Beyer --- lib/domain/libimagtodo/src/iter.rs | 51 --------- lib/domain/libimagtodo/src/lib.rs | 56 ---------- lib/domain/libimagtodo/src/task.rs | 45 -------- lib/domain/libimagtodo/src/taskstore.rs | 184 -------------------------------- 4 files changed, 336 deletions(-) delete mode 100644 lib/domain/libimagtodo/src/iter.rs delete mode 100644 lib/domain/libimagtodo/src/lib.rs delete mode 100644 lib/domain/libimagtodo/src/task.rs delete mode 100644 lib/domain/libimagtodo/src/taskstore.rs (limited to 'lib') diff --git a/lib/domain/libimagtodo/src/iter.rs b/lib/domain/libimagtodo/src/iter.rs deleted file mode 100644 index 45d7a7c8..00000000 --- a/lib/domain/libimagtodo/src/iter.rs +++ /dev/null @@ -1,51 +0,0 @@ -// -// imag - the personal information management suite for the commandline -// Copyright (C) 2015-2019 Matthias Beyer 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 libimagstore::iter::Entries; -use libimagstore::storeid::StoreId; - -use failure::Fallible as Result; - -pub struct TaskIdIterator<'a>(Entries<'a>); - -impl<'a> TaskIdIterator<'a> { - - pub fn new(inner: Entries<'a>) -> Self { - TaskIdIterator(inner) - } - -} - -impl<'a> Iterator for TaskIdIterator<'a> { - type Item = Result; - - fn next(&mut self) -> Option { - loop { - match self.0.next() { - None => return None, - Some(Err(e)) => return Some(Err(e)), - Some(Ok(n)) => if n.is_in_collection(&["todo", "taskwarrior"]) { - return Some(Ok(n)) - }, // else continue - } - } - } - -} - diff --git a/lib/domain/libimagtodo/src/lib.rs b/lib/domain/libimagtodo/src/lib.rs deleted file mode 100644 index bde8b818..00000000 --- a/lib/domain/libimagtodo/src/lib.rs +++ /dev/null @@ -1,56 +0,0 @@ -// -// imag - the personal information management suite for the commandline -// Copyright (C) 2015-2019 Matthias Beyer 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 -// - -#![forbid(unsafe_code)] - -#![recursion_limit="256"] - -#![deny( - dead_code, - non_camel_case_types, - non_snake_case, - path_statements, - trivial_numeric_casts, - unstable_features, - unused_allocation, - unused_import_braces, - unused_imports, - unused_must_use, - unused_mut, - unused_qualifications, - while_true, -)] - -extern crate uuid; -extern crate toml; -extern crate toml_query; -#[macro_use] extern crate log; -extern crate serde_json; -#[macro_use] extern crate failure; - -#[macro_use] extern crate libimagstore; -extern crate libimagerror; -extern crate task_hookrs; - -module_entry_path_mod!("todo"); - -pub mod task; -pub mod taskstore; -pub mod iter; - diff --git a/lib/domain/libimagtodo/src/task.rs b/lib/domain/libimagtodo/src/task.rs deleted file mode 100644 index f62ef13e..00000000 --- a/lib/domain/libimagtodo/src/task.rs +++ /dev/null @@ -1,45 +0,0 @@ -// -// imag - the personal information management suite for the commandline -// Copyright (C) 2015-2019 Matthias Beyer 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 failure::ResultExt; -use failure::Error; -use failure::err_msg; -use failure::Fallible as Result; - -use libimagstore::store::Entry; -use libimagerror::errors::ErrorMsg as EM; - -use uuid::Uuid; -use toml_query::read::TomlValueReadTypeExt; - -pub trait Task { - fn get_uuid(&self) -> Result; -} - -impl Task for Entry { - fn get_uuid(&self) -> Result { - self.get_header() - .read_string("todo.uuid")? - .ok_or_else(|| Error::from(EM::EntryHeaderFieldMissing("todo.uuid"))) - .and_then(|u| { - Uuid::parse_str(&u).context(err_msg("UUID Parser error")).map_err(Error::from) - }) - } -} - diff --git a/lib/domain/libimagtodo/src/taskstore.rs b/lib/domain/libimagtodo/src/taskstore.rs deleted file mode 100644 index fbddecf6..00000000 --- a/lib/domain/libimagtodo/src/taskstore.rs +++ /dev/null @@ -1,184 +0,0 @@ -// -// imag - the personal information management suite for the commandline -// Copyright (C) 2015-2019 Matthias Beyer 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 std::io::BufRead; -use std::result::Result as RResult; - -use toml::Value; -use toml::map::Map; -use uuid::Uuid; - -use task_hookrs::task::Task as TTask; -use task_hookrs::import::{import_task, import_tasks}; -use failure::Fallible as Result; -use failure::ResultExt; -use failure::Error; -use failure::err_msg; - -use libimagstore::store::{FileLockEntry, Store}; -use libimagerror::errors::ErrorMsg as EM; - -use crate::iter::TaskIdIterator; - -/// Task struct containing a `FileLockEntry` -pub trait TaskStore<'a> { - fn import_task_from_reader(&'a self, r: R) -> Result<(FileLockEntry<'a>, String, Uuid)>; - fn get_task_from_import(&'a self, r: R) -> Result, String>>; - fn get_task_from_string(&'a self, s: String) -> Result, String>>; - fn get_task_from_uuid(&'a self, uuid: Uuid) -> Result>>; - fn retrieve_task_from_import(&'a self, r: R) -> Result>; - fn retrieve_task_from_string(&'a self, s: String) -> Result>; - fn delete_tasks_by_imports(&self, r: R) -> Result<()>; - fn delete_task_by_uuid(&self, uuid: Uuid) -> Result<()>; - fn all_tasks(&self) -> Result; - fn new_from_twtask(&'a self, task: TTask) -> Result>; -} - -impl<'a> TaskStore<'a> for Store { - - fn import_task_from_reader(&'a self, mut r: R) -> Result<(FileLockEntry<'a>, String, Uuid)> { - let mut line = String::new(); - r.read_line(&mut line).context(EM::UTF8Error)?; - import_task(&line.as_str()) - .context(err_msg("Error importing")) - .map_err(Error::from) - .and_then(|t| { - let uuid = *t.uuid(); - self.new_from_twtask(t).map(|t| (t, line, uuid)) - }) - } - - /// Get a task from an import string. That is: read the imported string, get the UUID from it - /// and try to load this UUID from store. - /// - /// Possible return values are: - /// - /// * Ok(Ok(Task)) - /// * Ok(Err(String)) - where the String is the String read from the `r` parameter - /// * Err(_) - where the error is an error that happened during evaluation - /// - fn get_task_from_import(&'a self, mut r: R) -> Result, String>> { - let mut line = String::new(); - r.read_line(&mut line).context(EM::UTF8Error)?; - self.get_task_from_string(line) - } - - /// Get a task from a String. The String is expected to contain the JSON-representation of the - /// Task to get from the store (only the UUID really matters in this case) - /// - /// For an explanation on the return values see `Task::get_from_import()`. - fn get_task_from_string(&'a self, s: String) -> Result, String>> { - import_task(s.as_str()) - .context(err_msg("Import error")) - .map_err(Error::from) - .map(|t| *t.uuid()) - .and_then(|uuid| self.get_task_from_uuid(uuid)) - .and_then(|o| match o { - None => Ok(Err(s)), - Some(t) => Ok(Ok(t)), - }) - } - - /// Get a task from an UUID. - /// - /// If there is no task with this UUID, this returns `Ok(None)`. - fn get_task_from_uuid(&'a self, uuid: Uuid) -> Result>> { - crate::module_path::new_id(format!("taskwarrior/{}", uuid)).and_then(|store_id| self.get(store_id)) - } - - /// Same as Task::get_from_import() but uses Store::retrieve() rather than Store::get(), to - /// implicitely create the task if it does not exist. - fn retrieve_task_from_import(&'a self, mut r: R) -> Result> { - let mut line = String::new(); - r.read_line(&mut line).context(EM::UTF8Error)?; - self.retrieve_task_from_string(line) - } - - /// Retrieve a task from a String. The String is expected to contain the JSON-representation of - /// the Task to retrieve from the store (only the UUID really matters in this case) - fn retrieve_task_from_string(&'a self, s: String) -> Result> { - self.get_task_from_string(s) - .and_then(|opt| match opt { - Ok(task) => Ok(task), - Err(string) => import_task(string.as_str()) - .context(err_msg("Import error")) - .map_err(Error::from) - .and_then(|t| self.new_from_twtask(t)), - }) - } - - fn delete_tasks_by_imports(&self, r: R) -> Result<()> { - use task_hookrs::status::TaskStatus; - - for (counter, res_ttask) in import_tasks(r).into_iter().enumerate() { - let ttask = res_ttask.context(err_msg("Import error"))?; - - if counter % 2 == 1 { - // Only every second task is needed, the first one is the - // task before the change, and the second one after - // the change. The (maybe modified) second one is - // expected by taskwarrior. - // - // Taskwarrior does not have the concept of deleted tasks, but only modified - // ones. - // - // Here we check if the status of a task is deleted and if yes, we delete it - // from the store. - if *ttask.status() == TaskStatus::Deleted { - self.delete_task_by_uuid(*ttask.uuid())?; - info!("Deleted task {}", *ttask.uuid()); - } - } - } - Ok(()) - } - - fn delete_task_by_uuid(&self, uuid: Uuid) -> Result<()> { - crate::module_path::new_id(format!("taskwarrior/{}", uuid)).and_then(|id| self.delete(id)) - } - - fn all_tasks(&self) -> Result { - self.entries().map(TaskIdIterator::new) - } - - fn new_from_twtask(&'a self, task: TTask) -> Result> { - use toml_query::read::TomlValueReadExt; - use toml_query::set::TomlValueSetExt; - - let uuid = task.uuid(); - crate::module_path::new_id(format!("taskwarrior/{}", uuid)).and_then(|id| { - self.retrieve(id).and_then(|mut fle| { - { - let hdr = fle.get_header_mut(); - if hdr.read("todo")?.is_none() { - hdr.set("todo", Value::Table(Map::new()))?; - } - - hdr.set("todo.uuid", Value::String(format!("{}",uuid)))?; - } - - // If none of the errors above have returned the function, everything is fine - Ok(fle) - }) - }) - - } - -} - -- cgit v1.2.3