2022-08-20 07:06:55 +00:00
|
|
|
mod git;
|
2022-08-21 00:59:09 +00:00
|
|
|
mod edit;
|
2022-08-20 04:01:43 +00:00
|
|
|
mod vault;
|
|
|
|
mod error;
|
|
|
|
mod tasks;
|
|
|
|
mod state;
|
|
|
|
mod config;
|
|
|
|
mod colour;
|
|
|
|
|
2022-08-21 00:59:09 +00:00
|
|
|
use tasks::Id;
|
|
|
|
|
2022-08-20 04:01:43 +00:00
|
|
|
use std::path;
|
|
|
|
|
|
|
|
#[derive(clap::Parser, Debug)]
|
|
|
|
struct Args {
|
|
|
|
#[clap(subcommand)]
|
|
|
|
command : Command,
|
|
|
|
}
|
|
|
|
|
2022-08-22 08:51:54 +00:00
|
|
|
#[derive(clap::Subcommand, Debug, PartialEq, Eq)]
|
2022-08-22 10:27:17 +00:00
|
|
|
#[clap(version, help_short='H', about, author, global_setting=clap::AppSettings::DisableHelpSubcommand)]
|
2022-08-20 04:01:43 +00:00
|
|
|
enum Command {
|
|
|
|
/// Create a new task.
|
|
|
|
New {
|
|
|
|
#[clap(short, long)]
|
|
|
|
name : String,
|
|
|
|
#[clap(short, long)]
|
|
|
|
info : Option<String>,
|
|
|
|
#[clap(short, long)]
|
|
|
|
tags : Vec<String>,
|
|
|
|
#[clap(short, long)]
|
2022-08-21 00:59:09 +00:00
|
|
|
dependencies : Vec<Id>,
|
2022-08-20 04:01:43 +00:00
|
|
|
#[clap(short, long, value_enum)]
|
|
|
|
priority : Option<tasks::Priority>,
|
|
|
|
},
|
2022-08-20 23:58:05 +00:00
|
|
|
/// Displays the specified task in detail.
|
|
|
|
View {
|
2022-08-21 07:14:26 +00:00
|
|
|
id_or_name : String,
|
2022-08-21 00:59:09 +00:00
|
|
|
},
|
2022-08-21 02:50:03 +00:00
|
|
|
/// Edit a note directly.
|
2022-08-21 00:59:09 +00:00
|
|
|
Edit {
|
2022-08-21 07:14:26 +00:00
|
|
|
id_or_name : String,
|
2022-08-21 02:50:03 +00:00
|
|
|
/// Edit the info specifically in its own file.
|
|
|
|
#[clap(short, long)]
|
2022-08-21 02:10:31 +00:00
|
|
|
info : bool,
|
2022-08-20 23:58:05 +00:00
|
|
|
},
|
2022-08-20 04:01:43 +00:00
|
|
|
/// Delete a task completely.
|
|
|
|
Delete {
|
2022-08-21 07:14:26 +00:00
|
|
|
id_or_name : String,
|
2022-08-20 04:01:43 +00:00
|
|
|
},
|
2022-08-22 08:58:13 +00:00
|
|
|
/// Deletes all discarded tasks.
|
|
|
|
Clean,
|
2022-08-20 04:01:43 +00:00
|
|
|
/// Discard a task without deleting the underlying file.
|
|
|
|
Discard {
|
2022-08-21 07:14:26 +00:00
|
|
|
id_or_name : String,
|
2022-08-20 04:01:43 +00:00
|
|
|
},
|
|
|
|
/// Mark a task as complete.
|
|
|
|
Complete {
|
2022-08-21 07:14:26 +00:00
|
|
|
id_or_name : String,
|
2022-08-20 04:01:43 +00:00
|
|
|
},
|
2022-08-20 07:06:55 +00:00
|
|
|
/// Run Git commands at the root of the vault.
|
|
|
|
#[clap(trailing_var_arg=true)]
|
|
|
|
Git {
|
|
|
|
args : Vec<String>,
|
|
|
|
},
|
2022-08-22 08:51:54 +00:00
|
|
|
/// Adds the recommended .gitignore file to the vault.
|
|
|
|
#[clap(name="gitignore")]
|
|
|
|
GitIgnore,
|
2022-08-20 23:58:05 +00:00
|
|
|
/// Lists tasks according to the specified ordering and filters.
|
|
|
|
List {
|
|
|
|
// Need to have options for:
|
|
|
|
// - column to order by
|
|
|
|
// - ascending or descending
|
|
|
|
// - which columns to include
|
|
|
|
// - filters which exclude values
|
|
|
|
},
|
2022-08-22 10:27:17 +00:00
|
|
|
/// For tracking time against a note.
|
|
|
|
Track {
|
|
|
|
id_or_name : String,
|
|
|
|
#[clap(short, default_value_t=0)]
|
|
|
|
hours : u16,
|
|
|
|
#[clap(short, default_value_t=0)]
|
|
|
|
minutes : u16,
|
|
|
|
},
|
2022-08-21 07:34:44 +00:00
|
|
|
/// For making changes to global configuration.
|
|
|
|
#[clap(subcommand)]
|
|
|
|
Config(ConfigCommand),
|
2022-08-20 04:01:43 +00:00
|
|
|
/// Commands for interacting with vaults.
|
|
|
|
#[clap(subcommand)]
|
|
|
|
Vault(VaultCommand),
|
2022-08-22 08:17:37 +00:00
|
|
|
/// Switches to the specified vault.
|
|
|
|
Switch {
|
|
|
|
name : String,
|
|
|
|
},
|
2022-08-20 04:01:43 +00:00
|
|
|
}
|
|
|
|
|
2022-08-22 08:51:54 +00:00
|
|
|
#[derive(clap::Subcommand, Debug, PartialEq, Eq)]
|
2022-08-21 07:34:44 +00:00
|
|
|
enum ConfigCommand {
|
|
|
|
/// For checking or changing default text editor command.
|
|
|
|
Editor {
|
|
|
|
/// Command to launch editor. Omit to view current editor.
|
|
|
|
editor : Option<String>,
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2022-08-22 08:51:54 +00:00
|
|
|
#[derive(clap::Subcommand, Debug, PartialEq, Eq)]
|
2022-08-20 04:01:43 +00:00
|
|
|
enum VaultCommand {
|
|
|
|
/// Creates a new vault at the specified location of the given name.
|
|
|
|
New {
|
|
|
|
name : String,
|
|
|
|
path : path::PathBuf,
|
|
|
|
},
|
|
|
|
/// Disconnects the specified vault from toru, without altering the files.
|
|
|
|
Disconnect {
|
|
|
|
name : String,
|
|
|
|
},
|
|
|
|
/// Connects an existing fault to toru.
|
|
|
|
Connect {
|
|
|
|
name : String,
|
|
|
|
path : path::PathBuf,
|
|
|
|
},
|
|
|
|
/// Deletes the specified vault along with all of its data.
|
|
|
|
Delete {
|
|
|
|
name : String,
|
|
|
|
},
|
|
|
|
/// Lists all configured vaults.
|
|
|
|
List,
|
2022-08-23 11:05:28 +00:00
|
|
|
/// For renaming an already set up vault.
|
|
|
|
Rename {
|
|
|
|
old_name : String,
|
|
|
|
new_name : String,
|
|
|
|
}
|
2022-08-20 04:01:43 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
fn main() {
|
|
|
|
let result = program();
|
|
|
|
|
|
|
|
match result {
|
|
|
|
Ok(()) => (),
|
|
|
|
Err(error::Error::Generic(message)) => {
|
|
|
|
println!("{} {}", colour::error("Error:"), message);
|
|
|
|
}
|
|
|
|
result => println!("{:?}", result),
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
fn program() -> Result<(), error::Error> {
|
|
|
|
let command = {
|
|
|
|
use clap::Parser;
|
|
|
|
Args::parse().command
|
|
|
|
};
|
|
|
|
|
|
|
|
let mut config = config::Config::load()?;
|
|
|
|
|
|
|
|
use Command::*;
|
2022-08-22 08:17:37 +00:00
|
|
|
if let Vault(command) = command {
|
|
|
|
use VaultCommand::*;
|
|
|
|
match command {
|
|
|
|
New { name, path } => {
|
|
|
|
vault::new(name.clone(), path, &mut config)?;
|
|
|
|
println!("Created vault {}", colour::vault(&name));
|
|
|
|
},
|
|
|
|
Disconnect { name } => {
|
|
|
|
vault::disconnect(&name, &mut config)?;
|
|
|
|
println!("Disconnected vault {}", colour::vault(&name));
|
|
|
|
},
|
|
|
|
Connect { name , path } => {
|
|
|
|
vault::connect(name.clone(), path, &mut config)?;
|
|
|
|
println!("Connected vault {}", colour::vault(&name));
|
|
|
|
},
|
|
|
|
Delete { name } => {
|
|
|
|
vault::delete(&name, &mut config)?;
|
|
|
|
println!("Deleted vault {}", colour::vault(&name));
|
|
|
|
},
|
|
|
|
List => {
|
|
|
|
config.list_vaults()?;
|
|
|
|
},
|
2022-08-23 11:05:28 +00:00
|
|
|
Rename { old_name, new_name } => {
|
|
|
|
config.rename_vault(&old_name, new_name.clone())?;
|
|
|
|
println!("Renamed vault {} to {}", colour::vault(&old_name), colour::vault(&new_name));
|
|
|
|
}
|
2022-08-22 08:17:37 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
else if let Config(command) = command {
|
|
|
|
use ConfigCommand::*;
|
|
|
|
match command {
|
|
|
|
Editor { editor } => {
|
|
|
|
match editor {
|
|
|
|
Some(editor) => {
|
|
|
|
config.editor = editor;
|
|
|
|
println!("Updated editor command to: {}", config.editor);
|
|
|
|
},
|
|
|
|
None => {
|
|
|
|
println!("Current editor command: {}", config.editor);
|
2022-08-21 07:34:44 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2022-08-22 08:17:37 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
else if let Switch { name } = command {
|
|
|
|
config.switch(&name)?;
|
|
|
|
println!("Switched to vault {}", colour::vault(&name));
|
|
|
|
}
|
|
|
|
else if let Git { args } = command {
|
|
|
|
let vault_folder = &config.current_vault()?.1;
|
|
|
|
git::run_command(args, vault_folder)?;
|
|
|
|
}
|
2022-08-22 08:51:54 +00:00
|
|
|
else if command == GitIgnore {
|
|
|
|
let vault_folder = &config.current_vault()?.1;
|
|
|
|
git::create_gitignore(vault_folder)?;
|
|
|
|
println!("Default .gitignore file created");
|
|
|
|
}
|
2022-08-22 08:17:37 +00:00
|
|
|
// Commands that require loading in the state.
|
|
|
|
else {
|
|
|
|
let vault_folder = &config.current_vault()?.1;
|
|
|
|
let mut state = state::State::load(vault_folder)?;
|
|
|
|
|
|
|
|
match command {
|
|
|
|
New { name, info, tags, dependencies, priority } => {
|
|
|
|
let task = tasks::Task::new(name, info, tags, dependencies, priority, vault_folder, &mut state)?;
|
|
|
|
println!("Created task {} (ID: {})", colour::task_name(&task.data.name), colour::id(&task.data.id.to_string()));
|
|
|
|
},
|
|
|
|
Delete { id_or_name } => {
|
|
|
|
let id = state.name_or_id_to_id(&id_or_name)?;
|
|
|
|
let task = tasks::Task::load(id, vault_folder, false)?;
|
|
|
|
let name = task.data.name.clone();
|
|
|
|
state.index_remove(task.data.name.clone(), task.data.id);
|
|
|
|
task.delete()?;
|
|
|
|
|
|
|
|
println!("Deleted task {} (ID: {})", colour::task_name(&name), colour::id(&id.to_string()));
|
|
|
|
},
|
|
|
|
View { id_or_name } => {
|
|
|
|
let id = state.name_or_id_to_id(&id_or_name)?;
|
|
|
|
let task = tasks::Task::load(id, vault_folder, true)?;
|
|
|
|
task.display()?;
|
|
|
|
},
|
|
|
|
Edit { id_or_name, info } => {
|
|
|
|
let id = state.name_or_id_to_id(&id_or_name)?;
|
|
|
|
if info {
|
|
|
|
edit::edit_info(id, vault_folder.clone(), &config.editor)?;
|
2022-08-20 23:58:05 +00:00
|
|
|
}
|
2022-08-22 08:17:37 +00:00
|
|
|
else {
|
|
|
|
edit::edit_raw(id, vault_folder.clone(), &config.editor, &mut state)?;
|
|
|
|
}
|
|
|
|
println!("Updated task {}", colour::id(&id.to_string()));
|
|
|
|
},
|
2022-08-22 10:27:17 +00:00
|
|
|
Track { id_or_name, hours, minutes } => {
|
|
|
|
let id = state.name_or_id_to_id(&id_or_name)?;
|
|
|
|
let mut task = tasks::Task::load(id, vault_folder, false)?;
|
|
|
|
let entry = tasks::TimeEntry::new(hours, minutes);
|
|
|
|
task.data.time_entries.push(entry);
|
|
|
|
task.save()?;
|
|
|
|
},
|
2022-08-22 08:17:37 +00:00
|
|
|
Discard { id_or_name } => {
|
|
|
|
let id = state.name_or_id_to_id(&id_or_name)?;
|
|
|
|
let mut task = tasks::Task::load(id, vault_folder, false)?;
|
|
|
|
task.data.discarded = true;
|
|
|
|
task.save()?;
|
|
|
|
println!("Discarded task {}", colour::id(&id.to_string()));
|
|
|
|
},
|
|
|
|
Complete { id_or_name } => {
|
|
|
|
let id = state.name_or_id_to_id(&id_or_name)?;
|
|
|
|
let mut task = tasks::Task::load(id, vault_folder, false)?;
|
|
|
|
task.data.complete = true;
|
|
|
|
task.save()?;
|
|
|
|
println!("Marked task {} as complete", colour::id(&id.to_string()));
|
|
|
|
},
|
|
|
|
List {} => {
|
|
|
|
tasks::list(vault_folder)?;
|
|
|
|
},
|
2022-08-22 08:58:13 +00:00
|
|
|
Clean => {
|
|
|
|
tasks::clean(vault_folder)?;
|
|
|
|
println!("Deleted all discarded tasks");
|
|
|
|
}
|
2022-08-22 08:17:37 +00:00
|
|
|
// All commands which are dealt with in if let chain at start.
|
2022-08-22 08:51:54 +00:00
|
|
|
Vault(_) | Config(_) | Git { args : _ } | Switch { name : _ } | GitIgnore => unreachable!(),
|
2022-08-20 04:01:43 +00:00
|
|
|
}
|
2022-08-22 08:17:37 +00:00
|
|
|
|
|
|
|
state.save()?;
|
2022-08-20 04:01:43 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
config.save()?;
|
|
|
|
|
|
|
|
Ok(())
|
|
|
|
}
|