summaryrefslogtreecommitdiff
path: root/src/bin
diff options
context:
space:
mode:
Diffstat (limited to 'src/bin')
-rw-r--r--src/bin/git-autosave-daemon.rs5
-rw-r--r--src/bin/git-autosave.rs4
-rw-r--r--src/bin/git-init-autosave.rs6
-rw-r--r--src/bin/git-restore-autosave.rs4
4 files changed, 9 insertions, 10 deletions
diff --git a/src/bin/git-autosave-daemon.rs b/src/bin/git-autosave-daemon.rs
index 39df4b8..2c27ab2 100644
--- a/src/bin/git-autosave-daemon.rs
+++ b/src/bin/git-autosave-daemon.rs
@@ -44,7 +44,7 @@ impl<Cache: FileIdCache + Send + 'static> DebounceEventHandler for ConfigWatcher
log::error!("Failed to acquire thread key when reloading config. This is a bug!");
return;
};
- let config = match git_autosave::load_config() {
+ let config = match Config::load() {
Ok(config) => config,
Err(e) => {
log::error!("Failed to reload autosave config: {e}");
@@ -172,8 +172,7 @@ fn main() -> Result<(), anyhow::Error> {
colog::init();
log::info!("Loading autosave config...");
- let config: &'static Mutex<Config> =
- Box::leak(Box::new(Mutex::new(git_autosave::load_config()?)));
+ let config: &'static Mutex<Config> = Box::leak(Box::new(Mutex::new(Config::load()?)));
log::info!("Loaded autosave config");
log::info!("Starting repository watcher...");
diff --git a/src/bin/git-autosave.rs b/src/bin/git-autosave.rs
index 4a85206..fa0d9e6 100644
--- a/src/bin/git-autosave.rs
+++ b/src/bin/git-autosave.rs
@@ -5,11 +5,11 @@ use git2::{RemoteCallbacks, Repository};
fn main() -> Result<(), anyhow::Error> {
let repository = Repository::discover(".")?;
let gitconfig = repository.config()?;
- let config: &'static mut Config = Box::leak(Box::new(git_autosave::load_config()?));
+ let config: &'static mut Config = Box::leak(Box::new(Config::load()?));
if std::env::args().any(|arg| arg == "--init") {
let id = git_autosave::init(&repository, Some(config))?;
- git_autosave::save_config(config)?;
+ config.save()?;
println!("Initialized autosave for repository: {id}");
}
diff --git a/src/bin/git-init-autosave.rs b/src/bin/git-init-autosave.rs
index 8e72a9e..77ee4e4 100644
--- a/src/bin/git-init-autosave.rs
+++ b/src/bin/git-init-autosave.rs
@@ -1,11 +1,11 @@
-use git_autosave::{init, load_config, save_config};
+use git_autosave::{Config, init};
use git2::Repository;
fn main() -> Result<(), anyhow::Error> {
let repository = Repository::discover(".")?;
- let mut config = load_config()?;
+ let mut config = Config::load()?;
let id = init(&repository, Some(&mut config))?;
- save_config(&config)?;
+ config.save()?;
println!("Initialized autosave for repository: {id}");
diff --git a/src/bin/git-restore-autosave.rs b/src/bin/git-restore-autosave.rs
index 8613e15..b948cc2 100644
--- a/src/bin/git-restore-autosave.rs
+++ b/src/bin/git-restore-autosave.rs
@@ -14,7 +14,7 @@ use std::fmt::Display;
use auth_git2::GitAuthenticator;
use chrono::Local;
-use git_autosave::{Autosave, authenticate::Inquirer};
+use git_autosave::{Autosave, Config, authenticate::Inquirer};
use git2::{RemoteCallbacks, Repository, build::CheckoutBuilder};
struct AutosaveOption {
@@ -42,7 +42,7 @@ fn main() -> Result<(), anyhow::Error> {
let branch = git_autosave::current_branch(&repository)?;
let earliest_time = repository.head()?.peel_to_commit()?.time();
- let config: &'static _ = Box::leak(Box::new(git_autosave::load_config()?));
+ let config: &'static _ = Box::leak(Box::new(Config::load()?));
let auth = GitAuthenticator::new().set_prompter(Inquirer(config));
let mut callbacks = RemoteCallbacks::new();
callbacks.credentials(auth.credentials(&gitconfig));