leyoda/rqbit
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

v7.0.0 prep further

Browse source
This commit is contained in:
Igor Katson 2024-08-27 18:32:09 +01:00
parent 31a254103c
commit 5717f33f68
No known key found for this signature in database
GPG key ID: B4EC22B66D61A3F5
6 changed files with 45 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

60
Cargo.lock generated
View file

@ -1522,6 +1522,7 @@ dependencies = [
"librqbit-sha1-wrapper",
"librqbit-tracker-comms",
"librqbit-upnp",
"librqbit-upnp-serve",
"lru",
"memmap2",
"mime_guess",
@ -1545,7 +1546,6 @@ dependencies = [
"tower-http",
"tracing",
"tracing-subscriber",
"upnp-serve",
"url",
"urlencoding",
"uuid",
@ -1691,6 +1691,34 @@ dependencies = [
"url",
]
[[package]]
name = "librqbit-upnp-serve"
version = "0.1.0"
dependencies = [
"anyhow",
"axum 0.7.5",
"bstr",
"gethostname",
"http 1.1.0",
"httparse",
"librqbit-core",
"librqbit-sha1-wrapper",
"librqbit-upnp",
"mime_guess",
"parking_lot",
"quick-xml",
"reqwest",
"serde",
"socket2",
"tokio",
"tokio-util",
"tower-http",
"tracing",
"tracing-subscriber",
"url",
"uuid",
]
[[package]]
name = "libsqlite3-sys"
version = "0.28.0"
@ -2515,6 +2543,7 @@ dependencies = [
"futures",
"libc",
"librqbit",
"librqbit-upnp-serve",
"openssl",
"parking_lot",
"parse_duration",
@ -2527,7 +2556,6 @@ dependencies = [
"tokio-util",
"tracing",
"tracing-subscriber",
"upnp-serve",
]
[[package]]
@ -3583,34 +3611,6 @@ version = "0.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1"
[[package]]
name = "upnp-serve"
version = "0.1.0"
dependencies = [
"anyhow",
"axum 0.7.5",
"bstr",
"gethostname",
"http 1.1.0",
"httparse",
"librqbit-core",
"librqbit-sha1-wrapper",
"librqbit-upnp",
"mime_guess",
"parking_lot",
"quick-xml",
"reqwest",
"serde",
"socket2",
"tokio",
"tokio-util",
"tower-http",
"tracing",
"tracing-subscriber",
"url",
"uuid",
]
[[package]]
name = "url"
version = "2.5.2"

2
crates/librqbit/Cargo.toml
View file

@ -40,7 +40,7 @@ peer_binary_protocol = { path = "../peer_binary_protocol", default-features = fa
sha1w = { path = "../sha1w", default-features = false, package = "librqbit-sha1-wrapper", version = "4" }
dht = { path = "../dht", package = "librqbit-dht", version = "5.1.0" }
librqbit-upnp = { path = "../upnp", version = "0.1.1" }
upnp-serve = { path = "../upnp-serve", default-features = false, version = "0.1.0", optional = true }
upnp-serve = { path = "../upnp-serve", package = "librqbit-upnp-serve", default-features = false, version = "0.1.0", optional = true }
tokio = { version = "1", features = [
"macros",

2
crates/rqbit/Cargo.toml
View file

@ -44,7 +44,7 @@ serde_json = "1"
size_format = "1"
bytes = "1.5.0"
openssl = { version = "0.10", features = ["vendored"], optional = true }
upnp-serve = { path = "../upnp-serve" }
upnp-serve = { path = "../upnp-serve", version = "0.1.0", package = "librqbit-upnp-serve" }
libc = "0.2.158"
signal-hook = "0.3.17"
tokio-util = "0.7.11"

13
crates/upnp-serve/Cargo.toml
View file

@ -1,7 +1,12 @@
[package]
name = "upnp-serve"
name = "librqbit-upnp-serve"
version = "0.1.0"
edition = "2021"
description = "Simple UPnP MediaServer implementation"
license = "Apache-2.0"
documentation = "https://docs.rs/librqbit-upnp-serve"
repository = "https://github.com/ikatson/rqbit"
readme = "README.md"
[features]
default = ["sha1-crypto-hash"]
@ -18,10 +23,10 @@ serde = { version = "1", features = ["derive"] }
http = "1.1.0"
httparse = "1.9.4"
uuid = { version = "1.10.0", features = ["v4"] }
librqbit-upnp = { path = "../upnp", default-features = false }
librqbit-upnp = { version = "0.1", path = "../upnp", default-features = false }
gethostname = "0.5.0"
librqbit-sha1-wrapper = { path = "../sha1w", default-features = false }
librqbit-core = { path = "../librqbit_core", default-features = false }
librqbit-sha1-wrapper = { path = "../sha1w", version = "4", default-features = false }
librqbit-core = { version = "4", path = "../librqbit_core", default-features = false }
mime_guess = "2.0.5"
url = "2.5.2"
parking_lot = "0.12.3"

1
crates/upnp-serve/README.md Symbolic link
View file

@ -0,0 +1 @@
../README.md

6
crates/upnp-serve/examples/upnp-stub-server.rs
View file

@ -5,12 +5,12 @@ use std::{
use anyhow::Context;
use axum::routing::get;
use mime_guess::Mime;
use tracing::{error, info};
use upnp_serve::{
use librqbit_upnp_serve::{
upnp_types::content_directory::response::{Item, ItemOrContainer},
UpnpServer, UpnpServerOptions,
};
use mime_guess::Mime;
use tracing::{error, info};
#[tokio::main]
async fn main() -> anyhow::Result<()> {