Merge pull request #446 from jb-alvarado/master

dashboard

CHANGELOG.md

@@ -1,6 +1,6 @@
 # Changelog
 
-## [0.20.0](https://github.com/ffplayout/ffplayout/releases/tag/v0.20.0-beta1) (2023-10-22)
+## [0.20.0](https://github.com/ffplayout/ffplayout/releases/tag/v0.20.0) (2023-11-16)
 
 ### ffplayout
 
@@ -17,12 +17,22 @@
 - jump out from source loop when playout is terminated [cf6e56](https://github.com/ffplayout/ffplayout/commit/cf6e5663e98eb52bc84c0e9e5856943ddefc24d9)
 - fix program hang when mail sending not work [38e73a](https://github.com/ffplayout/ffplayout/commit/38e73a0138430fc600ae809356127941e1f08eb2)
 
+### ffpapi
+
+- embed static files from frontend in ffpapi, add db path argument [b4cde6e](https://github.com/ffplayout/ffplayout/commit/b4cde6e12ce70af20f52f308d7cb4288f97d31fe)
+- Use enum for Role everywhere [7d31735](https://github.com/ffplayout/ffplayout/commit/7d3173533fd8b2a9d6e718ada0c81f017aedc777)
+- get config also as normal user [7d31735](https://github.com/ffplayout/ffplayout/commit/7d3173533fd8b2a9d6e718ada0c81f017aedc777)
+- fix time shift [7d31735](https://github.com/ffplayout/ffplayout/commit/7d3173533fd8b2a9d6e718ada0c81f017aedc777)
+- add option for public path [c304386](https://github.com/ffplayout/ffplayout/commit/c30438697d33fe360e92146c03ad8ce212e138a6)
+- add system stat route [c304386](https://github.com/ffplayout/ffplayout/commit/c30438697d33fe360e92146c03ad8ce212e138a6)
+
 ### frontend
 
 - option to add user [debb75](https://github.com/ffplayout/ffplayout/commit/debb751428239f2d0ac446a0b9a805cd1ec4a965)
 - fix audit alert, get status from playout stat [50bee9](https://github.com/ffplayout/ffplayout-frontend/commit/50bee93c8555b14181864a654239f7e68c50cafb)
 - restart modal for config save [2f3234](https://github.com/ffplayout/ffplayout-frontend/commit/2f3234221a0aef8e70d9e2b5e9bbfb1fe51921fc)
 - add advanced playlist generator, update packages [806d53](https://github.com/ffplayout/ffplayout-frontend/commit/806d533bc2a84fc994897371071c4399172fa639)
+- add dashboard [ba0c0fa](https://github.com/ffplayout/ffplayout/pull/446/commits/ba0c0faaac9c44fbf4f87752c89aaa8859be9bf1)
 
 
 ## [0.19.1](https://github.com/ffplayout/ffplayout/releases/tag/v0.19.1) (2023-10-08)

Cargo.lock

@@ -1163,7 +1163,7 @@ checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5"
 
 [[package]]
 name = "ffplayout"
-version = "0.20.0-beta5"
+version = "0.20.0"
 dependencies = [
  "chrono",
  "clap",
@@ -1185,7 +1185,7 @@ dependencies = [
 
 [[package]]
 name = "ffplayout-api"
-version = "0.20.0-beta5"
+version = "0.20.0"
 dependencies = [
  "actix-files",
  "actix-multipart",
@@ -1224,7 +1224,7 @@ dependencies = [
 
 [[package]]
 name = "ffplayout-lib"
-version = "0.20.0-beta5"
+version = "0.20.0"
 dependencies = [
  "chrono",
  "crossbeam-channel",
@@ -3313,7 +3313,7 @@ dependencies = [
 
 [[package]]
 name = "tests"
-version = "0.20.0-beta5"
+version = "0.20.0"
 dependencies = [
  "chrono",
  "crossbeam-channel",

Cargo.toml

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

docs/api.md

@@ -382,7 +382,7 @@ curl -X GET http://127.0.0.1:8787/api/program/1/?start_after=2022-11-13T10:00:00
 Get statistics about CPU, Ram, Disk, etc. usage.
 
 ```BASH
-curl -X GET http://127.0.0.1:8787/api/system
+curl -X GET http://127.0.0.1:8787/api/system/1
 -H 'Content-Type: application/json' -H 'Authorization: Bearer <TOKEN>'
 ```
 

ffplayout-api/src/api/routes.rs

@@ -1120,7 +1120,7 @@ async fn get_program(
 /// Get statistics about CPU, Ram, Disk, etc. usage.
 ///
 /// ```BASH
-/// curl -X GET http://127.0.0.1:8787/api/system
+/// curl -X GET http://127.0.0.1:8787/api/system/1
 /// -H 'Content-Type: application/json' -H 'Authorization: Bearer <TOKEN>'
 /// ```
 #[get("/system/{id}")]

ffplayout-api/src/utils/system.rs

@@ -120,7 +120,7 @@ pub fn stat(config: PlayoutConfig) -> SystemStat {
     let memory = Memory {
         total: sys.total_memory(),
         used: sys.used_memory(),
-        free: sys.free_memory(),
+        free: sys.total_memory() - sys.used_memory(),
     };
 
     let mut network = Network::default();

ffplayout-frontend

@@ -1 +1 @@
-Subproject commit 8f615c358290b263244f52d10f6783ac39c6948c
+Subproject commit 4e742861df43dd72bdd77ad432b47a8c874b7ab4