backups/grapevine
1
0
Fork 0
mirror of https://gitlab.computer.surgery/matrix/grapevine.git synced 2025-12-16 15:21:24 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

make database path a pathbuf

Browse source 
I'm guessing it wasn't like this already because of one of the admin
commands I deleted.
This commit is contained in:
Charles Hall 2025-02-28 11:03:25 -08:00
parent 5a5608e088
commit 81a449d1d2
No known key found for this signature in database
GPG key ID: 7B8E0645816E07CF
3 changed files with 7 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/config.rs
View file

@ -327,7 +327,7 @@ impl Display for DatabaseBackend {
#[serde(deny_unknown_fields)]
pub(crate) struct DatabaseConfig {
pub(crate) backend: DatabaseBackend,
pub(crate) path: String,
pub(crate) path: PathBuf,
#[serde(default = "default_db_cache_capacity_mb")]
pub(crate) cache_capacity_mb: f64,
#[cfg(feature = "rocksdb")]

11
src/database.rs
View file

@ -3,7 +3,6 @@ use std::{
fs,
io::Write,
mem::size_of,
path::Path,
sync::Arc,
};
@ -234,9 +233,9 @@ pub(crate) struct KeyValueDatabase {
impl KeyValueDatabase {
fn check_db_setup(config: &Config) -> Result<()> {
let path = Path::new(&config.database.path);
let sqlite_exists = path
let sqlite_exists = config
.database
.path
.join(format!(
"{}.db",
if config.conduit_compat {
@ -246,7 +245,7 @@ impl KeyValueDatabase {
}
))
.exists();
let rocksdb_exists = path.join("IDENTITY").exists();
let rocksdb_exists = config.database.path.join("IDENTITY").exists();
let mut count = 0;
@ -298,7 +297,7 @@ impl KeyValueDatabase {
pub(crate) fn load_or_create(config: &Config) -> Result<KeyValueDatabase> {
Self::check_db_setup(config)?;
if !Path::new(&config.database.path).exists() {
if !config.database.path.exists() {
fs::create_dir_all(&config.database.path).map_err(|_| {
Error::BadConfig(
"Database folder doesn't exists and couldn't be created \

2
src/database/abstraction/sqlite.rs
View file

@ -110,7 +110,7 @@ impl Engine {
impl KeyValueDatabaseEngine for Arc<Engine> {
fn open(config: &Config) -> Result<Self> {
let path = Path::new(&config.database.path).join(format!(
let path = config.database.path.join(format!(
"{}.db",
if config.conduit_compat {
"conduit"