Move common helpers to src/ (#465)

denisidoro · Apr 4, 2021 · 23be67d · 23be67d
1 parent 347c19d
commit 23be67d
Show file tree

Hide file tree

Showing 24 changed files with 90 additions and 52 deletions.
diff --git a/src/bin/main.rs b/src/bin/main.rs
@@ -1,5 +1,29 @@
 extern crate navi;
 
+use std::fmt::Debug;
+use thiserror::Error;
+
+#[derive(Error, Debug)]
+#[error(
+    "\rHey, listen! navi encountered a problem.
+Do you think this is a bug? File an issue at https://github.com/denisidoro/navi."
+)]
+pub struct FileAnIssue {
+    #[source]
+    source: anyhow::Error,
+}
+
+impl FileAnIssue {
+    pub fn new<SourceError>(source: SourceError) -> Self
+    where
+        SourceError: Into<anyhow::Error>,
+    {
+        FileAnIssue {
+            source: source.into(),
+        }
+    }
+}
+
 fn main() -> Result<(), anyhow::Error> {
-    navi::handle_config(navi::config_from_env()).map_err(|e| navi::FileAnIssue::new(e).into())
+    navi::handle_config(navi::config_from_env()).map_err(|e| FileAnIssue::new(e).into())
 }
diff --git a/src/clipboard.rs b/src/clipboard.rs
@@ -0,0 +1,42 @@
+use crate::shell::BashSpawnError;
+use anyhow::Error;
+use std::process::Command;
+
+pub fn copy(text: String) -> Result<(), Error> {
+    let cmd = r#"
+exst() {
+   type "$1" &>/dev/null
+}
+
+_copy() {
+   if exst pbcopy; then
+      pbcopy
+   elif exst xclip; then
+      xclip -selection clipboard
+   elif exst clip.exe; then
+      clip.exe
+   else
+      exit 55
+   fi
+}"#;
+
+    Command::new("bash")
+        .arg("-c")
+        .arg(
+            format!(
+                r#"{} 
+        read -r -d '' x <<'NAVIEOF'
+{}
+NAVIEOF
+
+echo -n "$x" | _copy"#,
+                cmd, text
+            )
+            .as_str(),
+        )
+        .spawn()
+        .map_err(|e| BashSpawnError::new(cmd, e))?
+        .wait()?;
+
+    Ok(())
+}
diff --git a/src/cmds/alfred.rs b/src/cmds/alfred.rs
@@ -1,7 +1,7 @@
-use crate::common::shell::BashSpawnError;
 use crate::display;
 use crate::fetcher::Fetcher;
 use crate::filesystem;
+use crate::shell::BashSpawnError;
 use crate::structures::cheat::Suggestion;
 use crate::structures::config::Config;
 use anyhow::Context;

diff --git a/src/cmds/core.rs b/src/cmds/core.rs
@@ -1,11 +1,11 @@
 use crate::cheatsh;
-use crate::common::clipboard;
-use crate::common::shell::{BashSpawnError, IS_FISH};
+use crate::clipboard;
 use crate::display;
 use crate::env_vars;
 use crate::fetcher::Fetcher;
 use crate::filesystem;
 use crate::finder::Finder;
+use crate::shell::{BashSpawnError, IS_FISH};
 use crate::structures::cheat::{Suggestion, VariableMap};
 use crate::structures::config::Action;
 use crate::structures::config::Config;

diff --git a/src/cmds/func.rs b/src/cmds/func.rs
@@ -1,6 +1,6 @@
-use crate::common::url;
 use crate::handler;
 use crate::structures::config;
+use crate::url;
 use anyhow::Error;
 
 #[derive(Debug)]

diff --git a/src/cmds/info.rs b/src/cmds/info.rs
@@ -1,5 +1,5 @@
-use crate::common::filesystem::pathbuf_to_string;
 use crate::filesystem::default_cheat_pathbuf;
+use crate::fs::pathbuf_to_string;
 use anyhow::Error;
 
 #[derive(Debug)]

diff --git a/src/cmds/repo.rs b/src/cmds/repo.rs
@@ -1,6 +1,6 @@
-use crate::common::git;
 use crate::filesystem;
 use crate::finder::{Finder, FinderChoice};
+use crate::git;
 use crate::structures::finder::{Opts as FinderOpts, SuggestionType};
 use anyhow::Context;
 use anyhow::Error;

diff --git a/src/cmds/shell.rs b/src/cmds/shell.rs
@@ -1,4 +1,4 @@
-use crate::common::shell::Shell;
+use crate::shell::Shell;
 use anyhow::Error;
 
 pub fn main(shell: &Shell) -> Result<(), Error> {

diff --git a/src/common/clipboard.rs b/src/common/clipboard.rs
@@ -1,4 +1,4 @@
-use crate::common::shell::BashSpawnError;
+use crate::shell::BashSpawnError;
 use anyhow::Error;
 use std::process::Command;
 

diff --git a/src/common/file_issue.rs b/src/common/file_issue.rs
diff --git a/src/common/mod.rs b/src/common/mod.rs
diff --git a/src/display/terminal.rs b/src/display/terminal.rs
@@ -1,8 +1,8 @@
-use crate::common::terminal_width;
 use crate::display;
 use crate::env_vars;
 use crate::finder;
 use crate::structures::item::Item;
+use crate::terminal_width;
 use std::cmp::max;
 use std::collections::HashSet;
 use std::env;

diff --git a/src/fetcher/filesystem.rs b/src/fetcher/filesystem.rs
@@ -1,5 +1,5 @@
-use crate::common::filesystem::{pathbuf_to_string, read_lines};
 use crate::display::Writer;
+use crate::fs::{pathbuf_to_string, read_lines};
 use crate::parser;
 use crate::structures::cheat::VariableMap;
 use anyhow::Error;

diff --git a/src/filesystem.rs b/src/filesystem.rs
@@ -1,9 +1,7 @@
-pub use crate::common::filesystem::{
-    create_dir, exe_string, pathbuf_to_string, remove_dir, InvalidPath, UnreadableDir,
-};
 use crate::display::Writer;
 use crate::fetcher;
 pub use crate::fetcher::filesystem::{all_cheat_files, default_cheat_pathbuf, read_all};
+pub use crate::fs::{create_dir, exe_string, pathbuf_to_string, remove_dir, InvalidPath, UnreadableDir};
 use crate::structures::cheat::VariableMap;
 use anyhow::Error;
 

diff --git a/src/common/filesystem.rs → src/fs.rs b/src/common/filesystem.rs → src/fs.rs
diff --git a/src/common/git.rs → src/git.rs b/src/common/git.rs → src/git.rs
@@ -1,4 +1,4 @@
-use crate::common::shell::BashSpawnError;
+use crate::shell::BashSpawnError;
 use anyhow::{Context, Error};
 use std::process::Command;
 

diff --git a/src/common/hash.rs → src/hash.rs b/src/common/hash.rs → src/hash.rs
diff --git a/src/lib.rs b/src/lib.rs
@@ -4,19 +4,24 @@ extern crate lazy_static;
 extern crate anyhow;
 
 mod cheatsh;
+mod clipboard;
 mod cmds;
-mod common;
 mod display;
 mod env_vars;
 mod fetcher;
 mod filesystem;
 mod finder;
+mod fs;
+mod git;
 mod handler;
+mod hash;
 mod parser;
+mod shell;
 mod structures;
+mod terminal_width;
 mod tldr;
+mod url;
 mod welcome;
 
-pub use common::file_issue::FileAnIssue;
 pub use handler::handle_config;
 pub use structures::config::{config_from_env, config_from_iter};
diff --git a/src/parser.rs b/src/parser.rs
@@ -1,5 +1,5 @@
-use crate::common::hash::fnv;
 use crate::display::{self, Writer};
+use crate::hash::fnv;
 use crate::structures::cheat::VariableMap;
 use crate::structures::finder::{Opts as FinderOpts, SuggestionType};
 use crate::structures::item::Item;

diff --git a/src/common/shell.rs → src/shell.rs b/src/common/shell.rs → src/shell.rs
diff --git a/src/structures/cheat.rs b/src/structures/cheat.rs
@@ -1,4 +1,4 @@
-use crate::common::hash::fnv;
+use crate::hash::fnv;
 use crate::structures::finder::Opts;
 use std::collections::HashMap;
 

diff --git a/src/structures/config.rs b/src/structures/config.rs
@@ -1,8 +1,8 @@
 use crate::cmds::func::Func;
 use crate::cmds::info::Info;
-use crate::common::shell::Shell;
 use crate::env_vars;
 use crate::finder::FinderChoice;
+use crate::shell::Shell;
 use clap::{crate_version, AppSettings, Clap};
 use std::str::FromStr;
 

diff --git a/src/common/terminal_width.rs → src/terminal_width.rs b/src/common/terminal_width.rs → src/terminal_width.rs
diff --git a/src/common/url.rs → src/url.rs b/src/common/url.rs → src/url.rs
@@ -1,4 +1,4 @@
-use crate::common::shell::BashSpawnError;
+use crate::shell::BashSpawnError;
 use anyhow::Error;
 use std::process::Command;