Remove async from get_default_editor and get_default_pager

5 files changed, 16 insertions, 8 deletions

diff --git a/src/cmds/cmd/sheetedit.rs b/src/cmds/cmd/sheetedit.rs
index 730aeb7..8a18ae6 100644
--- a/src/cmds/cmd/sheetedit.rs
+++ b/src/cmds/cmd/sheetedit.rs
@@ -49,7 +49,7 @@ async fn prepare(args: &Arg, ctx: &JVCommandContext) -> Result<In, CmdPrepareErr
         PathFormatError::InvalidUtf8(e) => CmdPrepareError::Error(e.to_string()),
     })?;
 
-    let editor = args.editor.clone().unwrap_or(get_default_editor().await);
+    let editor = args.editor.clone().unwrap_or(get_default_editor());
 
     Ok(In { file, editor })
 }
diff --git a/src/systems/helpdoc/helpdoc_viewer.rs b/src/systems/helpdoc/helpdoc_viewer.rs
index 8473ce1..560b827 100644
--- a/src/systems/helpdoc/helpdoc_viewer.rs
+++ b/src/systems/helpdoc/helpdoc_viewer.rs
@@ -1,5 +1,8 @@
 use crate::systems::helpdoc::{get_helpdoc, get_helpdoc_list};
-use cli_utils::{display::markdown::Markdown, env::locales::current_locales};
+use cli_utils::{
+    display::markdown::Markdown,
+    env::{helpdoc::get_helpdoc_enabled, locales::current_locales},
+};
 use crossterm::{
     cursor::{Hide, MoveTo, Show},
     event::{self, Event, KeyCode, KeyEvent, KeyModifiers},
@@ -651,10 +654,15 @@ impl DocTree {
 
 /// Display help document viewer
 pub async fn display_with_lang(default_focus_doc: &str, lang: &str) {
-    let mut viewer = HelpdocViewer::new(default_focus_doc, lang);
+    if get_helpdoc_enabled() {
+        let mut viewer = HelpdocViewer::new(default_focus_doc, lang);
 
-    if let Err(e) = viewer.run().await {
-        eprintln!("Error running helpdoc viewer: {}", e);
+        if let Err(e) = viewer.run().await {
+            eprintln!("Error running helpdoc viewer: {}", e);
+        }
+    } else {
+        let content = get_helpdoc(default_focus_doc, lang).markdown();
+        println!("{}", content)
     }
 }
 
diff --git a/utils/src/display/pager.rs b/utils/src/display/pager.rs
index 79c2ccb..47cc270 100644
--- a/utils/src/display/pager.rs
+++ b/utils/src/display/pager.rs
@@ -15,7 +15,7 @@ pub async fn pager(
     fs::write(cache_path, content_str).await?;
 
     // Get the default pager
-    let pager_cmd = get_default_pager().await;
+    let pager_cmd = get_default_pager();
 
     // Try to use the pager
     let status = Command::new(&pager_cmd).arg(cache_path).status().await;
diff --git a/utils/src/env/editor.rs b/utils/src/env/editor.rs
index c7bd446..a4e1e0e 100644
--- a/utils/src/env/editor.rs
+++ b/utils/src/env/editor.rs
@@ -6,7 +6,7 @@
 ///
 /// # Returns
 /// A String containing the default text editor
-pub async fn get_default_editor() -> String {
+pub fn get_default_editor() -> String {
     if let Ok(editor) = std::env::var("JV_TEXT_EDITOR") {
         return editor;
     }
diff --git a/utils/src/env/pager.rs b/utils/src/env/pager.rs
index 3fdb1c3..437ecdb 100644
--- a/utils/src/env/pager.rs
+++ b/utils/src/env/pager.rs
@@ -6,7 +6,7 @@
 ///
 /// # Returns
 /// A String containing the default pager
-pub async fn get_default_pager() -> String {
+pub fn get_default_pager() -> String {
     if let Ok(pager) = std::env::var("JV_PAGER") {
         return pager;
     }