Add Markdown storage

Cargo.lock

@@ -1,5 +1,7 @@
 # This file is automatically @generated by Cargo.
 # It is not intended for manual editing.
+version = 3
+
 [[package]]
 name = "adler32"
 version = "1.0.4"
@@ -334,6 +336,16 @@ dependencies = [
  "dirs-sys",
 ]
 
+[[package]]
+name = "dirs-next"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b98cf8ebf19c3d1b223e151f99a4f9f0690dca41414773390fc824184ac833e1"
+dependencies = [
+ "cfg-if 1.0.0",
+ "dirs-sys-next",
+]
+
 [[package]]
 name = "dirs-sys"
 version = "0.3.6"
@@ -345,6 +357,17 @@ dependencies = [
  "winapi 0.3.8",
 ]
 
+[[package]]
+name = "dirs-sys-next"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4ebda144c4fe02d1f7ea1a7d9641b6fc6b580adcfa024ae48797ecdeb6825b4d"
+dependencies = [
+ "libc",
+ "redox_users",
+ "winapi 0.3.8",
+]
+
 [[package]]
 name = "doc-comment"
 version = "0.3.1"
@@ -368,6 +391,7 @@ dependencies = [
  "reqwest",
  "serde",
  "serde_derive",
+ "shellexpand",
  "toml",
 ]
 
@@ -1691,6 +1715,15 @@ dependencies = [
  "url 1.7.2",
 ]
 
+[[package]]
+name = "shellexpand"
+version = "2.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "83bdb7831b2d85ddf4a7b148aa19d0587eddbe8671a436b7bd1182eaad0f2829"
+dependencies = [
+ "dirs-next",
+]
+
 [[package]]
 name = "siphasher"
 version = "0.2.3"

Cargo.toml

@@ -20,3 +20,4 @@ reqwest = "0.9"
 serde = "*"
 serde_derive = "*"
 toml = "0.5"
+shellexpand = "2.1"

src/args/mod.rs

@@ -89,14 +89,19 @@ pub fn parse() -> Result<Command, ParsingError> {
     match matches.subcommand() {
         ("create", _) => Ok(Command::add_account(account_name.into())),
         ("remove", _) => Ok(Command::remove_account(account_name.into())),
-        ("storage", Some(args)) => {
-            let storage =
-                args.subcommand_name().ok_or(ParsingError::UnknownCommand)?;
+        ("storage", Some(args)) => match args.subcommand() {
+            ("add", Some(add_args)) => {
+                let storage = add_args
+                    .subcommand_name()
+                    .ok_or(ParsingError::UnknownCommand)?;
+                log::debug!("Storage: {:?}", storage);
                 Ok(Command::add_storage(
                     account_name.into(),
                     StorageType::try_from(storage)?,
                 ))
             }
+            _ => unimplemented!(),
+        },
         _ => Err(ParsingError::UnknownCommand),
     }
 }

src/commands/mod.rs

@@ -27,6 +27,8 @@ use elefren::prelude::*;
 
 use self::errors::CommandError;
 use crate::config::config::Config;
+use crate::config::Configurable;
+use crate::storage::markdown::config::MarkdownConfig;
 
 type CommandResult = Result<(), CommandError>;
 
@@ -119,5 +121,14 @@ fn remove_account(name: &str) -> CommandResult {
 }
 
 fn add_storage(account: &str, storage: &StorageType) -> CommandResult {
+    let mut config = Config::open()?;
+    match storage {
+        StorageType::Markdown => {
+            let storage_config = MarkdownConfig::config()?;
+            config.set_storage_markdown(account, storage_config);
+        }
+        _ => unimplemented!(),
+    }
+    config.save()?;
     Ok(())
 }

src/config/config.rs

@@ -27,7 +27,7 @@ use serde_derive::Deserialize;
 use serde_derive::Serialize;
 
 use crate::config::errors::ConfigError;
-use crate::filesystem::config::FilesystemConfig;
+use crate::storage::markdown::config::MarkdownConfig;
 
 /// The last seen favourite
 #[derive(Serialize, Deserialize, Debug)]
@@ -40,7 +40,7 @@ struct Favourite {
 struct AccountConfig {
     favourite: Option<Favourite>,
     mastodon: Data,
-    filesystem: Option<FilesystemConfig>,
+    markdown: Option<MarkdownConfig>,
     // joplin: Option<JoplinConfig>,
     // org: Option<OrgConfig>,
 }
@@ -78,7 +78,7 @@ impl Config {
         let account_data = AccountConfig {
             favourite: None,
             mastodon: configuration,
-            filesystem: None,
+            markdown: None,
         };
         self.0.insert(name.into(), account_data);
     }
@@ -88,6 +88,18 @@ impl Config {
         self.0.remove(name);
     }
 
+    /// Set the configuration for the markdown storage
+    pub fn set_storage_markdown(
+        &mut self,
+        account: &str,
+        config: MarkdownConfig,
+    ) {
+        match self.0.get_mut(account.into()) {
+            Some(account) => account.markdown = Some(config),
+            None => {}
+        }
+    }
+
     /// Save the current configuration file.
     pub fn save(&self) -> Result<(), ConfigError> {
         let content = toml::to_string(&self.0)?;

src/config/errors.rs

@@ -25,6 +25,8 @@ pub enum ConfigError {
     ConfigFileIsBroken,
     /// There was something broken with the data and we couldn't save it properly
     InvalidConfiguration,
+    /// The select path is invalid
+    InvalidPath,
 }
 
 impl From<toml::de::Error> for ConfigError {
@@ -47,3 +49,10 @@ impl From<toml::ser::Error> for ConfigError {
         ConfigError::InvalidConfiguration
     }
 }
+
+impl From<shellexpand::LookupError<std::env::VarError>> for ConfigError {
+    fn from(e: shellexpand::LookupError<std::env::VarError>) -> Self {
+        log::debug!("Shellexpand error: {:?}", e);
+        ConfigError::InvalidPath
+    }
+}

src/config/mod.rs

@@ -18,3 +18,11 @@
 
 pub mod config;
 pub mod errors;
+
+use self::errors::ConfigError;
+
+pub trait Configurable {
+    fn config() -> Result<Self, ConfigError>
+    where
+        Self: Sized;
+}

src/main.rs

@@ -19,7 +19,6 @@
 mod args;
 mod commands;
 mod config;
-mod filesystem;
 mod storage;
 
 fn main() {

src/storage/markdown/config.rs

@@ -16,12 +16,32 @@
    along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
+use std::io::Write;
+
 use serde_derive::Deserialize;
 use serde_derive::Serialize;
 
+use crate::config::errors::ConfigError;
+use crate::config::Configurable;
+
 /// Configuration for the Filesystem backend
 #[derive(Serialize, Deserialize, Debug)]
-pub struct FilesystemConfig {
+pub struct MarkdownConfig {
     /// Path where files will be stored.
     pub path: String,
 }
+
+impl Configurable for MarkdownConfig {
+    fn config() -> Result<Self, ConfigError> {
+        print!("Base path for your files: ");
+        std::io::stdout().flush().expect("Failed to flush stdout!");
+
+        let mut path = String::new();
+        std::io::stdin().read_line(&mut path)?;
+        let fullpath = shellexpand::full(path.trim())?;
+        log::debug!("Full path: {:?}", fullpath);
+        Ok(Self {
+            path: fullpath.into(),
+        })
+    }
+}

src/storage/mod.rs

@@ -21,4 +21,5 @@ pub mod data;
 pub mod helpers;
 // pub mod joplin;
 // pub mod org;
+pub mod markdown;
 pub mod storage;