Trivernis
/
mediarepo
mirror of https://github.com/Trivernis/mediarepo.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update dependencies

Browse Source 
Signed-off-by: trivernis <trivernis@protonmail.com>
develop
trivernis 2 years ago
parent d83f211ceb
commit 0d902bf432
Signed by: Trivernis
GPG Key ID: DFFFCC2C7A02DB45
18 changed files with 1278 additions and 1211 deletions
Show Stats Download Patch File Download Diff File

16
mediarepo-api/Cargo.toml
Unescape Escape View File

@ -7,11 +7,11 @@ license = "gpl-3"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[dependencies]
tracing = "0.1.32"
thiserror = "1.0.30"
tracing = "0.1.34"
thiserror = "1.0.31"
async-trait = { version = "0.1.53", optional = true }
parking_lot = { version = "0.12.0", optional = true }
serde_json = { version = "1.0.79", optional = true }
serde_json = { version = "1.0.81", optional = true }
directories = { version = "4.0.1", optional = true }
mime_guess = { version = "2.0.4", optional = true }
serde_piecewise_default = "0.2.0"
@ -20,12 +20,12 @@ url = { version = "2.2.2", optional = true }
pathsearch = { version = "0.2.0", optional = true }
[dependencies.bromine]
version = "0.20.1"
version = "0.21.0"
optional = true
features = ["serialize_bincode", "encryption_layer"]
[dependencies.serde]
version = "1.0.136"
version = "1.0.137"
features = ["serde_derive"]
[dependencies.chrono]
@ -33,18 +33,18 @@ version = "0.4.19"
features = ["serde"]
[dependencies.tauri]
version = "1.0.0-rc.4"
version = "1.0.0-rc.9"
optional = true
default-features = false
features = []
[dependencies.tokio]
version = "1.17.0"
version = "1.18.1"
optional = true
features = ["sync", "fs", "net", "io-util", "io-std", "time", "rt", "process"]
[dependencies.toml]
version = "0.5.8"
version = "0.5.9"
optional = true
[features]

31
mediarepo-api/src/client_api/protocol.rs
Unescape Escape View File

@ -1,9 +1,10 @@
use async_trait::async_trait;
use bromine::error::Result;
use bromine::prelude::encrypted::{EncryptedStream, EncryptionOptions};
use bromine::prelude::encrypted::{EncryptedStream, EncryptionOptions, Keys};
use bromine::prelude::IPCResult;
use bromine::protocol::encrypted::EncryptedListener;
use bromine::protocol::*;
use bromine::utils::generate_secret;
use std::io::Error;
use std::net::ToSocketAddrs;
use std::pin::Pin;
@ -31,8 +32,18 @@ impl AsyncStreamProtocolListener for ApiProtocolListener {
#[tracing::instrument]
async fn protocol_bind(address: Self::AddressType, _: Self::ListenerOptions) -> Result<Self> {
if let Some(addr) = address.to_socket_addrs().ok().and_then(|mut a| a.next()) {
let listener =
EncryptedListener::protocol_bind(addr, EncryptionOptions::default()).await?;
let listener = EncryptedListener::protocol_bind(
addr,
EncryptionOptions {
keys: Keys {
known_peers: vec![],
secret: generate_secret(),
allow_unknown: true,
},
..Default::default()
},
)
.await?;
tracing::info!("Connecting via encrypted TCP");
Ok(Self::Tcp(listener))
@ -116,8 +127,18 @@ impl AsyncProtocolStream for ApiProtocolStream {
_: Self::StreamOptions,
) -> IPCResult<Self> {
if let Some(addr) = address.to_socket_addrs().ok().and_then(|mut a| a.next()) {
let stream =
EncryptedStream::protocol_connect(addr, EncryptionOptions::default()).await?;
let stream = EncryptedStream::protocol_connect(
addr,
EncryptionOptions {
keys: Keys {
known_peers: vec![],
secret: generate_secret(),
allow_unknown: true,
},
..Default::default()
},
)
.await?;
Ok(Self::Tcp(stream))
} else {
#[cfg(unix)]

11
mediarepo-api/src/tauri_plugin/commands/daemon.rs
Unescape Escape View File

@ -2,8 +2,9 @@ use crate::daemon_management::find_daemon_executable;
use crate::tauri_plugin::commands::AppAccess;
use crate::tauri_plugin::error::PluginResult;
use crate::tauri_plugin::settings::save_settings;
use bromine::prelude::encrypted::EncryptedListener;
use bromine::prelude::encrypted::{EncryptedListener, EncryptionOptions, Keys};
use bromine::prelude::{IPCError, IPCResult};
use bromine::utils::generate_secret;
use bromine::IPCBuilder;
use std::io::ErrorKind;
use std::net::{SocketAddr, ToSocketAddrs};
@ -55,6 +56,14 @@ pub async fn check_daemon_running(address: String) -> PluginResult<bool> {
async fn try_connect_daemon(address: String) -> IPCResult<()> {
let address = get_socket_address(address)?;
let ctx = IPCBuilder::<EncryptedListener<TcpListener>>::new()
.client_options(EncryptionOptions {
keys: Keys {
allow_unknown: true,
secret: generate_secret(),
known_peers: vec![],
},
..Default::default()
})
.address(address)
.build_client()
.await?;

501
mediarepo-daemon/Cargo.lock generated
View File

File diff suppressed because it is too large Load Diff

14
mediarepo-daemon/Cargo.toml
Unescape Escape View File

@ -16,17 +16,17 @@ name = "mediarepo-daemon"
path = "src/main.rs"
[dependencies]
tracing = "0.1.33"
toml = "0.5.8"
tracing = "0.1.34"
toml = "0.5.9"
structopt = "0.3.26"
glob = "0.3.0"
tracing-flame = "0.2.0"
tracing-appender = "0.2.2"
tracing-log = "0.1.2"
tracing-log = "0.1.3"
rolling-file = "0.1.0"
num-integer = "0.1.44"
console-subscriber = "0.1.4"
log = "0.4.16"
num-integer = "0.1.45"
console-subscriber = "0.1.5"
log = "0.4.17"
opentelemetry = { version = "0.17.0", features = ["rt-tokio"] }
opentelemetry-jaeger = { version = "0.16.0", features = ["rt-tokio"] }
tracing-opentelemetry = "0.17.2"
@ -45,7 +45,7 @@ path = "./mediarepo-socket"
path = "./mediarepo-worker"
[dependencies.tokio]
version = "1.17.0"
version = "1.18.1"
features = ["macros", "rt-multi-thread", "io-std", "io-util"]
[dependencies.tracing-subscriber]

14
mediarepo-daemon/mediarepo-core/Cargo.toml
Unescape Escape View File

@ -7,18 +7,18 @@ workspace = ".."
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[dependencies]
thiserror = "1.0.30"
thiserror = "1.0.31"
multihash = "0.16.2"
multibase = "0.9.1"
base64 = "0.13.0"
toml = "0.5.8"
serde = "1.0.136"
toml = "0.5.9"
serde = "1.0.137"
futures = "0.3.21"
itertools = "0.10.3"
glob = "0.3.0"
tracing = "0.1.33"
tracing = "0.1.34"
data-encoding = "2.3.2"
tokio-graceful-shutdown = "0.5.0"
tokio-graceful-shutdown = "0.7.0"
thumbnailer = "0.4.0"
bincode = "1.3.3"
tracing-subscriber = "0.3.11"
@ -29,12 +29,12 @@ version = "0.7.1"
default-features = false
[dependencies.sqlx]
version = "0.5.11"
version = "0.5.13"
default-features = false
features = ["migrate"]
[dependencies.tokio]
version = "1.17.0"
version = "1.18.1"
features = ["fs", "io-util", "io-std"]
[dependencies.config]

4
mediarepo-daemon/mediarepo-core/src/error.rs
Unescape Escape View File

@ -2,6 +2,7 @@ use std::fmt::{Debug, Formatter};
use sea_orm::DbErr;
use thiserror::Error;
use tokio_graceful_shutdown::GracefulShutdownError;
pub type RepoResult<T> = Result<T, RepoError>;
pub type RepoDatabaseResult<T> = Result<T, RepoDatabaseError>;
@ -46,6 +47,9 @@ pub enum RepoError {
#[error("bincode de-/serialization failed {0}")]
Bincode(#[from] bincode::Error),
#[error("graceful shutdown failed {0}")]
Shutdown(#[from] GracefulShutdownError),
}
#[derive(Error, Debug)]

4
mediarepo-daemon/mediarepo-database/Cargo.toml
Unescape Escape View File

@ -8,13 +8,13 @@ workspace = ".."
[dependencies]
chrono = "0.4.19"
tracing = "0.1.33"
tracing = "0.1.34"
[dependencies.mediarepo-core]
path = "../mediarepo-core"
[dependencies.sqlx]
version = "0.5.11"
version = "0.5.13"
features = ["migrate"]
[dependencies.sea-orm]

6
mediarepo-daemon/mediarepo-logic/Cargo.toml
Unescape Escape View File

@ -8,10 +8,10 @@ workspace = ".."
[dependencies]
chrono = "0.4.19"
serde = "1.0.136"
serde = "1.0.137"
mime_guess = "2.0.4"
mime = "0.3.16"
tracing = "0.1.33"
tracing = "0.1.34"
async-trait = "0.1.53"
[dependencies.mediarepo-core]
@ -26,6 +26,6 @@ features = ["runtime-tokio-native-tls", "macros"]
default-features = false
[dependencies.tokio]
version = "1.17.0"
version = "1.18.1"
features = ["fs", "io-std", "io-util"]

6
mediarepo-daemon/mediarepo-socket/Cargo.toml
Unescape Escape View File

@ -7,8 +7,8 @@ workspace = ".."
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[dependencies]
serde = "1.0.136"
tracing = "0.1.33"
serde = "1.0.137"
tracing = "0.1.34"
compare = "0.1.0"
port_check = "0.1.5"
rayon = "1.5.2"
@ -26,7 +26,7 @@ path = "../mediarepo-logic"
path = "../mediarepo-worker"
[dependencies.tokio]
version = "1.17.0"
version = "1.18.1"
features = ["net"]
[dependencies.chrono]

13
mediarepo-daemon/mediarepo-socket/src/lib.rs
Unescape Escape View File

@ -3,7 +3,10 @@ use std::net::SocketAddr;
use tokio::net::TcpListener;
use tokio::task::JoinHandle;
use crate::encrypted::EncryptedListener;
use crate::encrypted::{EncryptedListener, Keys};
use crate::prelude::utils::generate_secret;
use mediarepo_core::bromine::prelude::encrypted::EncryptionOptions;
use mediarepo_core::bromine::prelude::tcp::TcpOptions;
use mediarepo_core::bromine::prelude::*;
use mediarepo_core::error::{RepoError, RepoResult};
use mediarepo_core::mediarepo_api::types::misc::InfoResponse;
@ -42,6 +45,14 @@ pub fn start_tcp_server(
.name("mediarepo_tcp::listen")
.spawn(async move {
get_builder::<EncryptedListener<TcpListener>>(address)
.server_options(EncryptionOptions {
keys: Keys {
allow_unknown: true,
known_peers: vec![],
secret: generate_secret(),
},
..Default::default()
})
.insert::<SubsystemKey>(subsystem)
.insert_all(shared_data)
.insert::<SizeMetadataKey>(Default::default())

6
mediarepo-daemon/mediarepo-worker/Cargo.toml
Unescape Escape View File

@ -7,7 +7,7 @@ edition = "2021"
[dependencies]
async-trait = "0.1.53"
tracing = "0.1.33"
tracing = "0.1.34"
[dependencies.mediarepo-core]
path = "../mediarepo-core"
@ -19,7 +19,7 @@ path = "../mediarepo-logic"
path = "../mediarepo-database"
[dependencies.tokio]
version = "1.17.0"
version = "1.18.1"
features = ["macros"]
[dependencies.chrono]
@ -27,5 +27,5 @@ version = "0.4.19"
features = ["serde"]
[dependencies.serde]
version = "1.0.136"
version = "1.0.137"
features = ["derive"]

4
mediarepo-daemon/src/main.rs
Unescape Escape View File

@ -8,7 +8,7 @@ use structopt::StructOpt;
use tokio::fs;
use tokio::io::AsyncWriteExt;
use mediarepo_core::error::RepoResult;
use mediarepo_core::error::{RepoError, RepoResult};
use mediarepo_core::fs::drop_file::DropFile;
use mediarepo_core::settings::{PathSettings, Settings};
use mediarepo_core::tokio_graceful_shutdown::{SubsystemHandle, Toplevel};
@ -151,7 +151,7 @@ async fn start_server(opt: Opt, settings: Settings) -> RepoResult<()> {
}
if let Err(e) = top_level
.catch_signals()
.handle_shutdown_requests(Duration::from_millis(1000))
.handle_shutdown_requests::<RepoError>(Duration::from_millis(1000))
.await
{
tracing::error!("an error occurred when running the servers {}", e);

68
mediarepo-ui/package.json
Unescape Escape View File

@ -13,51 +13,51 @@
},
"private": true,
"dependencies": {
"@angular/animations": "~13.3.2",
"@angular/cdk": "^13.3.2",
"@angular/common": "~13.3.2",
"@angular/compiler": "~13.3.2",
"@angular/core": "~13.3.2",
"@angular/animations": "~13.3.6",
"@angular/cdk": "^13.3.6",
"@angular/common": "~13.3.6",
"@angular/compiler": "~13.3.6",
"@angular/core": "~13.3.6",
"@angular/flex-layout": "^13.0.0-beta.36",
"@angular/forms": "~13.3.2",
"@angular/material": "^13.3.2",
"@angular/platform-browser": "~13.3.2",
"@angular/platform-browser-dynamic": "~13.3.2",
"@angular/router": "~13.3.2",
"@ng-icons/core": "^15.1.0",
"@ng-icons/feather-icons": "^15.1.0",
"@ng-icons/material-icons": "^15.1.0",
"@tauri-apps/api": "^1.0.0-rc.3",
"@angular/forms": "~13.3.6",
"@angular/material": "^13.3.6",
"@angular/platform-browser": "~13.3.6",
"@angular/platform-browser-dynamic": "~13.3.6",
"@angular/router": "~13.3.6",
"@ng-icons/core": "^16.0.0",
"@ng-icons/feather-icons": "^16.0.0",
"@ng-icons/material-icons": "^16.0.0",
"@tauri-apps/api": "^1.0.0-rc.5",
"chart.js": "^3.7.1",
"primeicons": "^5.0.0",
"primeng": "^13.3.2",
"primeng": "^13.3.3",
"rxjs": "~7.5.5",
"tslib": "^2.3.1",
"tslib": "^2.4.0",
"w3c-keys": "^1.0.3",
"zone.js": "~0.11.5"
},
"devDependencies": {
"@angular-devkit/build-angular": "~13.3.2",
"@angular-eslint/builder": "^13.2.0",
"@angular-eslint/eslint-plugin": "^13.2.0",
"@angular-eslint/eslint-plugin-template": "^13.2.0",
"@angular-eslint/schematics": "^13.2.0",
"@angular-eslint/template-parser": "^13.2.0",
"@angular/cli": "~13.3.2",
"@angular/compiler-cli": "~13.3.2",
"@tauri-apps/cli": "^1.0.0-rc.8",
"@angular-devkit/build-angular": "~13.3.5",
"@angular-eslint/builder": "^13.2.1",
"@angular-eslint/eslint-plugin": "^13.2.1",
"@angular-eslint/eslint-plugin-template": "^13.2.1",
"@angular-eslint/schematics": "^13.2.1",
"@angular-eslint/template-parser": "^13.2.1",
"@angular/cli": "~13.3.5",
"@angular/compiler-cli": "~13.3.6",
"@tauri-apps/cli": "^1.0.0-rc.10",
"@types/file-saver": "^2.0.4",
"@types/jasmine": "~4.0.2",
"@types/node": "^17.0.23",
"@typescript-eslint/eslint-plugin": "5.19.0",
"@typescript-eslint/parser": "^5.19.0",
"eslint": "^8.13.0",
"jasmine-core": "~4.0.0",
"karma": "~6.3.10",
"@types/jasmine": "~4.0.3",
"@types/node": "^17.0.31",
"@typescript-eslint/eslint-plugin": "5.22.0",
"@typescript-eslint/parser": "^5.22.0",
"eslint": "^8.15.0",
"jasmine-core": "~4.1.0",
"karma": "~6.3.19",
"karma-chrome-launcher": "~3.1.0",
"karma-coverage": "~2.2.0",
"karma-jasmine": "~4.0.2",
"karma-jasmine": "~5.0.0",
"karma-jasmine-html-reporter": "~1.7.0",
"typescript": "~4.6.3"
"typescript": "~4.6.4"
}
}

182
mediarepo-ui/src-tauri/Cargo.lock generated
Unescape Escape View File

@ -84,7 +84,7 @@ checksum = "ed6aa3524a2dfcf9fe180c51eae2b58738348d819517ceadf95789c51fff7600"
dependencies = [
"proc-macro2 1.0.36",
"quote 1.0.17",
"syn 1.0.89",
"syn 1.0.92",
]
[[package]]
@ -155,9 +155,9 @@ dependencies = [
[[package]]
name = "bromine"
version = "0.20.1"
version = "0.21.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "78cf1689260e40fe479fcdcfa5e2966abf4719a34083382a878350707ef75925"
checksum = "0d016f7092248801069dbac50ef5080e11d2844a8d7a87fb5a5b7fae0ad9af1d"
dependencies = [
"async-trait",
"bincode",
@ -281,7 +281,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "74f89d248799e3f15f91b70917f65381062a01bb8e222700ea0e5a7ff9785f9c"
dependencies = [
"byteorder",
"uuid",
"uuid 0.8.2",
]
[[package]]
@ -317,12 +317,6 @@ version = "1.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
[[package]]
name = "cfg_aliases"
version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e"
[[package]]
name = "chacha20"
version = "0.8.1"
@ -521,7 +515,7 @@ dependencies = [
"proc-macro2 1.0.36",
"quote 1.0.17",
"smallvec",
"syn 1.0.89",
"syn 1.0.92",
]
[[package]]
@ -531,7 +525,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "dfae75de57f2b2e85e8768c3ea840fd159c8f33e2b6522c7835b7abac81be16e"
dependencies = [
"quote 1.0.17",
"syn 1.0.89",
"syn 1.0.92",
]
[[package]]
@ -541,7 +535,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f877be4f7c9f246b183111634f75baa039715e3f46ce860677d3b19a69fb229c"
dependencies = [
"quote 1.0.17",
"syn 1.0.89",
"syn 1.0.92",
]
[[package]]
@ -594,7 +588,7 @@ dependencies = [
"proc-macro2 1.0.36",
"quote 1.0.17",
"strsim 0.9.3",
"syn 1.0.89",
"syn 1.0.92",
]
[[package]]
@ -608,7 +602,7 @@ dependencies = [
"proc-macro2 1.0.36",
"quote 1.0.17",
"strsim 0.10.0",
"syn 1.0.89",
"syn 1.0.92",
]
[[package]]
@ -619,7 +613,7 @@ checksum = "d9b5a2f4ac4969822c62224815d069952656cadc7084fdca9751e6d959189b72"
dependencies = [
"darling_core 0.10.2",
"quote 1.0.17",
"syn 1.0.89",
"syn 1.0.92",
]
[[package]]
@ -630,7 +624,7 @@ checksum = "72c41b3b7352feb3211a0d743dc5700a4e3b60f51bd2b368892d1e0f9a95f44b"
dependencies = [
"darling_core 0.13.1",
"quote 1.0.17",
"syn 1.0.89",
"syn 1.0.92",
]
[[package]]
@ -673,7 +667,7 @@ dependencies = [
"proc-macro2 1.0.36",
"quote 1.0.17",
"rustc_version 0.4.0",
"syn 1.0.89",
"syn 1.0.92",
]
[[package]]
@ -924,7 +918,7 @@ checksum = "33c1e13800337f4d4d7a316bf45a567dbcb6ffe087f16424852d97e97a91f512"
dependencies = [
"proc-macro2 1.0.36",
"quote 1.0.17",
"syn 1.0.89",
"syn 1.0.92",
]
[[package]]
@ -1158,7 +1152,7 @@ dependencies = [
"proc-macro-error",
"proc-macro2 1.0.36",
"quote 1.0.17",
"syn 1.0.89",
"syn 1.0.92",
]
[[package]]
@ -1274,7 +1268,7 @@ dependencies = [
"proc-macro-error",
"proc-macro2 1.0.36",
"quote 1.0.17",
"syn 1.0.89",
"syn 1.0.92",
]
[[package]]
@ -1312,7 +1306,7 @@ dependencies = [
"markup5ever",
"proc-macro2 1.0.36",
"quote 1.0.17",
"syn 1.0.89",
"syn 1.0.92",
]
[[package]]
@ -1735,7 +1729,7 @@ dependencies = [
"proc-macro-crate 0.1.5",
"proc-macro2 1.0.36",
"quote 1.0.17",
"syn 1.0.89",
"syn 1.0.92",
]
[[package]]
@ -1823,7 +1817,7 @@ dependencies = [
"proc-macro-crate 1.1.3",
"proc-macro2 1.0.36",
"quote 1.0.17",
"syn 1.0.89",
"syn 1.0.92",
]
[[package]]
@ -2070,7 +2064,7 @@ dependencies = [
"proc-macro-hack",
"proc-macro2 1.0.36",
"quote 1.0.17",
"syn 1.0.89",
"syn 1.0.92",
]
[[package]]
@ -2084,7 +2078,7 @@ dependencies = [
"proc-macro-hack",
"proc-macro2 1.0.36",
"quote 1.0.17",
"syn 1.0.89",
"syn 1.0.92",
]
[[package]]
@ -2198,7 +2192,7 @@ dependencies = [
"proc-macro-error-attr",
"proc-macro2 1.0.36",
"quote 1.0.17",
"syn 1.0.89",
"syn 1.0.92",
"version_check",
]
@ -2521,29 +2515,29 @@ dependencies = [
[[package]]
name = "serde"
version = "1.0.136"
version = "1.0.137"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ce31e24b01e1e524df96f1c2fdd054405f8d7376249a5110886fb4b658484789"
checksum = "61ea8d54c77f8315140a05f4c7237403bf38b72704d031543aa1d16abbf517d1"
dependencies = [
"serde_derive",
]
[[package]]
name = "serde_derive"
version = "1.0.136"
version = "1.0.137"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "08597e7152fcd306f41838ed3e37be9eaeed2b61c42e2117266a554fab4662f9"
checksum = "1f26faba0c3959972377d3b2d306ee9f71faee9714294e41bb777f83f88578be"
dependencies = [
"proc-macro2 1.0.36",
"quote 1.0.17",
"syn 1.0.89",
"syn 1.0.92",
]
[[package]]
name = "serde_json"
version = "1.0.79"
version = "1.0.81"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8e8d9fa5c3b304765ce1fd9c4c8a3de2c8db365a5b91be52f186efc675681d95"
checksum = "9b7ce2b32a1aed03c558dc61a5cd328f15aff2dbc17daad8fb8af04d2100e15c"
dependencies = [
"itoa 1.0.1",
"ryu",
@ -2580,7 +2574,7 @@ checksum = "98d0516900518c29efa217c298fa1f4e6c6ffc85ae29fd7f4ee48f176e1a9ed5"
dependencies = [
"proc-macro2 1.0.36",
"quote 1.0.17",
"syn 1.0.89",
"syn 1.0.92",
]
[[package]]
@ -2603,7 +2597,7 @@ dependencies = [
"darling 0.13.1",
"proc-macro2 1.0.36",
"quote 1.0.17",
"syn 1.0.89",
"syn 1.0.92",
]
[[package]]
@ -2625,7 +2619,7 @@ checksum = "74064874e9f6a15f04c1f3cb627902d0e6b410abbf36668afa873c61889f1763"
dependencies = [
"proc-macro2 1.0.36",
"quote 1.0.17",
"syn 1.0.89",
"syn 1.0.92",
]
[[package]]
@ -2787,7 +2781,7 @@ dependencies = [
"heck 0.3.3",
"proc-macro2 1.0.36",
"quote 1.0.17",
"syn 1.0.89",
"syn 1.0.92",
]
[[package]]
@ -2809,9 +2803,9 @@ dependencies = [
[[package]]
name = "syn"
version = "1.0.89"
version = "1.0.92"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ea297be220d52398dcc07ce15a209fce436d361735ac1db700cab3b6cdfb9f54"
checksum = "7ff7c592601f11445996a06f8ad0c27f094a58857c2f89e97974ab9235b92c52"
dependencies = [
"proc-macro2 1.0.36",
"quote 1.0.17",
@ -2826,7 +2820,7 @@ checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f"
dependencies = [
"proc-macro2 1.0.36",
"quote 1.0.17",
"syn 1.0.89",
"syn 1.0.92",
"unicode-xid 0.2.2",
]
@ -2876,9 +2870,9 @@ dependencies = [
[[package]]
name = "tao"
version = "0.7.0"
version = "0.8.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2b6a3359088d4c4735a13f933202f4ecd91f5991b41a8eb757f2449c044ce925"
checksum = "1fd55783f88aafed0c5510ae540716455297f4f6df08f8114dc9fddc37d76ee3"
dependencies = [
"bitflags",
"cairo-rs",
@ -2940,15 +2934,14 @@ dependencies = [
[[package]]
name = "tauri"
version = "1.0.0-rc.6"
version = "1.0.0-rc.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f6d514a34b3f9a07e2002d95e1371b42a446636e3d571a59e974b21d6acf3007"
checksum = "a34cef4a0ebee0230baaa319b1709c4336f4add550149d2b005a9a5dc5d33617"
dependencies = [
"anyhow",
"bincode",
"cfg_aliases",
"cocoa",
"dirs-next",
"either",
"embed_plist",
"flate2",
"futures",
@ -2956,9 +2949,10 @@ dependencies = [
"glib",
"glob",
"gtk",
"heck 0.4.0",
"http",
"ignore",
"memchr",
"objc",
"once_cell",
"open",
"os_pipe",
@ -2983,18 +2977,21 @@ dependencies = [
"thiserror",
"tokio",
"url",
"uuid",
"uuid 1.0.0",
"webkit2gtk",
"webview2-com",
"windows 0.30.0",
]
[[package]]
name = "tauri-build"
version = "1.0.0-rc.5"
version = "1.0.0-rc.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ede6462a4692e2fd5030497ad576264dc90eea5fa337182492e77291d45fc78b"
checksum = "3f85528e1a51b1d79761f56a0af8fb639ffa282e6bb01b012cdd552673e45be6"
dependencies = [
"anyhow",
"cargo_toml",
"semver 1.0.6",
"serde_json",
"tauri-utils",
"winres",
@ -3002,9 +2999,9 @@ dependencies = [
[[package]]
name = "tauri-codegen"
version = "1.0.0-rc.4"
version = "1.0.0-rc.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "54193ebdb010e85824301ce5f0940742b680d66376203f6425d549d2f32ad499"
checksum = "7b6273cb4ba4210d48cba182415dd8ed2f23b29f9f89801f77a09fcbb6a6d92b"
dependencies = [
"base64",
"brotli",
@ -3018,29 +3015,29 @@ dependencies = [
"sha2",
"tauri-utils",
"thiserror",
"uuid",
"uuid 1.0.0",
"walkdir",
]
[[package]]
name = "tauri-macros"
version = "1.0.0-rc.4"
version = "1.0.0-rc.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c8b867ef4703cb8e50f128ee3c941895d94c01e0ebd9007a7b45ecca52516dbf"
checksum = "07d91657771bb36eca42d86afc80aa05e10f6b7328f8f40630e52c10ae84ddf3"
dependencies = [
"heck 0.4.0",
"proc-macro2 1.0.36",
"quote 1.0.17",
"syn 1.0.89",
"syn 1.0.92",
"tauri-codegen",
"tauri-utils",
]
[[package]]
name = "tauri-runtime"
version = "0.3.4"
version = "0.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5b289ac8eafc52a36425fcaf3de23febd0b2606d3cce2b39ac412a1817fae537"
checksum = "86b266b563439a4c300a524edc695541d72cb5ba55cd41f27adc6944c9c88d6e"
dependencies = [
"gtk",
"http",
@ -3050,22 +3047,25 @@ dependencies = [
"serde_json",
"tauri-utils",
"thiserror",
"uuid",
"uuid 1.0.0",
"webview2-com",
"windows 0.30.0",
]
[[package]]
name = "tauri-runtime-wry"
version = "0.3.5"
version = "0.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6a8bf16e0476a8249aa2c75e7b49ec4c059be5fb27d9f6514e30ed327e8e9fa2"
checksum = "f2a2f7f90f83eb4098f62dac52f982a88c5e2e2870638c9bef70c56a38cd20d6"
dependencies = [
"cocoa",
"gtk",
"percent-encoding",
"rand 0.8.5",
"tauri-runtime",
"tauri-utils",
"uuid",
"uuid 1.0.0",
"webkit2gtk",
"webview2-com",
"windows 0.30.0",
"wry",
@ -3073,9 +3073,9 @@ dependencies = [
[[package]]
name = "tauri-utils"
version = "1.0.0-rc.4"
version = "1.0.0-rc.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a67fcf8fdd1340de4e75c01966fceab03057a8b0e97864eb39a21e420deed503"
checksum = "ed2d8266063ac4d696560d4ff4e695c3c238d8d96ef1120d1eab9ba7482f59a3"
dependencies = [
"brotli",
"ctor",
@ -3084,13 +3084,13 @@ dependencies = [
"html5ever",
"json-patch",
"kuchiki",
"memchr",
"phf 0.10.1",
"proc-macro2 1.0.36",
"quote 1.0.17",
"serde",
"serde_json",
"serde_with",
"serialize-to-javascript",
"thiserror",
"url",
"walkdir",
@ -3129,22 +3129,22 @@ checksum = "8eaa81235c7058867fa8c0e7314f33dcce9c215f535d1913822a2b3f5e289f3c"
[[package]]
name = "thiserror"
version = "1.0.30"
version = "1.0.31"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "854babe52e4df1653706b98fcfc05843010039b406875930a70e4d9644e5c417"
checksum = "bd829fe32373d27f76265620b5309d0340cb8550f523c1dda251d6298069069a"
dependencies = [
"thiserror-impl",
]
[[package]]
name = "thiserror-impl"
version = "1.0.30"
version = "1.0.31"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "aa32fd3f627f367fe16f893e2597ae3c05020f8bba2666a4e6ea73d377e5714b"
checksum = "0396bc89e626244658bef819e22d0cc459e795a5ebe878e6ec336d1674a8d79a"
dependencies = [
"proc-macro2 1.0.36",
"quote 1.0.17",
"syn 1.0.89",
"syn 1.0.92",
]
[[package]]
@ -3184,9 +3184,9 @@ checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c"
[[package]]
name = "tokio"
version = "1.17.0"
version = "1.18.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2af73ac49756f3f7c01172e34a23e5d0216f6c32333757c2c61feb2bbff5a5ee"
checksum = "dce653fb475565de9f6fb0614b28bca8df2c430c0cf84bcd9c843f15de5414cc"
dependencies = [
"bytes",
"libc",
@ -3209,23 +3209,23 @@ checksum = "b557f72f448c511a979e2564e55d74e6c4432fc96ff4f6241bc6bded342643b7"
dependencies = [
"proc-macro2 1.0.36",
"quote 1.0.17",
"syn 1.0.89",
"syn 1.0.92",
]
[[package]]
name = "toml"
version = "0.5.8"
version = "0.5.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a31142970826733df8241ef35dc040ef98c679ab14d7c3e54d827099b3acecaa"
checksum = "8d82e1a7758622a465f8cee077614c73484dac5b836c02ff6a40d5d1010324d7"
dependencies = [
"serde",
]
[[package]]
name = "tracing"
version = "0.1.32"
version = "0.1.34"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4a1bdf54a7c28a2bbf701e1d2233f6c77f473486b94bee4f9678da5a148dca7f"
checksum = "5d0ecdcb44a79f0fe9844f0c4f33a342cbcbb5117de8001e6ba0dc2351327d09"
dependencies = [
"cfg-if",
"pin-project-lite",
@ -3241,7 +3241,7 @@ checksum = "2e65ce065b4b5c53e73bb28912318cb8c9e9ad3921f1d669eb0e68b4c8143a2b"
dependencies = [
"proc-macro2 1.0.36",
"quote 1.0.17",
"syn 1.0.89",
"syn 1.0.92",
]
[[package]]
@ -3267,9 +3267,9 @@ dependencies = [
[[package]]
name = "tracing-subscriber"
version = "0.3.9"
version = "0.3.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9e0ab7bdc962035a87fba73f3acca9b8a8d0034c2e6f60b84aeaaddddc155dce"
checksum = "4bc28f93baff38037f64e6f43d34cfa1605f27a49c34e8a04c5e78b0babf2596"
dependencies = [
"ansi_term",
"lazy_static",
@ -3395,6 +3395,12 @@ name = "uuid"
version = "0.8.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bc5cf98d8186244414c848017f0e2676b3fcb46807f6668a97dfe67359a3c4b7"
[[package]]
name = "uuid"
version = "1.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8cfcd319456c4d6ea10087ed423473267e1a071f3bc0aa89f80d60997843c6f0"
dependencies = [
"getrandom 0.2.5",
]
@ -3479,7 +3485,7 @@ dependencies = [
"log",
"proc-macro2 1.0.36",
"quote 1.0.17",
"syn 1.0.89",
"syn 1.0.92",
"wasm-bindgen-shared",
]
@ -3513,7 +3519,7 @@ checksum = "bfa8a30d46208db204854cadbb5d4baf5fcf8071ba5bf48190c3e59937962ebc"
dependencies = [
"proc-macro2 1.0.36",
"quote 1.0.17",
"syn 1.0.89",
"syn 1.0.92",
"wasm-bindgen-backend",
"wasm-bindgen-shared",
]
@ -3600,7 +3606,7 @@ checksum = "1515c6c82fcee93f6edaacc72c8e233dbe4ff3ca569dce1901dfc36c404a3e99"
dependencies = [
"proc-macro2 1.0.36",
"quote 1.0.17",
"syn 1.0.89",
"syn 1.0.92",
]
[[package]]
@ -3767,7 +3773,7 @@ version = "0.30.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "62ae44ab917e9005fe710d99d52d227ca0164b10a09be90649142cc3fab825d3"
dependencies = [
"syn 1.0.89",
"syn 1.0.92",
"windows_gen",
"windows_quote",
"windows_reader",
@ -3832,9 +3838,9 @@ dependencies = [
[[package]]
name = "wry"
version = "0.14.0"
version = "0.16.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6fd09ffc86ecea0a0d5f50cc8e4a8121a1bfc0b0825a160f86ac39e86979344c"
checksum = "6ca96d1cadf815f81c060c516a6a1f95937e6104672a6f2117826c2b9941628a"
dependencies = [
"block",
"cocoa",
@ -3920,6 +3926,6 @@ checksum = "3f8f187641dad4f680d25c4bfc4225b418165984179f26ca76ec4fb6441d3a17"
dependencies = [
"proc-macro2 1.0.36",
"quote 1.0.17",
"syn 1.0.89",
"syn 1.0.92",
"synstructure",
]

12
mediarepo-ui/src-tauri/Cargo.toml
Unescape Escape View File

@ -10,20 +10,20 @@ edition = "2018"
build = "src/build.rs"
[build-dependencies]
tauri-build = { version = "1.0.0-rc.5", features = [] }
tauri-build = { version = "1.0.0-rc.8", features = [] }
[dependencies]
serde_json = "1.0.79"
serde = { version = "1.0.136", features = ["derive"] }
thiserror = "1.0.30"
serde_json = "1.0.81"
serde = { version = "1.0.137", features = ["derive"] }
thiserror = "1.0.31"
typemap_rev = "0.1.5"
[dependencies.tauri]
version = "1.0.0-rc.6"
version = "1.0.0-rc.9"
features = ["dialog-all", "path-all", "shell-all"]
[dependencies.tracing-subscriber]
version = "0.3.9"
version = "0.3.11"
features = ["env-filter"]
[dependencies.mediarepo-api]

4
mediarepo-ui/src-tauri/tauri.conf.json
Unescape Escape View File

@ -29,13 +29,11 @@
"shortDescription": "A media management tool",
"longDescription": "",
"deb": {
"depends": [],
"useBootstrapper": false
"depends": []
},
"macOS": {
"frameworks": [],
"minimumSystemVersion": "",
"useBootstrapper": false,
"exceptionDomain": "",
"signingIdentity": null,
"entitlements": null

1593
mediarepo-ui/yarn.lock
View File

File diff suppressed because it is too large Load Diff
Write Preview
Loading…
Cancel
Save