djsundog/ffplayout
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

conditional embed frontend

Browse Source
This commit is contained in:
jb-alvarado 2023-11-02 21:29:14 +01:00
parent 7d3173533f
commit ea81588ce5
2 changed files with 27 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ffplayout-api/build.rs
View File

@ -1,11 +1,7 @@
use std::{env, path::Path};
use static_files::NpmBuild;
fn main() -> std::io::Result<()> {
let gen_path = Path::new(&env::var("OUT_DIR").unwrap()).join("generated.rs");
if Ok("release".to_owned()) == env::var("PROFILE") || !gen_path.is_file() {
if !cfg!(debug_assertions) {
NpmBuild::new("../ffplayout-frontend")
.install()?
.run("generate")?

31
ffplayout-api/src/main.rs
View File

@ -5,6 +5,11 @@ use actix_web::{
};
use actix_web_grants::permissions::AttachPermissions;
use actix_web_httpauth::{extractors::bearer::BearerAuth, middleware::HttpAuthentication};
#[cfg(debug_assertions)]
use actix_files::Files;
#[cfg(not(debug_assertions))]
use actix_web_static_files::ResourceFiles;
use clap::Parser;
@ -20,6 +25,7 @@ use utils::{args_parse::Args, control::ProcessControl, db_path, init_config, run
use ffplayout_lib::utils::{init_logging, PlayoutConfig};
#[cfg(not(debug_assertions))]
include!(concat!(env!("OUT_DIR"), "/generated.rs"));
async fn validator(
@ -81,12 +87,10 @@ async fn main() -> std::io::Result<()> {
HttpServer::new(move || {
let auth = HttpAuthentication::bearer(validator);
let db_pool = web::Data::new(pool.clone());
let generated = generate();
let logger = Logger::new("%{r}a \"%r\" %s %b \"%{Referer}i\" \"%{User-Agent}i\" %T")
.exclude_regex(r"/_nuxt/*");
App::new()
let mut web_app = App::new()
.app_data(db_pool)
.app_data(engine_process.clone())
.wrap(logger)
@ -127,8 +131,25 @@ async fn main() -> std::io::Result<()> {
.service(import_playlist)
.service(get_program),
)
.service(get_file)
.service(ResourceFiles::new("/", generated))
.service(get_file);
#[cfg(not(debug_assertions))]
{
// in release mode embed frontend
let generated = generate();
web_app = web_app.service(ResourceFiles::new("/", generated));
}
#[cfg(debug_assertions)]
{
// in debug mode get frontend from path
web_app = web_app.service(
Files::new("/", "./ffplayout-frontend/.output/public/")
.index_file("index.html"),
);
}
web_app
})
.bind((addr, port))?
.run()