Revert "feat(cosmic-config): add new_data method."
It was found that dirs::data_dir conflicts with dirs::config_dir on
macOS and Windows.
This reverts commit 631c81b170.
This commit is contained in:
parent
2ab0d4c570
commit
fd34b923f7
2 changed files with 0 additions and 53 deletions
|
|
@ -56,22 +56,6 @@ fn get_state_dir() -> Option<PathBuf> {
|
|||
Some(home_dir.join(".local").join(".state"))
|
||||
}
|
||||
|
||||
/// Get the data directory, with Flatpak sandbox support.
|
||||
fn get_data_dir() -> Option<PathBuf> {
|
||||
// Check if we're running in Flatpak
|
||||
if env::var_os("FLATPAK_ID").is_some() {
|
||||
// Try HOST_XDG_DATA_HOME first
|
||||
if let Some(host_data) = env::var_os("HOST_XDG_DATA_HOME") {
|
||||
return Some(PathBuf::from(host_data));
|
||||
}
|
||||
// Fallback: try to construct from HOME
|
||||
if let Some(home) = env::var_os("HOME") {
|
||||
return Some(PathBuf::from(home).join(".local").join("share"));
|
||||
}
|
||||
}
|
||||
dirs::data_dir()
|
||||
}
|
||||
|
||||
#[cfg(feature = "subscription")]
|
||||
mod subscription;
|
||||
#[cfg(feature = "subscription")]
|
||||
|
|
@ -332,40 +316,6 @@ impl Config {
|
|||
})
|
||||
}
|
||||
|
||||
/// Get data for the given application name and config version.
|
||||
/// pub fn new_state(name: &str, version: u64) -> Result<Self, Error> {
|
||||
pub fn new_data(name: &str, version: u64) -> Result<Self, Error> {
|
||||
Self::new_data_inner(name, version, true)
|
||||
}
|
||||
|
||||
pub fn new_data_inner(
|
||||
name: &str,
|
||||
version: u64,
|
||||
look_for_previous: bool,
|
||||
) -> Result<Self, Error> {
|
||||
// Look for [name]/v[version]
|
||||
let path = sanitize_name(name)?.join(format!("v{}", version));
|
||||
|
||||
// Get libcosmic user data directory
|
||||
let mut user_path = get_data_dir().ok_or(Error::NoConfigDirectory)?;
|
||||
user_path.push("cosmic");
|
||||
user_path.push(path);
|
||||
// Create new data directory if not found.
|
||||
fs::create_dir_all(&user_path)?;
|
||||
|
||||
Ok(Self {
|
||||
system_path: None,
|
||||
user_path: Some(user_path),
|
||||
previous: if version > 1 && look_for_previous {
|
||||
Self::new_data_inner(name, version - 1, false)
|
||||
.ok()
|
||||
.map(Box::new)
|
||||
} else {
|
||||
None
|
||||
},
|
||||
})
|
||||
}
|
||||
|
||||
// Start a transaction (to set multiple configs at the same time)
|
||||
#[inline]
|
||||
pub fn transaction(&self) -> ConfigTransaction<'_> {
|
||||
|
|
|
|||
|
|
@ -88,7 +88,4 @@ pub fn main() {
|
|||
|
||||
println!("Testing state");
|
||||
test_config(Config::new_state("com.system76.Example", 1).unwrap());
|
||||
|
||||
println!("Testing data");
|
||||
test_config(Config::new_data("com.system76.Example", 1).unwrap());
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue