Mirrors/navi
2
0
Fork 0
mirror of https://github.com/denisidoro/navi synced 2024-11-25 04:50:21 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix path for downloaded cheats (#493)

Browse source
This commit is contained in:
Denis Isidoro 2021-04-11 07:43:25 -03:00 committed by GitHub
parent 56ae9b880f
commit d550b29fb0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 19 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Cargo.lock generated
View file

@ -308,7 +308,7 @@ dependencies = [
[[package]] [[package]]
name = "navi" name = "navi"
version = "2.15.0" version = "2.15.1"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"clap", "clap",

2
Cargo.toml
View file

@ -1,6 +1,6 @@
[package] [package]
name = "navi" name = "navi"
version = "2.15.0" version = "2.15.1"
authors = ["Denis Isidoro <denis_isidoro@live.com>"] authors = ["Denis Isidoro <denis_isidoro@live.com>"]
edition = "2018" edition = "2018"
description = "An interactive cheatsheet tool for the command-line" description = "An interactive cheatsheet tool for the command-line"

9
src/cmds/repo.rs
View file

@ -116,7 +116,7 @@ pub fn add(uri: String, finder: &FinderChoice) -> Result<(), Error> {
}; };
let to_folder = { let to_folder = {
let mut p = cheat_pathbuf.clone(); let mut p = cheat_pathbuf;
p.push(format!("{}__{}", user, repo)); p.push(format!("{}__{}", user, repo));
p p
}; };
@ -127,7 +127,9 @@ pub fn add(uri: String, finder: &FinderChoice) -> Result<(), Error> {
p.push(file); p.push(file);
p p
}; };
let filename = file.replace("/", "__"); let filename = file
.replace(&format!("{}/", &tmp_path_str), "")
.replace("/", "__");
let to = { let to = {
let mut p = to_folder.clone(); let mut p = to_folder.clone();
p.push(filename); p.push(filename);
@ -146,9 +148,8 @@ pub fn add(uri: String, finder: &FinderChoice) -> Result<(), Error> {
filesystem::remove_dir(&tmp_pathbuf)?; filesystem::remove_dir(&tmp_pathbuf)?;
eprintln!( eprintln!(
"The following .cheat files were imported successfully:\n{}\n\nThey are now located at {}/{}", "The following .cheat files were imported successfully:\n{}\n\nThey are now located at {}",
files, files,
pathbuf_to_string(&cheat_pathbuf)?,
pathbuf_to_string(&to_folder)? pathbuf_to_string(&to_folder)?
); );

22
tests/run
View file

@ -111,8 +111,10 @@ _integration() {
sleep 1 sleep 1
tmux send-key -t ci "Enter" tmux send-key -t ci "Enter"
echoerr "Checking paths..."
sleep 2 sleep 2
cat "$log_file" | tail -n10 | grep -q "/navi" local -r downloaded_path="$(cat "$log_file" | grep 'They are now located at' | sed 's/They are now located at //')"
ls "$downloaded_path" | grep -q '^pkg_mgr__brew.cheat$'
} }
if ! command_exists fzf; then if ! command_exists fzf; then
@ -140,19 +142,19 @@ for i in $(_get_tests "$filter"); do
test::run "$query" _navi_cases_test "$query" "$expected" test::run "$query" _navi_cases_test "$query" "$expected"
done done
test::set_suite "3rd party"
test::run "tldr" _navi_tldr
test::run "cheatsh" _navi_cheatsh
test::set_suite "widget"
test::run "bash" _navi_widget "bash"
test::run "zsh" _navi_widget "zsh"
test::run "zsh" _navi_widget "fish"
test::set_suite "info" test::set_suite "info"
test::run "cheats_path" _navi_cheatspath test::run "cheats_path" _navi_cheatspath
test::set_suite "integration" test::set_suite "integration"
test::run "welcome->pwd" _integration test::run "welcome->pwd" _integration
test::set_suite "widget"
test::run "bash" _navi_widget "bash"
test::run "zsh" _navi_widget "zsh"
test::run "zsh" _navi_widget "fish"
test::set_suite "3rd party"
test::run "tldr" _navi_tldr
test::run "cheatsh" _navi_cheatsh
test::finish test::finish