selfhosted
/
filite
mirror of https://github.com/raftario/filite.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Move init function to setup module

This commit is contained in:
Raphaël Thériault 2019-10-17 14:55:59 -04:00
parent a5e2055ff7
commit fdd232c776
2 changed files with 29 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/main.rs
View File

@ -6,6 +6,7 @@ extern crate serde;
#[cfg_attr(not(debug_assertions), macro_use)]
extern crate diesel_migrations;
#[cfg(debug_assertions)]
use crate::setup::Config;
use actix_web::{web, App, FromRequest, HttpServer};
@ -13,9 +14,6 @@ use diesel::r2d2::{self, ConnectionManager};
use diesel::sqlite::SqliteConnection;
use std::process;
#[cfg(not(debug_assertions))]
use std::fs;
pub mod models;
pub mod queries;
pub mod routes;
@ -28,31 +26,6 @@ pub type Pool = r2d2::Pool<ConnectionManager<SqliteConnection>>;
#[cfg(not(debug_assertions))]
embed_migrations!("./migrations");
/// Performs the initial setup
#[cfg(not(debug_assertions))]
fn init() -> Config {
let data_dir = setup::get_data_dir();
if !data_dir.exists() {
eprintln!("Creating config file...");
fs::create_dir_all(&data_dir)
.unwrap_or_else(|e| eprintln!("Can't create config directory: {}.", e));
Config::default().write_file().unwrap_or_else(|e| {
eprintln!("{}", e);
process::exit(1);
});
eprintln!(
"To get started, edit the config file at {:?} and restart.",
&data_dir
);
process::exit(0);
}
Config::read_file().unwrap_or_else(|e| {
eprintln!("{}", e);
process::exit(1);
})
}
fn main() {
let config = {
#[cfg(debug_assertions)]
@ -62,7 +35,7 @@ fn main() {
#[cfg(not(debug_assertions))]
{
init()
setup::init()
}
};
setup::init_logger();

27
src/setup.rs
View File

@ -14,6 +14,8 @@ use dirs;
use dotenv;
#[cfg(not(debug_assertions))]
use std::fs;
#[cfg(not(debug_assertions))]
use std::process;
#[cfg(debug_assertions)]
use std::str::FromStr;
#[cfg(not(debug_assertions))]
@ -221,3 +223,28 @@ pub fn logger_middleware() -> Logger {
Logger::default()
}
}
/// Performs the initial setup
#[cfg(not(debug_assertions))]
pub fn init() -> Config {
let data_dir = get_data_dir();
if !data_dir.exists() {
eprintln!("Creating config file...");
fs::create_dir_all(&data_dir)
.unwrap_or_else(|e| eprintln!("Can't create config directory: {}.", e));
Config::default().write_file().unwrap_or_else(|e| {
eprintln!("{}", e);
process::exit(1);
});
eprintln!(
"To get started, edit the config file at {:?} and restart.",
&data_dir
);
process::exit(0);
}
Config::read_file().unwrap_or_else(|e| {
eprintln!("{}", e);
process::exit(1);
})
}