Merge pull request #715 from jb-alvarado/master

update packages, fix frontend calendar style

Cargo.toml

@@ -4,7 +4,7 @@ default-members = ["ffplayout", "tests"]
 resolver = "2"
 
 [workspace.package]
-version = "0.24.0-alpha3"
+version = "0.24.0-beta1"
 license = "GPL-3.0"
 repository = "https://github.com/ffplayout/ffplayout"
 authors = ["Jonathan Baecker <jonbae77@gmail.com>"]

README.md

@@ -122,7 +122,11 @@ If you are in playlist mode and move backwards or forwards in time, the time shi
 
 -----
 
-## Founding
+## Sponsoring
 
 If you like this project and would like to make a donation, please use one of the options provided.
 Please note that donations are not intended to get support or features! Donations are only a sign of appreciation.
+
+### Backers
+
+[![](https://opencollective.com/ffplayout/backers.svg?width=800&button=true)](https://opencollective.com/ffplayout)

docker/Dockerfile

@@ -1,6 +1,6 @@
 FROM alpine:latest
 
-ARG FFPLAYOUT_VERSION=0.24.0-alpha3
+ARG FFPLAYOUT_VERSION=0.24.0-beta1
 ARG SHARED_STORAGE=false
 
 ENV DB=/db

docker/nonfree.Dockerfile

@@ -1,6 +1,6 @@
 FROM alpine:latest
 
-ARG FFPLAYOUT_VERSION=0.24.0-alpha3
+ARG FFPLAYOUT_VERSION=0.24.0-beta1
 ARG SHARED_STORAGE=false
 
 ENV DB=/db

docker/nvidia.Dockerfile

@@ -1,6 +1,6 @@
 FROM nvidia/cuda:12.5.0-runtime-rockylinux9
 
-ARG FFPLAYOUT_VERSION=0.24.0-alpha3
+ARG FFPLAYOUT_VERSION=0.24.0-beta1
 ARG SHARED_STORAGE=false
 
 ENV DB=/db

ffplayout/Cargo.toml

@@ -18,13 +18,13 @@ actix-multipart = "0.7"
 actix-web = "4"
 actix-web-grants = "4"
 actix-web-httpauth = "0.8"
-actix-web-lab = "0.20"
+actix-web-lab = "0.22"
 actix-web-static-files = "4.0"
 argon2 = "0.5"
 chrono = { version = "0.4", default-features = false, features = ["clock", "std", "serde"] }
 clap = { version = "4.3", features = ["derive", "env"] }
 crossbeam-channel = "0.5"
-derive_more = "0.99"
+derive_more = "1"
 faccess = "0.2"
 ffprobe = "0.4"
 flexi_logger = { version = "0.28", features = ["kv", "colors"] }
@@ -54,8 +54,8 @@ serde_json = "1.0"
 serde_with = "3.8"
 shlex = "1.1"
 static-files = "0.2"
-sysinfo ={ version = "0.30", features = ["linux-netdevs", "linux-tmpfs"] }
+sysinfo ={ version = "0.31", features = ["linux-netdevs", "linux-tmpfs"] }
-sqlx = { version = "0.7", features = ["runtime-tokio", "sqlite"] }
+sqlx = { version = "0.8", features = ["runtime-tokio", "sqlite"] }
 time = { version = "0.3", features = ["formatting", "macros"] }
 tokio = { version = "1.29", features = ["full"] }
 tokio-stream = "0.1"

ffplayout/src/db/models.rs

@@ -154,7 +154,7 @@ where
     &'r str: sqlx::decode::Decode<'r, sqlx::Sqlite>,
 {
     fn decode(
-        value: <sqlx::Sqlite as sqlx::database::HasValueRef<'r>>::ValueRef,
+        value: sqlx::sqlite::SqliteValueRef<'r>,
     ) -> Result<Role, Box<dyn Error + 'static + Send + Sync>> {
         let value = <&str as sqlx::decode::Decode<sqlx::Sqlite>>::decode(value)?;
 

ffplayout/src/utils/errors.rs

@@ -6,25 +6,25 @@ use ffprobe::FfProbeError;
 
 #[derive(Debug, Display)]
 pub enum ServiceError {
-    #[display(fmt = "Internal Server Error")]
+    #[display("Internal Server Error")]
     InternalServerError,
 
-    #[display(fmt = "BadRequest: {_0}")]
+    #[display("BadRequest: {_0}")]
     BadRequest(String),
 
-    #[display(fmt = "Conflict: {_0}")]
+    #[display("Conflict: {_0}")]
     Conflict(String),
 
-    #[display(fmt = "Forbidden: {_0}")]
+    #[display("Forbidden: {_0}")]
     Forbidden(String),
 
-    #[display(fmt = "Unauthorized: {_0}")]
+    #[display("Unauthorized: {_0}")]
     Unauthorized(String),
 
-    #[display(fmt = "NoContent: {_0}")]
+    #[display("NoContent: {_0}")]
     NoContent(String),
 
-    #[display(fmt = "ServiceUnavailable: {_0}")]
+    #[display("ServiceUnavailable: {_0}")]
     ServiceUnavailable(String),
 }
 
@@ -133,17 +133,17 @@ impl From<&str> for ServiceError {
 
 #[derive(Debug, Display)]
 pub enum ProcessError {
-    #[display(fmt = "Failed to spawn ffmpeg/ffprobe. {}", _0)]
+    #[display("Failed to spawn ffmpeg/ffprobe. {}", _0)]
     CommandSpawn(io::Error),
-    #[display(fmt = "{}", _0)]
+    #[display("{}", _0)]
     Custom(String),
-    #[display(fmt = "IO error: {}", _0)]
+    #[display("IO error: {}", _0)]
     IO(io::Error),
-    #[display(fmt = "{}", _0)]
+    #[display("{}", _0)]
     Ffprobe(FfProbeError),
-    #[display(fmt = "Regex compile error {}", _0)]
+    #[display("Regex compile error {}", _0)]
     Regex(String),
-    #[display(fmt = "Thread error {}", _0)]
+    #[display("Thread error {}", _0)]
     Thread(String),
 }
 

frontend

@@ -1 +1 @@
-Subproject commit 4917337a7ad22424eb0473e89c8ad6f211e7a4ce
+Subproject commit c7a4fc31516fb4735076f6e9f15cc2b273b58a62

tests/Cargo.toml

@@ -23,7 +23,7 @@ serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
 serial_test = "3.0"
 shlex = "1.1"
-sqlx = { version = "0.7", features = ["runtime-tokio", "sqlite"] }
+sqlx = { version = "0.8", features = ["runtime-tokio", "sqlite"] }
 time = { version = "0.3", features = ["formatting", "macros"] }
 tokio = { version = "1.29", features = ["full"] }
 toml_edit = {version ="0.22", features = ["serde"]}