diff options
Diffstat (limited to 'src/poem/recite.rs')
| -rw-r--r-- | src/poem/recite.rs | 57 |
1 files changed, 29 insertions, 28 deletions
diff --git a/src/poem/recite.rs b/src/poem/recite.rs index 037906b..b33cc87 100644 --- a/src/poem/recite.rs +++ b/src/poem/recite.rs @@ -1,6 +1,5 @@ use super::Poem; use crate::compose::Environment; -use crate::path; use crate::poem::anthology; use crate::poem::elements::rune::Rune; use crate::poem::elements::stanza::Stanza; @@ -143,33 +142,35 @@ impl Reciteable for Poem { }; // Incant the verse if it's a built-in - let status = if index.is_some() { - anthology::incant(&verse, &mut out, index.unwrap(), env) - } else { - // Checking for environment variables and running internal - // poems may mean that the verb is empty now, so check it once - // more - // If it is empty, just continue to the next verse - if !verse.verb().is_empty() { - // Check if the verb exists on the PATH - // If it doesn't exist, try refreshing the binary cache, and check - // again - // If it still doesn't exist, print an error - if !verse.spellcheck(&env.bins).is_some() { - env.bins = path::refresh(); - if !verse.spellcheck(&env.bins).is_some() { - eprintln!("dwvsh: {}: command not found", verse.verb()); - - if verse.meter != Rune::And { - continue; - } - } - } - } else { - continue; - } - verse.incant(&mut out, &mut pids)? - }; + let status = + verse.incant(&mut out, &mut pids, env, anthology::lookup(&verse.verb()))?; + // let status = if index.is_some() { + // anthology::incant(&verse, &mut out, index.unwrap(), env) + // } else { + // // Checking for environment variables and running internal + // // poems may mean that the verb is empty now, so check it once + // // more + // // If it is empty, just continue to the next verse + // if !verse.verb().is_empty() { + // // Check if the verb exists on the PATH + // // If it doesn't exist, try refreshing the binary cache, and check + // // again + // // If it still doesn't exist, print an error + // if !verse.spellcheck(&env.bins).is_some() { + // env.bins = path::refresh(); + // if !verse.spellcheck(&env.bins).is_some() { + // eprintln!("dwvsh: {}: command not found", verse.verb()); + // + // if verse.meter != Rune::And { + // continue; + // } + // } + // } + // } else { + // continue; + // } + // verse.incant(&mut out, &mut pids, anthology::lookup(&verse.verb()))? + // }; // Break from the loop if the meter is not [Rune::Continue], and // if the status is not 0 |