diff --git a/Cargo.toml b/Cargo.toml index f455838..6b40627 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -16,22 +16,19 @@ Utilities for maintaining a collection of videos.""" movie_collection_lib = {path = "movie_collection_lib"} movie_collection_http = {path = "movie_collection_http"} transcode_lib = {path = "transcode_lib"} -rayon = "1.5" -log = "0.4" -env_logger = "0.10" -crossbeam-utils = "0.8" anyhow = "1.0" -thiserror = "1.0" -tokio = {version="1.28", features=["full"]} clap = {version="4.0", features=["derive"]} -futures = "0.3" -serde_json = "1.0" derive_more = "0.99" -time = {version="0.3", features=["serde-human-readable", "macros", "formatting"]} -time-tz = {version="2.0", features=["system"]} +env_logger = "0.10" +futures = "0.3" +log = "0.4" refinery = {version="0.8", features=["tokio-postgres"]} +tokio = {version="1.32", features=["full"]} +serde_json = "1.0" stack-string = { git = "https://github.com/ddboline/stack-string-rs.git", features=["postgres_types"], tag="0.9.2" } stdout-channel = "0.6" +time = {version="0.3", features=["serde-human-readable", "macros", "formatting"]} +time-tz = {version="2.0", features=["system"]} [workspace] members = [ diff --git a/movie_collection_http/Cargo.toml b/movie_collection_http/Cargo.toml index ac2b408..99e9bc7 100644 --- a/movie_collection_http/Cargo.toml +++ b/movie_collection_http/Cargo.toml @@ -6,41 +6,40 @@ edition = "2018" [dependencies] movie_collection_lib = {path = "../movie_collection_lib"} -futures = "0.3" +anyhow = "1.0" +async-graphql = {version="6.0", features=["dataloader", "time"]} +async-graphql-warp = "6.0" +async-trait = "0.1" +authorized_users = { git = "https://github.com/ddboline/auth_server_rust.git", tag="0.11.0"} +bytes = "1.0" +derive_more = "0.99" dioxus = "0.4" dioxus-ssr = "0.4" +futures = "0.3" http = "0.2" +itertools = "0.11" +lazy_static = "1.4" +log = "0.4" +maplit = "1.0" +parking_lot = "0.12" +postgres_query = {git = "https://github.com/ddboline/rust-postgres-query", tag = "0.3.5", features=["deadpool"]} +postgres-types = "0.2" +reqwest = {version="0.11", features=["cookies", "json", "rustls-tls"], default_features=false} +rweb = {git = "https://github.com/ddboline/rweb.git", features=["openapi"], default-features=false, tag="0.15.1-1"} +rweb-helper = { git = "https://github.com/ddboline/rweb_helper.git", tag="0.5.0-1" } +rust_decimal = {version="1.27", features=["db-tokio-postgres"]} +rust_decimal_macros = "1.27" serde = "1.0" serde_derive = "1.0" serde_json = "1.0" +smallvec = {version="1.6", features=["serde", "write"]} +stack-string = { git = "https://github.com/ddboline/stack-string-rs.git", features=["postgres_types", "rweb-openapi", "async_graphql"], tag="0.9.2" } +stdout-channel = "0.6" +thiserror = "1.0" time = {version="0.3", features=["serde-human-readable", "macros", "formatting"]} time-tz = {version="2.0", features=["system"]} -tokio = {version="1.28", features=["full"]} +tokio = {version="1.32", features=["full"]} tokio-stream = "0.1" -parking_lot = "0.12" -lazy_static = "1.4" -anyhow = "1.0" -thiserror = "1.0" -async-trait = "0.1" -log = "0.4" -maplit = "1.0" -itertools = "0.11" -indexmap = "1.9" serde_yaml = "0.9" uuid = "1.0" -derive_more = "0.99" -bytes = "1.0" -postgres-types = "0.2" url = "2.3" -stdout-channel = "0.6" -smallvec = {version="1.6", features=["serde", "write"]} -rust_decimal = {version="1.27", features=["db-tokio-postgres"]} -rust_decimal_macros = "1.27" -async-graphql = {version="6.0", features=["dataloader", "time"]} -async-graphql-warp = "6.0" -reqwest = {version="0.11", features=["cookies", "json", "rustls-tls"], default_features=false} -rweb = {git = "https://github.com/ddboline/rweb.git", features=["openapi"], default-features=false, tag="0.15.1-1"} -rweb-helper = { git = "https://github.com/ddboline/rweb_helper.git", tag="0.5.0-1" } -authorized_users = { git = "https://github.com/ddboline/auth_server_rust.git", tag="0.10.11"} -stack-string = { git = "https://github.com/ddboline/stack-string-rs.git", features=["postgres_types", "rweb-openapi", "async_graphql"], tag="0.9.2" } -postgres_query = {git = "https://github.com/ddboline/rust-postgres-query", tag = "0.3.4", features=["deadpool"]} diff --git a/movie_collection_http/src/errors.rs b/movie_collection_http/src/errors.rs index f0abcb9..a340959 100644 --- a/movie_collection_http/src/errors.rs +++ b/movie_collection_http/src/errors.rs @@ -1,6 +1,5 @@ use anyhow::Error as AnyhowError; use http::StatusCode; -use indexmap::IndexMap; use log::error; use postgres_query::Error as PqError; use rweb::{ @@ -127,7 +126,7 @@ impl Entity for ServiceError { impl ResponseEntity for ServiceError { fn describe_responses(_: &mut ComponentDescriptor) -> Responses { - let mut map = IndexMap::new(); + let mut map = Responses::new(); let error_responses = [ (StatusCode::NOT_FOUND, "Not Found"), diff --git a/movie_collection_lib/Cargo.toml b/movie_collection_lib/Cargo.toml index 8b1817e..b5abaef 100644 --- a/movie_collection_lib/Cargo.toml +++ b/movie_collection_lib/Cargo.toml @@ -5,41 +5,41 @@ authors = ["Daniel Boline "] edition = "2018" [dependencies] -serde = {version="1.0", features=["derive"]} -serde_json = "1.0" -tokio-postgres = {version="0.7", features=["with-uuid-1", "with-time-0_3", "with-serde_json-1"]} -postgres-types = "0.2" -rust_decimal = {version="1.27", features=["db-tokio-postgres"]} -deadpool = "0.9" -deadpool-postgres = "0.10" -rayon = "1.5" -dotenv = "0.15" -select = "0.6" -reqwest = {version="0.11", features=["cookies", "json", "rustls-tls"], default_features=false} -time = {version="0.3", features=["serde-human-readable", "macros", "formatting"]} -time-tz = {version="2.0", features=["system"]} -rand = "0.8" -futures = "0.3" -log = "0.4" -bytes = "1.0" anyhow = "1.0" -thiserror = "1.0" -dirs = "5.0" -tokio = {version="1.28", features=["full"]} -tokio-stream = {version="0.1", features=["fs"]} async-trait = "0.1" -derive_more = "0.99" -clap = {version="4.0", features=["derive"]} -lazy_static = "1.4" base64 = "0.21" -maplit = "1.0" +bytes = "1.0" +clap = {version="4.0", features=["derive"]} +derive_more = "0.99" +dirs = "5.0" +dotenv = "0.15" +deadpool = "0.10" +deadpool-postgres = "0.11" envy = "0.4" -jwalk = "0.8" +futures = "0.3" itertools = "0.11" -smallvec = {version="1.6", features=["serde", "write"]} +jwalk = "0.8" +lazy_static = "1.4" +log = "0.4" +maplit = "1.0" +postgres_query = {git = "https://github.com/ddboline/rust-postgres-query", tag = "0.3.5", features=["deadpool"]} +postgres-types = "0.2" procfs = "0.15" -uuid = "1.0" +rand = "0.8" +rayon = "1.5" +reqwest = {version="0.11", features=["cookies", "json", "rustls-tls"], default_features=false} roxmltree = "0.18" +rust_decimal = {version="1.27", features=["db-tokio-postgres"]} +select = "0.6" +serde = {version="1.0", features=["derive"]} +serde_json = "1.0" +smallvec = {version="1.6", features=["serde", "write"]} stack-string = { git = "https://github.com/ddboline/stack-string-rs.git", features=["postgres_types"], tag="0.9.2" } stdout-channel = "0.6" -postgres_query = {git = "https://github.com/ddboline/rust-postgres-query", tag = "0.3.4", features=["deadpool"]} +thiserror = "1.0" +time = {version="0.3", features=["serde-human-readable", "macros", "formatting"]} +time-tz = {version="2.0", features=["system"]} +tokio-postgres = {version="0.7", features=["with-uuid-1", "with-time-0_3", "with-serde_json-1"]} +tokio = {version="1.32", features=["full"]} +tokio-stream = {version="0.1", features=["fs"]} +uuid = "1.0"