From 1bbc986d8ce916f8a5acf522bf7ec7d7fd637b0d Mon Sep 17 00:00:00 2001 From: jb-alvarado Date: Wed, 21 Feb 2024 19:55:39 +0100 Subject: [PATCH 1/3] change order --- ffplayout-api/src/utils/mod.rs | 12 ++++++------ ffplayout-frontend | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/ffplayout-api/src/utils/mod.rs b/ffplayout-api/src/utils/mod.rs index 891a659d..ca94fbbd 100644 --- a/ffplayout-api/src/utils/mod.rs +++ b/ffplayout-api/src/utils/mod.rs @@ -163,18 +163,18 @@ pub fn db_path() -> Result<&'static str, Box> { } pub fn public_path() -> PathBuf { - let path = PathBuf::from("/usr/share/ffplayout/public/"); - - if path.is_dir() { - return path; - } - let path = PathBuf::from("./ffplayout-frontend/.output/public/"); if cfg!(debug_assertions) && path.is_dir() { return path; } + let path = PathBuf::from("/usr/share/ffplayout/public/"); + + if path.is_dir() { + return path; + } + PathBuf::from("./public/") } diff --git a/ffplayout-frontend b/ffplayout-frontend index 8eb543dd..28bcfcd1 160000 --- a/ffplayout-frontend +++ b/ffplayout-frontend @@ -1 +1 @@ -Subproject commit 8eb543ddae035e448ea0886ec1d44256de2e6f07 +Subproject commit 28bcfcd1a399a9dd5363541f5f01203c7d968e18 From fe0417ec50bb08ddf0579af02dabac9ea3788b3a Mon Sep 17 00:00:00 2001 From: jb-alvarado Date: Fri, 23 Feb 2024 10:50:07 +0100 Subject: [PATCH 2/3] simplify auth code --- ffplayout-frontend | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ffplayout-frontend b/ffplayout-frontend index 28bcfcd1..737d86f9 160000 --- a/ffplayout-frontend +++ b/ffplayout-frontend @@ -1 +1 @@ -Subproject commit 28bcfcd1a399a9dd5363541f5f01203c7d968e18 +Subproject commit 737d86f901a9275b13e164378ad1c231c6370c1f From 905c86d9a19277e62a0fb950162a2936bc2c6dc9 Mon Sep 17 00:00:00 2001 From: jb-alvarado Date: Fri, 23 Feb 2024 10:54:59 +0100 Subject: [PATCH 3/3] update packages --- Cargo.lock | 4 ++-- ffplayout-api/Cargo.toml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index b8d6ab2d..a00100d1 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2017,9 +2017,9 @@ dependencies = [ [[package]] name = "local-ip-address" -version = "0.5.7" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "612ed4ea9ce5acfb5d26339302528a5e1e59dfed95e9e11af3c083236ff1d15d" +checksum = "f63e1499d2495be571af92e9ca9dca4e7bf26c47b87cb8d0c6100825e521dd6b" dependencies = [ "libc", "neli", diff --git a/ffplayout-api/Cargo.toml b/ffplayout-api/Cargo.toml index a9d61608..d18368a3 100644 --- a/ffplayout-api/Cargo.toml +++ b/ffplayout-api/Cargo.toml @@ -29,7 +29,7 @@ futures-util = { version = "0.3", default-features = false, features = ["std"] } jsonwebtoken = "9" lazy_static = "1.4" lexical-sort = "0.3" -local-ip-address = "0.5" +local-ip-address = "0.6" once_cell = "1.18" path-clean = "1.0" rand = "0.8"