From 039ad083f542f58c3e16c279d860fc6b87d81fe6 Mon Sep 17 00:00:00 2001 From: jb-alvarado Date: Thu, 23 Jun 2022 22:56:28 +0200 Subject: [PATCH 1/3] add default-members --- Cargo.toml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Cargo.toml b/Cargo.toml index 77e2c4b7..25a7fc6d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -6,6 +6,12 @@ members = [ "lib", ] +default-members = [ + "ffplayout-api", + "ffplayout-engine", + "lib", +] + [profile.release] opt-level = 3 strip = true From aba574823428c51746bc1c444d93cbacc0986170 Mon Sep 17 00:00:00 2001 From: jb-alvarado Date: Thu, 23 Jun 2022 22:56:49 +0200 Subject: [PATCH 2/3] set default-members --- Cargo.toml | 1 - 1 file changed, 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index 25a7fc6d..d5dd726e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -9,7 +9,6 @@ members = [ default-members = [ "ffplayout-api", "ffplayout-engine", - "lib", ] [profile.release] From b7dfa135bd84433525dddd6161d3b17990c4f54c Mon Sep 17 00:00:00 2001 From: jb-alvarado Date: Thu, 23 Jun 2022 23:14:36 +0200 Subject: [PATCH 3/3] cleanup dependencies --- Cargo.lock | 23 ++--------------------- ffplayout-api/Cargo.toml | 4 ---- ffplayout-engine/Cargo.toml | 12 ------------ lib/Cargo.toml | 7 ++----- lib/README.md | 4 ++++ 5 files changed, 8 insertions(+), 42 deletions(-) create mode 100644 lib/README.md diff --git a/Cargo.lock b/Cargo.lock index 41c4b2c1..66c5c6b0 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1011,29 +1011,17 @@ dependencies = [ name = "ffplayout" version = "0.10.0" dependencies = [ - "chrono 0.4.19 (git+https://github.com/chronotope/chrono.git)", "clap", "crossbeam-channel 0.5.5", - "faccess", "ffplayout-lib", - "ffprobe", - "file-rotate", "futures", "jsonrpc-http-server", - "lettre", - "log", "notify", "openssl", - "rand 0.8.5", - "regex", "reqwest", "serde", "serde_json", - "serde_yaml", - "shlex", "simplelog", - "time 0.3.11", - "walkdir", "zeromq", ] @@ -1051,14 +1039,10 @@ dependencies = [ "derive_more", "faccess", "ffplayout-lib", - "ffprobe", "futures-util", "jsonwebtoken", - "log", "once_cell", "rand 0.8.5", - "rand_core 0.6.3", - "regex", "relative-path", "reqwest", "sanitize-filename", @@ -1071,19 +1055,16 @@ dependencies = [ [[package]] name = "ffplayout-lib" -version = "0.9.9" +version = "0.10.0" dependencies = [ - "chrono 0.4.19 (git+https://github.com/sbrocket/chrono?branch=parse-error-kind-public)", + "chrono 0.4.19 (git+https://github.com/chronotope/chrono.git)", "crossbeam-channel 0.5.5", - "faccess", "ffprobe", "file-rotate", - "futures", "jsonrpc-http-server", "lettre", "log", "notify", - "once_cell", "openssl", "rand 0.8.5", "regex", diff --git a/ffplayout-api/Cargo.toml b/ffplayout-api/Cargo.toml index f79ee65c..d8a665a3 100644 --- a/ffplayout-api/Cargo.toml +++ b/ffplayout-api/Cargo.toml @@ -18,15 +18,11 @@ chrono = "0.4" clap = { version = "3.2", features = ["derive"] } derive_more = "0.99" faccess = "0.2" -ffprobe = "0.3" futures-util = { version = "0.3", default-features = false, features = ["std"] } jsonwebtoken = "8" -log = "0.4" once_cell = "1.10" rand = "0.8" -rand_core = { version = "0.6", features = ["std"] } relative-path = "1.6" -regex = "1" reqwest = { version = "0.11", features = ["blocking", "json"] } sanitize-filename = "0.3" serde = { version = "1.0", features = ["derive"] } diff --git a/ffplayout-engine/Cargo.toml b/ffplayout-engine/Cargo.toml index 65fed720..1dfa2f7a 100644 --- a/ffplayout-engine/Cargo.toml +++ b/ffplayout-engine/Cargo.toml @@ -9,27 +9,15 @@ edition = "2021" [dependencies] ffplayout-lib = { path = "../lib" } -chrono = { git = "https://github.com/chronotope/chrono.git" } clap = { version = "3.2", features = ["derive"] } crossbeam-channel = "0.5" -faccess = "0.2" -ffprobe = "0.3" -file-rotate = { git = "https://github.com/Ploppz/file-rotate.git", branch = "timestamp-parse-fix" } futures = "0.3" jsonrpc-http-server = "18.0" -lettre = "0.10.0-rc.7" -log = "0.4" notify = "4.0" -rand = "0.8" -regex = "1" reqwest = { version = "0.11", features = ["blocking", "json"] } serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" -serde_yaml = "0.8" -shlex = "1.1" simplelog = { version = "^0.12", features = ["paris"] } -time = { version = "0.3", features = ["formatting", "macros"] } -walkdir = "2" zeromq = { git = "https://github.com/zeromq/zmq.rs.git", default-features = false, features = [ "async-std-runtime", "tcp-transport" diff --git a/lib/Cargo.toml b/lib/Cargo.toml index c5b76e0d..7fe8b275 100644 --- a/lib/Cargo.toml +++ b/lib/Cargo.toml @@ -4,21 +4,18 @@ description = "Library for ffplayout" license = "GPL-3.0" authors = ["Jonathan Baecker jonbae77@gmail.com"] readme = "README.md" -version = "0.9.9" +version = "0.10.0" edition = "2021" [dependencies] -chrono = { git = "https://github.com/sbrocket/chrono", branch = "parse-error-kind-public" } +chrono = { git = "https://github.com/chronotope/chrono.git" } crossbeam-channel = "0.5" -faccess = "0.2" ffprobe = "0.3" file-rotate = { git = "https://github.com/Ploppz/file-rotate.git", branch = "timestamp-parse-fix" } -futures = "0.3" jsonrpc-http-server = "18.0" lettre = "0.10.0-rc.7" log = "0.4" notify = "4.0" -once_cell = "1.10" rand = "0.8" regex = "1" reqwest = { version = "0.11", features = ["blocking", "json"] } diff --git a/lib/README.md b/lib/README.md new file mode 100644 index 00000000..ae6e732c --- /dev/null +++ b/lib/README.md @@ -0,0 +1,4 @@ +**ffplayout-lib** +================ + +This folder only contains helper functions which are used in multiple apps.