blah/blahrs
1
0
Fork 0
mirror of https://github.com/Blah-IM/blahrs.git synced 2025-07-04 21:35:33 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Move database logic into submodule and do simple version check

Browse source
This commit is contained in:
oxalica 2024-09-03 17:52:02 -04:00
parent a37bc3f81e
commit 81a566a097
7 changed files with 112 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

18
blahctl/src/main.rs
View file

@ -57,7 +57,10 @@ enum Command {
}
#[derive(Debug, clap::Subcommand)]
#[allow(clippy::large_enum_variant)]
enum DbCommand {
/// Create and initialize database.
Init,
/// Set user property, possibly adding new users.
SetUser {
#[command(flatten)]
@ -144,8 +147,6 @@ impl User {
}
}
static INIT_SQL: &str = include_str!("../../blahd/init.sql");
fn main() -> Result<()> {
let cli = <Cli as clap::Parser>::parse();
@ -157,9 +158,15 @@ fn main() -> Result<()> {
io::stdout().write_all(pubkey_doc.as_bytes())?;
}
Command::Database { database, command } => {
let conn = Connection::open(database).context("failed to open database")?;
conn.execute_batch(INIT_SQL)
.context("failed to initialize database")?;
use rusqlite::OpenFlags;
let mut flags = OpenFlags::SQLITE_OPEN_READ_WRITE | OpenFlags::SQLITE_OPEN_NO_MUTEX;
flags.set(
OpenFlags::SQLITE_OPEN_CREATE,
matches!(command, DbCommand::Init),
);
let conn =
Connection::open_with_flags(database, flags).context("failed to open database")?;
main_db(conn, command)?;
}
Command::Api { url, command } => build_rt()?.block_on(main_api(url, command))?,
@ -177,6 +184,7 @@ fn build_rt() -> Result<Runtime> {
fn main_db(conn: Connection, command: DbCommand) -> Result<()> {
match command {
DbCommand::Init => {}
DbCommand::SetUser { user, permission } => {
let userkey = build_rt()?.block_on(user.fetch_key())?;