option to edit info only in separate file
This commit is contained in:
parent
2ed43ea6d4
commit
c5474f1701
55
src/edit.rs
55
src/edit.rs
@ -7,7 +7,49 @@ use crate::tasks;
|
|||||||
use crate::error;
|
use crate::error;
|
||||||
use crate::tasks::Id;
|
use crate::tasks::Id;
|
||||||
|
|
||||||
pub fn edit_raw(id : Id, vault_folder : path::PathBuf) -> Result<(), error::Error> {
|
pub fn open_editor(path : &path::Path, editor : &str) -> Result<process::ExitStatus, error::Error> {
|
||||||
|
let mut command = process::Command::new(editor);
|
||||||
|
|
||||||
|
command
|
||||||
|
.args(vec![&path]);
|
||||||
|
|
||||||
|
let mut child = command.spawn()?;
|
||||||
|
|
||||||
|
child.wait().map_err(|err| error::Error::from(err))
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn edit_info(id : Id, vault_folder : path::PathBuf, editor : &str) -> Result<(), error::Error> {
|
||||||
|
let mut task = tasks::Task::load(id, vault_folder.clone(), false)?;
|
||||||
|
|
||||||
|
let temp_path = vault_folder.join("temp.md");
|
||||||
|
|
||||||
|
fs::write(&temp_path, &task.data.info.unwrap_or(String::new()).as_bytes())?;
|
||||||
|
|
||||||
|
let status = open_editor(&temp_path, editor)?;
|
||||||
|
|
||||||
|
if !status.success() {
|
||||||
|
match status.code() {
|
||||||
|
Some(code) => Err(error::Error::Generic(format!("Process responded with a non-zero status code: {}", code))),
|
||||||
|
None => Err(error::Error::Generic(String::from("Process was interrupted by signal"))),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
let file_contents = fs::read_to_string(&temp_path)?;
|
||||||
|
|
||||||
|
task.data.info = if file_contents.is_empty() {
|
||||||
|
None
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
Some(file_contents)
|
||||||
|
};
|
||||||
|
|
||||||
|
task.save()?;
|
||||||
|
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn edit_raw(id : Id, vault_folder : path::PathBuf, editor : &str) -> Result<(), error::Error> {
|
||||||
|
|
||||||
let mut task = tasks::Task::load(id, vault_folder.clone(), false)?;
|
let mut task = tasks::Task::load(id, vault_folder.clone(), false)?;
|
||||||
|
|
||||||
@ -15,16 +57,7 @@ pub fn edit_raw(id : Id, vault_folder : path::PathBuf) -> Result<(), error::Erro
|
|||||||
|
|
||||||
fs::copy(task.path(), &temp_path)?;
|
fs::copy(task.path(), &temp_path)?;
|
||||||
|
|
||||||
// This will be a matter of configuration later on.
|
let status = open_editor(&temp_path, editor)?;
|
||||||
let mut command = process::Command::new("nvim");
|
|
||||||
|
|
||||||
command
|
|
||||||
.current_dir(&vault_folder)
|
|
||||||
.args(vec![&temp_path]);
|
|
||||||
|
|
||||||
let mut child = command.spawn()?;
|
|
||||||
|
|
||||||
let status = child.wait()?;
|
|
||||||
|
|
||||||
if !status.success() {
|
if !status.success() {
|
||||||
match status.code() {
|
match status.code() {
|
||||||
|
11
src/main.rs
11
src/main.rs
@ -41,6 +41,8 @@ enum Command {
|
|||||||
},
|
},
|
||||||
Edit {
|
Edit {
|
||||||
id : Id,
|
id : Id,
|
||||||
|
#[clap(long)]
|
||||||
|
info : bool,
|
||||||
},
|
},
|
||||||
/// Delete a task completely.
|
/// Delete a task completely.
|
||||||
Delete {
|
Delete {
|
||||||
@ -167,8 +169,13 @@ fn program() -> Result<(), error::Error> {
|
|||||||
let task = tasks::Task::load(id, vault_folder.clone(), true)?;
|
let task = tasks::Task::load(id, vault_folder.clone(), true)?;
|
||||||
task.display()?;
|
task.display()?;
|
||||||
},
|
},
|
||||||
Edit { id } => {
|
Edit { id, info } => {
|
||||||
edit::edit_raw(id, vault_folder.clone())?;
|
if info {
|
||||||
|
edit::edit_info(id, vault_folder.clone(), "nvim")?;
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
edit::edit_raw(id, vault_folder.clone(), "nvim")?;
|
||||||
|
}
|
||||||
println!("Updated task {}", colour::id(&id.to_string()));
|
println!("Updated task {}", colour::id(&id.to_string()));
|
||||||
},
|
},
|
||||||
Discard { id } => {
|
Discard { id } => {
|
||||||
|
Loading…
Reference in New Issue
Block a user