rename onyx-core crate (formerly bevy-tasks-core)
This commit is contained in:
parent
8b5894bff2
commit
9e204ef818
|
|
@ -1,10 +1,10 @@
|
||||||
[package]
|
[package]
|
||||||
name = "bevy-tasks-core"
|
name = "onyx-core"
|
||||||
version = "0.1.0"
|
version = "0.1.0"
|
||||||
edition = "2021"
|
edition = "2021"
|
||||||
description = "Core library for local-first task management with markdown storage and WebDAV sync"
|
description = "Core library for local-first task management with markdown storage and WebDAV sync"
|
||||||
license = "GPL-3.0-or-later"
|
license = "GPL-3.0-or-later"
|
||||||
repository = "https://github.com/SteelDynamite/bevy-tasks"
|
repository = "https://github.com/SteelDynamite/onyx"
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
serde = { workspace = true }
|
serde = { workspace = true }
|
||||||
|
|
@ -82,7 +82,7 @@ impl AppConfig {
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn get_config_path() -> PathBuf {
|
pub fn get_config_path() -> PathBuf {
|
||||||
let config_dir = directories::ProjectDirs::from("", "", "bevy-tasks")
|
let config_dir = directories::ProjectDirs::from("", "", "onyx")
|
||||||
.expect("Failed to determine config directory");
|
.expect("Failed to determine config directory");
|
||||||
config_dir.config_dir().join("config.json")
|
config_dir.config_dir().join("config.json")
|
||||||
}
|
}
|
||||||
|
|
@ -381,7 +381,7 @@ fn extract_relative_path(href: &str, base_url: &str, request_path: &str) -> Stri
|
||||||
|
|
||||||
/// Store WebDAV credentials in the platform keychain.
|
/// Store WebDAV credentials in the platform keychain.
|
||||||
pub fn store_credentials(domain: &str, username: &str, password: &str) -> Result<()> {
|
pub fn store_credentials(domain: &str, username: &str, password: &str) -> Result<()> {
|
||||||
let service = format!("com.bevy-tasks.webdav.{}", domain);
|
let service = format!("com.onyx.webdav.{}", domain);
|
||||||
|
|
||||||
let user_entry = keyring::Entry::new(&service, "username")
|
let user_entry = keyring::Entry::new(&service, "username")
|
||||||
.map_err(|e| Error::Credential(format!("Failed to create keyring entry: {}", e)))?;
|
.map_err(|e| Error::Credential(format!("Failed to create keyring entry: {}", e)))?;
|
||||||
|
|
@ -398,7 +398,7 @@ pub fn store_credentials(domain: &str, username: &str, password: &str) -> Result
|
||||||
|
|
||||||
/// Load WebDAV credentials from the platform keychain, falling back to env vars.
|
/// Load WebDAV credentials from the platform keychain, falling back to env vars.
|
||||||
pub fn load_credentials(domain: &str) -> Result<(String, String)> {
|
pub fn load_credentials(domain: &str) -> Result<(String, String)> {
|
||||||
let service = format!("com.bevy-tasks.webdav.{}", domain);
|
let service = format!("com.onyx.webdav.{}", domain);
|
||||||
|
|
||||||
let user_entry = keyring::Entry::new(&service, "username")
|
let user_entry = keyring::Entry::new(&service, "username")
|
||||||
.map_err(|e| Error::Credential(format!("Failed to create keyring entry: {}", e)))?;
|
.map_err(|e| Error::Credential(format!("Failed to create keyring entry: {}", e)))?;
|
||||||
|
|
@ -411,21 +411,21 @@ pub fn load_credentials(domain: &str) -> Result<(String, String)> {
|
||||||
|
|
||||||
// Fallback to env vars for headless/CI environments
|
// Fallback to env vars for headless/CI environments
|
||||||
if let (Ok(user), Ok(pass)) = (
|
if let (Ok(user), Ok(pass)) = (
|
||||||
std::env::var("BEVY_TASKS_WEBDAV_USER"),
|
std::env::var("ONYX_WEBDAV_USER"),
|
||||||
std::env::var("BEVY_TASKS_WEBDAV_PASS"),
|
std::env::var("ONYX_WEBDAV_PASS"),
|
||||||
) {
|
) {
|
||||||
return Ok((user, pass));
|
return Ok((user, pass));
|
||||||
}
|
}
|
||||||
|
|
||||||
Err(Error::Credential(format!(
|
Err(Error::Credential(format!(
|
||||||
"No credentials found for '{}'. Run 'bevy-tasks sync --setup' or set BEVY_TASKS_WEBDAV_USER and BEVY_TASKS_WEBDAV_PASS.",
|
"No credentials found for '{}'. Run 'onyx sync --setup' or set ONYX_WEBDAV_USER and ONYX_WEBDAV_PASS.",
|
||||||
domain
|
domain
|
||||||
)))
|
)))
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Delete WebDAV credentials from the platform keychain.
|
/// Delete WebDAV credentials from the platform keychain.
|
||||||
pub fn delete_credentials(domain: &str) -> Result<()> {
|
pub fn delete_credentials(domain: &str) -> Result<()> {
|
||||||
let service = format!("com.bevy-tasks.webdav.{}", domain);
|
let service = format!("com.onyx.webdav.{}", domain);
|
||||||
|
|
||||||
if let Ok(entry) = keyring::Entry::new(&service, "username") {
|
if let Ok(entry) = keyring::Entry::new(&service, "username") {
|
||||||
let _ = entry.delete_credential();
|
let _ = entry.delete_credential();
|
||||||
Loading…
Reference in a new issue