Move print_versions into a util crate.

This commit is contained in:
Tom Alexander 2023-12-26 19:06:12 -05:00
parent 68ccff74fa
commit 8186fbb8b3
Signed by: talexander
GPG Key ID: D3A179C9A53C0EDE
3 changed files with 54 additions and 3 deletions

View File

@ -1,10 +1,12 @@
#![feature(exact_size_is_empty)] #![feature(exact_size_is_empty)]
#![feature(exit_status_error)]
use std::io::Read; use std::io::Read;
use organic::settings::GlobalSettings; use organic::settings::GlobalSettings;
use wasm::wasm_parse_org; use wasm::wasm_parse_org;
mod error; mod error;
mod util;
mod wasm; mod wasm;
#[cfg(feature = "tracing")] #[cfg(feature = "tracing")]

47
src/util/mod.rs Normal file
View File

@ -0,0 +1,47 @@
use tokio::process::Command;
pub(crate) async fn print_versions() -> Result<(), Box<dyn std::error::Error>> {
eprintln!("Using emacs version: {}", get_emacs_version().await?.trim());
eprintln!(
"Using org-mode version: {}",
get_org_mode_version().await?.trim()
);
Ok(())
}
pub(crate) async fn get_emacs_version() -> Result<String, Box<dyn std::error::Error>> {
let elisp_script = r#"(progn
(message "%s" (version))
)"#;
let mut cmd = Command::new("emacs");
let cmd = cmd
.arg("-q")
.arg("--no-site-file")
.arg("--no-splash")
.arg("--batch")
.arg("--eval")
.arg(elisp_script);
let out = cmd.output().await?;
out.status.exit_ok()?;
Ok(String::from_utf8(out.stderr)?)
}
pub(crate) async fn get_org_mode_version() -> Result<String, Box<dyn std::error::Error>> {
let elisp_script = r#"(progn
(org-mode)
(message "%s" (org-version nil t nil))
)"#;
let mut cmd = Command::new("emacs");
let cmd = cmd
.arg("-q")
.arg("--no-site-file")
.arg("--no-splash")
.arg("--batch")
.arg("--eval")
.arg(elisp_script);
let out = cmd.output().await?;
out.status.exit_ok()?;
Ok(String::from_utf8(out.stderr)?)
}

View File

@ -1,6 +1,8 @@
use organic::parser::parse_with_settings; use organic::parser::parse_with_settings;
use organic::settings::GlobalSettings; use organic::settings::GlobalSettings;
use crate::util::print_versions;
pub async fn wasm_run_anonymous_compare_with_settings<'g, 's, P: AsRef<str>>( pub async fn wasm_run_anonymous_compare_with_settings<'g, 's, P: AsRef<str>>(
org_contents: P, org_contents: P,
global_settings: &GlobalSettings<'g, 's>, global_settings: &GlobalSettings<'g, 's>,
@ -9,9 +11,9 @@ pub async fn wasm_run_anonymous_compare_with_settings<'g, 's, P: AsRef<str>>(
// TODO: This is a work-around to pretend that dos line endings do not exist. It would be better to handle the difference in line endings. // TODO: This is a work-around to pretend that dos line endings do not exist. It would be better to handle the difference in line endings.
let org_contents = org_contents.as_ref().replace("\r\n", "\n"); let org_contents = org_contents.as_ref().replace("\r\n", "\n");
let org_contents = org_contents.as_str(); let org_contents = org_contents.as_str();
// if !silent { if !silent {
// print_versions().await?; print_versions().await?;
// } }
let rust_parsed = parse_with_settings(org_contents, global_settings)?; let rust_parsed = parse_with_settings(org_contents, global_settings)?;
// let org_sexp = emacs_parse_anonymous_org_document(org_contents, global_settings).await?; // let org_sexp = emacs_parse_anonymous_org_document(org_contents, global_settings).await?;
// let (_remaining, parsed_sexp) = sexp(org_sexp.as_str()).map_err(|e| e.to_string())?; // let (_remaining, parsed_sexp) = sexp(org_sexp.as_str()).map_err(|e| e.to_string())?;