aboutsummaryrefslogtreecommitdiffstats
path: root/src/command
diff options
context:
space:
mode:
authorEllie Huxtable <e@elm.sh>2021-03-21 20:04:39 +0000
committerGitHub <noreply@github.com>2021-03-21 20:04:39 +0000
commitc9579cb9ca2a6a165d10f128e0af1dfd372e0c03 (patch)
tree1d4feecb422aae3cde1cc7cad54ccc73b2dae410 /src/command
parentAdd TUI, resolve #19, #17, #16 (#21) (diff)
downloadatuin-c9579cb9ca2a6a165d10f128e0af1dfd372e0c03.zip
Implement server (#23)
* Add initial database and server setup * Set up all routes, auth, etc * Implement sessions, password auth, hashing with argon2, and history storage
Diffstat (limited to '')
-rw-r--r--src/command/mod.rs2
-rw-r--r--src/command/server.rs5
2 files changed, 4 insertions, 3 deletions
diff --git a/src/command/mod.rs b/src/command/mod.rs
index 3ebb92e0..a5ea0228 100644
--- a/src/command/mod.rs
+++ b/src/command/mod.rs
@@ -49,7 +49,7 @@ impl AtuinCmd {
match self {
Self::History(history) => history.run(db),
Self::Import(import) => import.run(db),
- Self::Server(server) => server.run(),
+ Self::Server(server) => server.run(settings),
Self::Stats(stats) => stats.run(db, settings),
Self::Init => init::init(),
Self::Search { query } => search::run(&query, db),
diff --git a/src/command/server.rs b/src/command/server.rs
index 1ddc73e7..9d9bcb3a 100644
--- a/src/command/server.rs
+++ b/src/command/server.rs
@@ -2,6 +2,7 @@ use eyre::Result;
use structopt::StructOpt;
use crate::remote::server;
+use crate::settings::Settings;
#[derive(StructOpt)]
pub enum Cmd {
@@ -10,8 +11,8 @@ pub enum Cmd {
#[allow(clippy::unused_self)] // I'll use it later
impl Cmd {
- pub fn run(&self) -> Result<()> {
- server::launch();
+ pub fn run(&self, settings: &Settings) -> Result<()> {
+ server::launch(settings);
Ok(())
}
}