pijul/pijul - Change Y6EBNUOTVJTMMQJNFZZ65LHHHR43YBUS4SHZOZB6Y7CLYNDA2HMQC

refactor config::Global::load

Seperate determination of user config file path from reading it. This simplifys the logic inside load as the config file which should be read is determined in an extra funtion. Additionaly removed the read metadata value, because it was not used anyways.

Created by hardy7cc on October 29, 2023

Y6EBNUOTVJTMMQJNFZZ65LHHHR43YBUS4SHZOZB6Y7CLYNDA2HMQC

Dependencies

In discussions

#832 [DRAFT] refactor global configuration

Change contents

Replacement in pijul-repository/src/lib.rs at line 218 [5.21431]

B:BD[4.984] → [2.54:118]

        if let Ok((config, _)) = pijul_config::Global::load() {

[4.984]

[6.209]

        if let Ok(config) = pijul_config::Global::load() {

Replacement in pijul-interaction/src/input/mod.rs at line 17 [3.8063]

B:BD[3.8553] → [3.8553:8611]

        if let Ok((config, _)) = config::Global::load() {

[3.8553]

[3.8611]

        if let Ok(config) = config::Global::load() {

Insertion in pijul-config/src/lib.rs at line 14 [5.89866]
[5.89940]
[5.89940]
```
#[serde(deny_unknown_fields)]
```
Replacement in pijul-config/src/lib.rs at line 75 [5.89866]
B:BD[5.90005] → [7.306:358]
```
pub const GLOBAL_CONFIG_DIR: &str = ".pijulconfig";
```
[5.90005]
[8.295]
```
const GLOBAL_CONFIG_DIR: &str = ".pijulconfig";
```
Insertion in pijul-config/src/lib.rs at line 77 [5.89866]
[8.329]
[5.90047]
```
const CONFIG_FILE_NAME: &str = "config.toml";
```

Insertion in pijul-config/src/lib.rs at line 88 [5.89866]

[7.534]

    }
}
/// Get path to the user config file
///
/// additionaly as fallback evaluate $HOME/.pijulconfig
fn user_config_file_path() -> Option<PathBuf> {
    let mut config_dir = global_config_dir()?;
    config_dir.push(CONFIG_FILE_NAME);
    if config_dir.exists() {
        return Some(config_dir);
    }
    // Read from `$HOME/.pijulconfig`
    let mut config_dir = dirs_next::home_dir()?;
    config_dir.push(GLOBAL_CONFIG_DIR);
    config_dir.push(CONFIG_FILE_NAME);
    if config_dir.exists() {
        return Some(config_dir);

Insertion in pijul-config/src/lib.rs at line 107 [5.89866]
[7.540]
[7.540]
```
    return None;
```

Replacement in pijul-config/src/lib.rs at line 111 [5.89866]

B:BD[5.90062] → [9.12751:12811]

∅:D[9.12811] → [7.544:597]

B:BD[5.90115] → [7.544:597]

∅:D[7.597] → [5.90206:90243]

B:BD[5.90206] → [5.90206:90243]

B:BD[5.90243] → [9.12812:12925]

∅:D[9.12925] → [10.60:357]

B:BD[10.60] → [10.60:357]

B:BD[10.357] → [9.12926:13018]

∅:D[9.13018] → [10.401:594]

B:BD[10.401] → [10.401:594]

∅:D[10.594] → [5.90370:90437]

B:BD[5.90370] → [5.90370:90437]

B:BD[5.90437] → [7.598:651]

B:BD[7.651] → [9.13019:13111]

∅:D[10.639] → [5.90532:90561]

∅:D[9.13111] → [5.90532:90561]

B:BD[5.90532] → [5.90532:90561]

B:BD[5.90561] → [10.640:678]

∅:D[10.678] → [5.90607:90629]

B:BD[5.90607] → [5.90607:90629]

B:BD[5.90629] → [10.679:700]

∅:D[10.700] → [5.90662:90697]

B:BD[5.90662] → [5.90662:90697]

B:BD[5.90697] → [11.11467:11517]

B:BD[11.11517] → [9.13112:13336]

∅:D[9.13336] → [11.11539:11646]

B:BD[11.11539] → [11.11539:11646]

    pub fn load() -> Result<(Global, u64), anyhow::Error> {
        if let Some(mut dir) = global_config_dir() {
            dir.push("config.toml");
            let (s, meta) = std::fs::read(&dir)
                .and_then(|x| Ok((x, std::fs::metadata(&dir)?)))
                .or_else(|e| {
                    // Read from `$HOME/.config/pijul` dir
                    if let Some(mut dir) = dirs_next::home_dir() {
                        dir.push(".config");
                        dir.push(CONFIG_DIR);
                        dir.push("config.toml");
                        std::fs::read(&dir).and_then(|x| Ok((x, std::fs::metadata(&dir)?)))
                    } else {
                        Err(e.into())
                    }
                })
                .or_else(|e| {
                    // Read from `$HOME/.pijulconfig`
                    if let Some(mut dir) = dirs_next::home_dir() {
                        dir.push(GLOBAL_CONFIG_DIR);
                        std::fs::read(&dir).and_then(|x| Ok((x, std::fs::metadata(&dir)?)))
                    } else {
                        Err(e.into())
                    }
                })?;
            debug!("s = {:?}", s);
            if let Ok(t) = toml::from_slice(&s) {
                let ts = meta
                    .modified()?
                    .duration_since(std::time::SystemTime::UNIX_EPOCH)
                    .unwrap()
                    .as_secs();
                Ok((t, ts))
            } else {
                bail!("Could not read configuration file at {:?}", dir)
            }

[5.90062]

[5.90881]

    pub fn load() -> Result<Global, anyhow::Error> {
        let config_file = user_config_file_path();
        let config_content = if let Some(config_file) = &config_file {
            std::fs::read(&config_file)?

Insertion in pijul-config/src/lib.rs at line 117 [5.89866]

[11.11702]

[5.90954]

        };
        debug!("s = {:?}", config_content);
        let toml_parsed: Result<Global, _> = toml::from_slice(&config_content);
        match toml_parsed {
            Ok(global) => Ok(global),
            Err(e) => {
                let mut stderr = std::io::stderr();
                writeln!(
                    stderr,
                    "Error during reading the configuration file at {}",
                    config_file.as_ref().unwrap().display()
                )?;
                writeln!(stderr, "Toml parsing error: {}", e)?;
                bail!("Could not read configuration file at {:?}", &config_file)
            }

Replacement in pijul-config/src/lib.rs at line 333 [5.89866]
B:BD[12.669] → [12.669:715]
```
    if let Ok((config, _)) = Global::load() {
```
[12.669]
[12.715]
```
    if let Ok(config) = Global::load() {
```

Replacement in pijul/src/commands/unrecord.rs at line 64 [5.95630]

B:BD[13.2745] → [2.658:720]

                let (cfg, _) = pijul_config::Global::load()?;

[13.2745]

[14.2936]

                let cfg = pijul_config::Global::load()?;

Replacement in pijul/src/commands/record.rs at line 233 [5.101759]

B:BD[9.14464] → [9.14464:14592]

        let templates = config
            .as_ref()
            .ok()
            .and_then(|(cfg, _)| cfg.template.as_ref());

[9.14464]

[15.524]

        let templates = config.as_ref().ok().and_then(|cfg| cfg.template.as_ref());

Replacement in pijul/src/commands/mod.rs at line 140 [5.133619]
B:BD[16.667] → [16.667:713]
```
        .and_then(|(global, _)| global.pager)
```
[16.667]
[17.119]
```
        .and_then(|global| global.pager)
```

Replacement in pijul/src/commands/diff.rs at line 353 [5.173551]

B:BD[18.483] → [2.1334:1394]

    if let Ok((global, _)) = pijul_config::Global::load() {

[18.483]

[18.539]

    if let Ok(global) = pijul_config::Global::load() {

refactor config::Global::load

Dependencies

In discussions

Change contents

Replacement in pijul-repository/src/lib.rs at line 218 [5.21431]

Replacement in pijul-interaction/src/input/mod.rs at line 17 [3.8063]

Insertion in pijul-config/src/lib.rs at line 14 [5.89866]

Replacement in pijul-config/src/lib.rs at line 75 [5.89866]

Insertion in pijul-config/src/lib.rs at line 77 [5.89866]

Insertion in pijul-config/src/lib.rs at line 88 [5.89866]

Insertion in pijul-config/src/lib.rs at line 107 [5.89866]

Replacement in pijul-config/src/lib.rs at line 111 [5.89866]

Insertion in pijul-config/src/lib.rs at line 117 [5.89866]

Replacement in pijul-config/src/lib.rs at line 333 [5.89866]

Replacement in pijul/src/commands/unrecord.rs at line 64 [5.95630]

Replacement in pijul/src/commands/record.rs at line 233 [5.101759]

Replacement in pijul/src/commands/mod.rs at line 140 [5.133619]

Replacement in pijul/src/commands/diff.rs at line 353 [5.173551]