matthiasbeyer/imag
1
0
Fork 0
Code Releases Activity

Runtime::editor() should provide a Command object

Browse source
This commit is contained in:
Matthias Beyer 2016-01-02 19:27:13 +01:00
parent ad1a0e7f47
commit 2b8bd86ce1
1 changed files with 18 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
src/runtime.rs
View file

@ -1,4 +1,5 @@
use std::fmt::{Debug, Formatter, Error};
use std::process::Command;
extern crate log;
use log::{LogRecord, LogLevel, LogLevelFilter, LogMetadata, SetLoggerError};
@ -112,18 +113,26 @@ impl<'a> Runtime<'a> {
}
}
pub fn editor(&self) -> String {
pub fn editor(&self) -> Command {
use std::env::var;
if let Some(editor) = self.config.editor() {
editor + &self.config.editor_opts()[..]
} else if let Some(editor) = self.configuration.editor() {
editor + &self.configuration.editor_opts()[..]
} else if let Ok(editor) = var("EDITOR") {
editor
} else {
String::from("vim")
let (editor, args) : (String, String) = {
if let Some(editor) = self.config.editor() {
(editor, self.config.editor_opts())
} else if let Some(editor) = self.configuration.editor() {
(editor, self.configuration.editor_opts())
} else if let Ok(editor) = var("EDITOR") {
(editor, String::from(""))
} else {
(String::from("vim"), String::from(""))
}
};
let mut e = Command::new(editor);
for arg in args.split(" ") {
e.arg(arg);
}
e
}
}