valerie/open
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Packages Wiki Activity

fixed a panic when opening a file with an unconfigured extension

Browse source
This commit is contained in:
Valerie Wolfe 2021-11-25 12:53:36 -05:00
parent a270d08c47
commit 17a05cf2c5
3 changed files with 13 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Cargo.toml
View file

@ -1,10 +1,10 @@
[package] [package]
name = "open" name = "open"
version = "0.4.0" version = "0.5.0"
authors = ["Valerie Wolfe <sleeplessval@gmail.com>"] authors = ["Valerie Wolfe <sleeplessval@gmail.com>"]
edition = "2018" edition = "2018"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[dependencies] [dependencies]
configparser = "2.0.1" configparser = "3.0.0"

14
src/config.rs
View file

@ -86,13 +86,15 @@ impl Config {
} }
return output; return output;
} }
pub fn getbool(&self, section: &str, key: &str) -> Result<Option<bool>, String> { pub fn getbool(&self, section: &str, key: &str) -> Option<bool> {
let mut output = Ok(None); let mut output = None;
if self.local.is_some() { if self.local.is_some() {
output = self.local.as_ref().unwrap().getbool(section, key); let i_out = self.local.as_ref().unwrap().getbool(section, key);
output = i_out.unwrap_or(None);
} }
if output.clone().ok().is_none() && self.global.is_some() { if output.is_none() && self.global.is_some() {
output = self.global.as_ref().unwrap().getbool(section, key); let i_out = self.global.as_ref().unwrap().getbool(section, key);
output = i_out.unwrap_or(None);
} }
return output; return output;
} }
@ -105,7 +107,7 @@ impl Config {
ini = self.global.clone().unwrap(); ini = self.global.clone().unwrap();
} }
ini.set(section, key, Some(value)); ini.set(section, key, Some(value));
if local{ if local {
self.local = Some(ini); self.local = Some(ini);
} else { } else {
self.global = Some(ini); self.global = Some(ini);

6
src/main.rs
View file

@ -22,7 +22,7 @@ fn main() {
match arg.as_str() { match arg.as_str() {
"-h" | "-h" |
"--help" => { "--help" => {
println!("open v0.4.0 println!("open v0.5.0
Valerie Wolfe <sleeplessval@gmail.com> Valerie Wolfe <sleeplessval@gmail.com>
A Linux implementation of the \"open\" command on Mac OS written in Rust and easily configurable. A Linux implementation of the \"open\" command on Mac OS written in Rust and easily configurable.
@ -106,7 +106,7 @@ FLAGS:
let i_exe = config.get(ext, "command"); let i_exe = config.get(ext, "command");
if i_exe.is_none() { if i_exe.is_none() {
let use_editor = config.getbool("open", "use_editor"); let use_editor = config.getbool("open", "use_editor");
if use_editor.is_ok() && use_editor.ok().unwrap().unwrap() { if use_editor.unwrap_or(false) {
let i_editor = var("EDITOR"); let i_editor = var("EDITOR");
if i_editor.is_err() { if i_editor.is_err() {
println!("open: encountered an error trying to access $EDITOR"); println!("open: encountered an error trying to access $EDITOR");
@ -143,7 +143,7 @@ FLAGS:
command.args(param) command.args(param)
.current_dir(dir); .current_dir(dir);
let is_sh = config.getbool(ext, "shell").ok().unwrap_or(Some(false)).unwrap_or(false); let is_sh = config.getbool(ext, "shell").unwrap_or(false);
if is_sh { if is_sh {
command.stdout(Stdio::inherit()) command.stdout(Stdio::inherit())
.stderr(Stdio::inherit()) .stderr(Stdio::inherit())