refactor: remove Cfs prefix from store types

Author: lzldev

src/actions.rs

@@ -4,8 +4,8 @@ use seahorse::{ActionError, ActionResult, Context};
 
 use crate::config::get_config_path;
 use crate::error::invalid;
-use crate::storage::json::CfsJSONStore;
-use crate::storage::{CfsStorage, CfsValue};
+use crate::storage::json::JSONStore;
+use crate::storage::{Store, StoreValue};
 
 pub fn init_action(_c: &Context) -> ActionResult {
 	let config_path = get_config_path();
@@ -15,13 +15,13 @@ pub fn init_action(_c: &Context) -> ActionResult {
 		println!("config file already exists");
 	}
 
-	CfsJSONStore::with_force_create(true);
+	JSONStore::with_force_create(true);
 
 	Ok(())
 }
 
 pub fn list_action(c: &Context) -> ActionResult {
-	let store = CfsJSONStore::with_force_create(c.bool_flag("force-create"));
+	let store = JSONStore::with_force_create(c.bool_flag("force-create"));
 
 	for (key, value) in store.all().iter() {
 		println!("{}\t{}", key, value);
@@ -31,7 +31,7 @@ pub fn list_action(c: &Context) -> ActionResult {
 }
 
 pub fn clear_action(_c: &Context) -> ActionResult {
-	let mut store = CfsJSONStore::new();
+	let mut store = JSONStore::new();
 
 	store.clear();
 
@@ -51,7 +51,7 @@ pub fn get_action(c: &Context) -> ActionResult {
 		return Err(invalid("key"));
 	};
 
-	let store = CfsJSONStore::new();
+	let store = JSONStore::new();
 
 	let value = store.get(key);
 
@@ -86,9 +86,9 @@ pub fn set_action(c: &Context) -> ActionResult {
 		return Err(invalid("value"));
 	};
 
-	let mut store = CfsJSONStore::new();
+	let mut store = JSONStore::new();
 
-	let value = CfsValue::Value(value_str.to_owned());
+	let value = StoreValue::Value(value_str.to_owned());
 	store.set(key, value.clone());
 
 	println!("{}\t{}", key, value);
@@ -101,7 +101,7 @@ pub fn remove_action(c: &Context) -> ActionResult {
 		return Err(invalid("key"));
 	};
 
-	let mut store = CfsJSONStore::new();
+	let mut store = JSONStore::new();
 
 	match store.remove(key) {
 		Some(value) => println!("{}\t{}", key, value),

src/storage/json.rs

@@ -6,7 +6,7 @@ use std::process::exit;
 use json::JsonValue;
 
 use crate::config::get_config_path;
-use crate::storage::{CfsStorage, CfsValue};
+use crate::storage::{Store, StoreValue};
 
 pub fn init_store(force_create: bool) -> JsonValue {
 	let path = get_config_path();
@@ -30,11 +30,11 @@ pub fn init_store(force_create: bool) -> JsonValue {
 }
 
 #[derive(Clone, Debug)]
-pub struct CfsJSONStore {
+pub struct JSONStore {
 	store: JsonValue,
 }
 
-impl CfsJSONStore {
+impl JSONStore {
 	pub fn new() -> Self {
 		return Self {
 			store: init_store(false),
@@ -58,32 +58,32 @@ impl CfsJSONStore {
 	}
 }
 
-impl CfsStorage for CfsJSONStore {
-	fn all(&self) -> Vec<(String, CfsValue)> {
+impl Store for JSONStore {
+	fn all(&self) -> Vec<(String, StoreValue)> {
 		self
 			.store
 			.entries()
 			.map(|(key, value)| (key.to_owned(), value.into()))
 			.collect()
 	}
 
-	fn get(&self, key: &str) -> Option<CfsValue> {
+	fn get(&self, key: &str) -> Option<StoreValue> {
 		if !self.store.has_key(key) {
 			return None;
 		}
 
 		Some(self.store[key].clone().into())
 	}
 
-	fn set(&mut self, key: &str, value: CfsValue) -> CfsValue {
+	fn set(&mut self, key: &str, value: StoreValue) -> StoreValue {
 		self.store.insert(key, value.clone()).unwrap();
 
 		self.save_store().unwrap();
 
 		value
 	}
 
-	fn remove(&mut self, key: &str) -> Option<CfsValue> {
+	fn remove(&mut self, key: &str) -> Option<StoreValue> {
 		if !self.store.has_key(key) {
 			return None;
 		}

src/storage/mod.rs

@@ -1,14 +1,15 @@
 pub mod json;
+mod sqlite;
 mod value;
 
-pub use value::CfsValue;
+pub use value::StoreValue;
 
-pub trait CfsStorage {
-	fn all(&self) -> Vec<(String, CfsValue)>;
+pub trait Store {
+	fn all(&self) -> Vec<(String, StoreValue)>;
 
-	fn get(&self, key: &str) -> Option<CfsValue>;
-	fn set(&mut self, key: &str, value: CfsValue) -> CfsValue;
-	fn remove(&mut self, key: &str) -> Option<CfsValue>;
+	fn get(&self, key: &str) -> Option<StoreValue>;
+	fn set(&mut self, key: &str, value: StoreValue) -> StoreValue;
+	fn remove(&mut self, key: &str) -> Option<StoreValue>;
 
 	fn clear(&mut self);
 }

src/storage/value.rs

@@ -3,16 +3,16 @@ use std::fmt::Display;
 use json::JsonValue;
 
 #[derive(Debug, Clone)]
-pub enum CfsValue {
+pub enum StoreValue {
 	Value(String),
 	List(Vec<String>),
 }
 
-impl Display for CfsValue {
+impl Display for StoreValue {
 	fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
 		match self {
-			CfsValue::Value(v) => write!(f, "{}", v),
-			CfsValue::List(items) => {
+			StoreValue::Value(v) => write!(f, "{}", v),
+			StoreValue::List(items) => {
 				let mut array_string = String::new();
 				for i in items.iter() {
 					array_string.push_str(&format!("{},", i));
@@ -24,37 +24,37 @@ impl Display for CfsValue {
 	}
 }
 
-impl From<CfsValue> for JsonValue {
-	fn from(value: CfsValue) -> Self {
+impl From<StoreValue> for JsonValue {
+	fn from(value: StoreValue) -> Self {
 		match value {
-			CfsValue::Value(string) => JsonValue::String(string),
-			CfsValue::List(items) => {
+			StoreValue::Value(string) => JsonValue::String(string),
+			StoreValue::List(items) => {
 				JsonValue::Array(items.into_iter().map(|i| JsonValue::String(i)).collect())
 			}
 		}
 	}
 }
 
-impl From<JsonValue> for CfsValue {
+impl From<JsonValue> for StoreValue {
 	fn from(value: JsonValue) -> Self {
 		match value {
 			JsonValue::Array(json_values) => {
-				CfsValue::List(json_values.iter().map(|f| f.to_string()).collect())
+				StoreValue::List(json_values.iter().map(|f| f.to_string()).collect())
 			}
-			JsonValue::String(string) => CfsValue::Value(string),
-			_ => CfsValue::Value(value.to_string()),
+			JsonValue::String(string) => StoreValue::Value(string),
+			_ => StoreValue::Value(value.to_string()),
 		}
 	}
 }
 
-impl From<&JsonValue> for CfsValue {
+impl From<&JsonValue> for StoreValue {
 	fn from(value: &JsonValue) -> Self {
 		match value {
 			JsonValue::Array(json_values) => {
-				CfsValue::List(json_values.iter().map(|f| f.to_string()).collect())
+				StoreValue::List(json_values.iter().map(|f| f.to_string()).collect())
 			}
-			JsonValue::String(string) => CfsValue::Value(string.clone()),
-			_ => CfsValue::Value(value.to_string()),
+			JsonValue::String(string) => StoreValue::Value(string.clone()),
+			_ => StoreValue::Value(value.to_string()),
 		}
 	}
 }