Merge pull request #546 from jb-alvarado/master

change order
This commit is contained in:
jb-alvarado 2024-02-23 10:01:34 +00:00 committed by GitHub
commit 84653e3b12
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 10 additions and 10 deletions

4
Cargo.lock generated
View File

@ -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",

View File

@ -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"

View File

@ -163,18 +163,18 @@ pub fn db_path() -> Result<&'static str, Box<dyn std::error::Error>> {
}
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/")
}

@ -1 +1 @@
Subproject commit 8eb543ddae035e448ea0886ec1d44256de2e6f07
Subproject commit 737d86f901a9275b13e164378ad1c231c6370c1f