LibreCloud/lib_wraphandlers
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

chore: WebServer in config as vector for Multiples Webs

Browse source
This commit is contained in:
Jesús Pérez Lorenzo 2021-09-07 14:58:48 +01:00
parent 899566c9a2
commit 2f305ffecf
4 changed files with 23 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

13
reqtasks/src/lib.rs
View file

@ -14,7 +14,7 @@ use tera::Tera;
use app_env::{
AppStore,
appenv::AppEnv,
config::Config,
config::{Config,WebServer},
module::Module,
appdata::AppData
};
@ -118,6 +118,11 @@ impl ReqTasks {
pub fn config(&self) -> Config {
self.app_data.env.config.to_owned()
}
/// Get `AppEnv` Config
#[must_use]
pub fn websrvr(&self) -> WebServer {
self.app_data.env.config.websrvrs[self.app_data.env.curr_web].to_owned()
}
#[must_use]
pub fn module(&self) -> Module {
self.app_data.env.get_module(&self.key_module)
@ -136,13 +141,13 @@ impl ReqTasks {
// }
/// Get Lang list from header - accept-language
/// get first one but only root part as first two characters (es in case of es-ES)
/// if lang is not in `Config.langs`it will fallback to `Config.default_lang`
/// if lang is not in `WebServer.langs`it will fallback to `Config.default_lang`
#[must_use]
pub fn lang(&self) -> String {
#[allow(unused_assignments)]
let mut lang = self.config().default_lang;
let default_lang = self.config().default_lang;
let langs = self.config().langs;
let langs = self.websrvr().langs;
// As fallback set default_lang
lang = default_lang;
// Get langs list from header
@ -295,7 +300,7 @@ impl ReqTasks {
self
.render_page(
&mut ctx,
app_env.config.templates_path.as_str(),
app_env.get_curr_websrvr_config().templates_path.as_str(),
template_name,
fallback_template,
data_path,