AnActualEmerald/Papa - Change Z63KACBB5Y6RCH3LKJCSUL6A6HVYRWTZV3UCJ6GS6NWAAZDW6BNAC

more relative path fixes

Created by AnActualEmerald on August 10, 2022

Z63KACBB5Y6RCH3LKJCSUL6A6HVYRWTZV3UCJ6GS6NWAAZDW6BNAC

Dependencies

In channels

main

Change contents

Insertion in src/core/utils.rs at line 10 [3.19820]
[3.20045]
[2.549]
```
use log::debug;
```

Replacement in src/core/utils.rs at line 154 [3.19820]

B:BD[3.24921] → [3.24921:24980]

    let name = &m.name;
    let old_path = m.path.clone();

[3.24921]

[3.24980]

    let old_path = ctx.local_target.join(&m.path);

Replacement in src/core/utils.rs at line 156 [3.19820]

B:BD[3.24981] → [2.1664:1728]

    let dir = ctx.local_target.join(".disabled").join(&m.path);

[3.24981]

[3.25039]

    let dir = ctx.local_target.join(".disabled");
    let new_path = dir.join(&m.path);

Replacement in src/core/utils.rs at line 163 [3.19820]

B:BD[3.25105] → [3.25105:25134]

    m.path = dir.join(name);

[3.25105]

[3.25134]

    debug!(
        "Rename mod from {} to {}",
        old_path.display(),
        new_path.display()
    );
    fs::rename(&old_path, &new_path).context("Failed to rename mod")?;

Replacement in src/core/utils.rs at line 170 [3.19820]

B:BD[3.25135] → [2.1729:1798]

    fs::rename(&old_path, &m.path).context("Failed to rename mod")?;

[3.25135]

[3.25203]

    m.path = Path::new(".disabled").join(&m.path);

Replacement in src/core/utils.rs at line 180 [3.19820]

B:BD[3.25345] → [3.25345:25417]

    let old_path = m.path.clone();
    m.path = mods_dir.join(&m.name);

[3.25345]

[3.25417]

    let old_path = mods_dir.join(&m.path);
    m.path = m.path.strip_prefix(".disabled")?.to_path_buf();
    let new_path = mods_dir.join(&m.path);

Replacement in src/core/utils.rs at line 184 [3.19820]

B:BD[3.25418] → [3.25418:25486]

    fs::rename(old_path, &m.path).context("Failed to reanem mod")?;

[3.25418]

[3.25486]

    debug!(
        "Rename mod from {} to {}",
        old_path.display(),
        new_path.display()
    );

Insertion in src/core/utils.rs at line 190 [3.19820]

[3.25487]

    fs::rename(old_path, new_path).context("Failed to rename mod")?;

Replacement in src/core/commands/utils.rs at line 34 [3.36484]
B:BD[3.37358] → [2.2923:2966]
∅:D[2.2966] → [3.37393:37411]
B:BD[3.37393] → [3.37393:37411]
B:BD[3.37411] → [2.2967:3043]
∅:D[2.3043] → [3.37510:37520]
B:BD[3.37510] → [3.37510:37520]
```
        if let Some((_, inst)) = installed
            .mods
            .iter_mut()
            .find(|(n, _)| **n == pkg.package_name)
        {
```
[3.37358]
[3.37558]
```
        installed.mods.entry(pkg.package_name).and_modify(|inst| {
```

Replacement in src/core/commands/utils.rs at line 42 [3.36484]

B:BD[3.37932] → [3.37932:38151]

            for (a, b) in inst.mods.iter().zip(pkg.mods.iter()) {
                trace!("a mod: {:#?} | b mod: {:#?}", a, b);
                if a.disabled() {
                    fs::remove_dir_all(&a.path).unwrap();

[3.37932]

[3.38151]

            for (curr, new) in inst.mods.iter().zip(pkg.mods.iter()) {
                trace!("current mod: {:#?} | new mod: {:#?}", curr, new);
                if curr.disabled() {
                    fs::remove_dir_all(ctx.local_target.join(&curr.path)).unwrap();

Replacement in src/core/commands/utils.rs at line 48 [3.36484]

B:BD[3.38231] → [3.38231:38314]

                        b.path.display(),
                        a.path.display()

[3.38231]

[3.38314]

                        new.path.display(),
                        curr.path.display()

Replacement in src/core/commands/utils.rs at line 51 [3.36484]

B:BD[3.38337] → [3.38337:38407]

                    fs::rename(&b.path, &a.path).unwrap_or_else(|e| {

[3.38337]

[3.38407]

                    fs::rename(
                        ctx.local_target.join(&new.path),
                        ctx.local_target.join(&curr.path),
                    )
                    .unwrap_or_else(|e| {

Replacement in src/core/commands/utils.rs at line 62 [3.36484]

B:BD[3.38575] → [3.38575:38609]

B:BD[3.38650] → [3.38650:38714]

            inst.mods = pkg.mods;
            println!("Updated {}", pkg.package_name);
        }

[3.38575]

[3.38714]

            println!("Updated {}", inst.package_name);
        });

Replacement in src/core/commands/install.rs at line 132 [3.48442]
B:BD[3.51807] → [3.51807:51847]
```
        println!("{}", e.unwrap_err());
```
[3.51807]
[3.51847]
```
        println!("{:#?}", e.unwrap_err());
```

Replacement in src/core/commands/enable.rs at line 16 [3.54811]

B:BD[3.55360] → [3.55360:55403]

                println!("Enabled {}", m);

[3.55360]

[3.55403]

                println!("Enabled {}", p.package_name);

Replacement in src/core/commands/enable.rs at line 21 [3.54811]

B:BD[3.55590] → [3.55590:55641]

                        println!("Enabled {}", m);

[3.55590]

[3.55641]

                        println!("Enabled {}", p.package_name);

Replacement in src/core/actions.rs at line 20 [3.57831]
B:BD[3.58170] → [3.58170:58195]
```
use log::{debug, error};
```
[3.58170]
[3.58195]
```
use log::{debug, error, trace};
```

Insertion in src/core/actions.rs at line 125 [3.57831]

[3.62059]

                trace!("Creating dir path in temp dir");

Insertion in src/core/actions.rs at line 129 [3.57831]

[3.62179]

                trace!("Creating dir at {}", p.display());

Insertion in src/core/actions.rs at line 132 [3.57831]

[3.62234]

            trace!("Open file {} for writing", out.display());

Replacement in src/core/actions.rs at line 148 [3.57831]

B:BD[2.13663] → [2.13663:13764]

                let m_path = e.path();
                let m_path = m_path.strip_prefix(&temp_dir)?;

[2.13663]

[3.62668]

                // let m_path = e.path();
                // let m_path = m_path.strip_prefix(&temp_dir)?;

Replacement in src/core/actions.rs at line 153 [3.57831]

B:BD[3.62839] → [2.13765:13854]

                        mods.push(SubMod::new(e.file_name().to_str().unwrap(), m_path));

[3.62839]

[3.62931]

                        let name = e.file_name();
                        let name = name.to_str().unwrap();
                        debug!("Add submod {}", name);
                        mods.push(SubMod::new(name, &Path::new("mods").join(name)));

Replacement in src/core/actions.rs at line 159 [3.57831]

B:BD[3.62978] → [2.13855:13940]

                    mods.push(SubMod::new(e.file_name().to_str().unwrap(), m_path));

[3.62978]

[3.63066]

                    debug!(
                        "Add one submod {}",
                        e.path().file_name().unwrap().to_string_lossy()
                    );
                    mods.push(SubMod::new(
                        e.file_name().to_str().unwrap(),
                        &PathBuf::new(),
                    ));

Replacement in src/core/actions.rs at line 177 [3.57831]
B:BD[2.14001] → [2.14001:14028]
```
    for p in mods.iter() {
```
[2.14001]
[2.14028]
```
    for p in mods.iter_mut() {
```
Insertion in src/core/actions.rs at line 179 [3.57831]
[2.14071]
[2.14071]
```
        p.path = p.path.strip_prefix("mods")?.to_path_buf();
```

Insertion in src/core/actions.rs at line 181 [3.57831]

[2.14114]

        trace!(
            "Temp path: {} | Perm path: {}",
            temp.display(),
            perm.display()
        );

Replacement in src/api/model.rs at line 129 [3.63951]

B:BD[2.15244] → [2.15244:15292]

            let parsed = ron::to_string(self)?;

[2.15244]

[2.15292]

            let parsed = ron::ser::to_string_pretty(self, ron::ser::PrettyConfig::new())?;