diff options
| -rw-r--r-- | helix-core/src/lib.rs | 11 | ||||
| -rw-r--r-- | helix-term/src/main.rs | 21 |
2 files changed, 23 insertions, 9 deletions
diff --git a/helix-core/src/lib.rs b/helix-core/src/lib.rs index d5b0cd15..3e00081f 100644 --- a/helix-core/src/lib.rs +++ b/helix-core/src/lib.rs @@ -58,13 +58,22 @@ pub fn runtime_dir() -> std::path::PathBuf { pub fn config_dir() -> std::path::PathBuf { // TODO: allow env var override - use etcetera::base_strategy::{choose_base_strategy, BaseStrategy}; let strategy = choose_base_strategy().expect("Unable to find the config directory!"); let mut path = strategy.config_dir(); path.push("helix"); path } +pub fn cache_dir() -> std::path::PathBuf { + // TODO: allow env var override + let strategy = choose_base_strategy().expect("Unable to find the config directory!"); + let mut path = strategy.cache_dir(); + path.push("helix"); + path +} + +use etcetera::base_strategy::{choose_base_strategy, BaseStrategy}; + pub use ropey::{Rope, RopeSlice}; pub use tendril::StrTendril as Tendril; diff --git a/helix-term/src/main.rs b/helix-term/src/main.rs index 8f29007c..3f37c295 100644 --- a/helix-term/src/main.rs +++ b/helix-term/src/main.rs @@ -8,13 +8,11 @@ mod ui; use application::Application; -use helix_core::config_dir; - use std::path::PathBuf; use anyhow::{Context, Error, Result}; -fn setup_logging(verbosity: u64) -> Result<()> { +fn setup_logging(logpath: PathBuf, verbosity: u64) -> Result<()> { let mut base_config = fern::Dispatch::new(); // Let's say we depend on something which whose "info" level messages are too @@ -40,7 +38,7 @@ fn setup_logging(verbosity: u64) -> Result<()> { message )) }) - .chain(fern::log_file(config_dir().join("helix.log"))?); + .chain(fern::log_file(logpath)?); base_config.chain(file_config).apply()?; @@ -96,6 +94,12 @@ fn parse_args(mut args: Args) -> Result<Args> { #[tokio::main] async fn main() -> Result<()> { + let cache_dir = helix_core::cache_dir(); + if !cache_dir.exists() { + std::fs::create_dir(&cache_dir); + } + + let logpath = cache_dir.join("helix.log"); let help = format!( "\ {} {} @@ -111,12 +115,14 @@ ARGS: FLAGS: -h, --help Prints help information -v Increases logging verbosity each use for up to 3 times + (default file: {}) -V, --version Prints version information ", env!("CARGO_PKG_NAME"), env!("CARGO_PKG_VERSION"), env!("CARGO_PKG_AUTHORS"), env!("CARGO_PKG_DESCRIPTION"), + logpath.display(), ); let mut args: Args = Args { @@ -139,19 +145,18 @@ FLAGS: std::process::exit(0); } - let conf_dir = config_dir(); - + let conf_dir = helix_core::config_dir(); if !conf_dir.exists() { std::fs::create_dir(&conf_dir); } - setup_logging(args.verbosity).context("failed to initialize logging")?; + setup_logging(logpath, args.verbosity).context("failed to initialize logging")?; // initialize language registry use helix_core::syntax::{Loader, LOADER}; // load $HOME/.config/helix/languages.toml, fallback to default config - let config = std::fs::read(config_dir().join("languages.toml")); + let config = std::fs::read(helix_core::config_dir().join("languages.toml")); let toml = config .as_deref() .unwrap_or(include_bytes!("../../languages.toml")); |