diff options
author | Kjetil Orbekk <kjetil.orbekk@gmail.com> | 2020-02-26 22:49:10 -0500 |
---|---|---|
committer | Kjetil Orbekk <kjetil.orbekk@gmail.com> | 2020-02-26 22:49:10 -0500 |
commit | fb888030b7872f22dd363370cf9a6f2d6394905b (patch) | |
tree | 6a83e32068d224d0c4b3212ca116366619438150 /src/main.rs | |
parent | 65b484c824cb43ed2683290997d79612e88290fa (diff) |
cargo fmt
Diffstat (limited to 'src/main.rs')
-rw-r--r-- | src/main.rs | 35 |
1 files changed, 19 insertions, 16 deletions
diff --git a/src/main.rs b/src/main.rs index e21873a..ec292ea 100644 --- a/src/main.rs +++ b/src/main.rs @@ -6,13 +6,13 @@ extern crate log; extern crate diesel_migrations; use chrono::Utc; -use structopt::StructOpt; use diesel::connection::Connection; use diesel::pg::PgConnection; use pjournal::db; use pjournal::importer; use pjournal::models; use serde_json::to_value; +use structopt::StructOpt; embed_migrations!(); @@ -60,10 +60,7 @@ enum Command { strava_client_id: String, }, /// Add a user account - AddUser { - username: String, - password: String, - }, + AddUser { username: String, password: String }, /// Create a ProcessAllRawData task ProcessAllData, } @@ -128,7 +125,11 @@ fn main() { embedded_migrations::run(&conn).unwrap(); match opt.cmd { - Some(Command::Init { rocket_secret_key, strava_client_secret, strava_client_id }) => { + Some(Command::Init { + rocket_secret_key, + strava_client_secret, + strava_client_id, + }) => { let config = models::Config { strava_client_id, strava_client_secret, @@ -138,11 +139,11 @@ fn main() { db::create_config(&conn, &config).unwrap(); info!("config created"); - }, + } Some(Command::AddUser { username, password }) => { db::adduser(&conn, &username, &password).unwrap(); info!("added user {}", username); - }, + } Some(Command::ProcessAllData) => { let command = importer::Command::ProcessAllRawData; db::insert_task( @@ -154,17 +155,19 @@ fn main() { payload: &to_value(command).unwrap(), }, ) - .expect("insert"); + .expect("insert"); info!("ProcessAllRawData: task inserted"); - }, + } None => { info!("starting server with options {:?}", opt); - pjournal::server::start(conn, - &opt.database_url, - &opt.base_url, - &opt.static_path, - opt.port, - &opt.template_path); + pjournal::server::start( + conn, + &opt.database_url, + &opt.base_url, + &opt.static_path, + opt.port, + &opt.template_path, + ); } } } |