Skip to content

refactor(hooks): use path2 plugin for base path resolution #2490

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
yujonglee wants to merge 1 commit into from
Closed

refactor(hooks): use path2 plugin for base path resolution #2490

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions plugins/hooks/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,3 +30,5 @@ futures-util = { workspace = true }
shellexpand = { workspace = true }
thiserror = { workspace = true }
tokio = { workspace = true, features = ["process", "time"] }

tauri-plugin-path2 = { path = "../path2" }
10 changes: 6 additions & 4 deletions plugins/hooks/src/config.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@ use serde::{Deserialize, Serialize};
use std::collections::HashMap;
use std::path::PathBuf;

use tauri_plugin_path2::Path2PluginExt;

/// Configuration for hook execution.
#[derive(Debug, Clone, Serialize, Deserialize, specta::Type)]
pub struct HooksConfig {
Expand Down Expand Up @@ -48,12 +50,12 @@ impl HooksConfig {
}

fn config_path<R: tauri::Runtime>(app: &impl tauri::Manager<R>) -> crate::Result<PathBuf> {
let data_dir = app
.path()
.data_dir()
let base = app
.path2()
.base()
.map_err(|e| crate::Error::ConfigLoad(e.to_string()))?;

Ok(data_dir.join("hyprnote").join("settings.json"))
Ok(base.join("settings.json"))
}

fn empty() -> Self {
Expand Down