Update all dependencies (#415)

* Update all dependencies

* Remove openssl and use rustls for reqwest

* Add nix as dependency to ensure fs feature

* Specify specific wayland-cursor dependency

This fixes the problem with egui where it can not compile on linux

* Update version to 1.9.5

* Update cargo-lock for flatpak
This commit is contained in:
Philip Kristoffersen
2024-10-28 11:48:25 +01:00
committed by GitHub
parent 839da8c18f
commit 10caa7bee1
6 changed files with 5613 additions and 1772 deletions
Generated
+1999 -780
View File
File diff suppressed because it is too large Load Diff
+29 -28
View File
@@ -1,71 +1,72 @@
[package]
edition = "2021"
name = "boilr"
version = "1.9.4"
version = "1.9.5"
[dependencies]
base64 = "^0.21.0"
config = "^0.13.3"
copypasta = "^0.10.0"
flate2 = "^1.0.25"
is_executable = "^1.0.1"
base64 = "^0.22.1"
config = "^0.14.1"
copypasta = "^0.10.1"
flate2 = "^1.0.34"
is_executable = "^1.0.4"
nom = "^7.1.1"
rusty-leveldb = "^3.0.0"
serde_json = "^1.0.91"
serde_json = "^1.0.132"
steam_shortcuts_util = "^1.1.8"
steamgriddb_api = "^0.3.1"
sysinfo = "^0.30.5"
eyre = "^0.6.8"
color-eyre = "^0.6.2"
dyn-clone = "^1.0.10"
time = {version="^0.3.17", features = ["formatting"]}
egui_extras = { version = "0.25.0", features = ["all_loaders"] }
[target."cfg(not(windows))".dependencies]
openssl = { version = "*", features = ["vendored"] }
sysinfo = "^0.32.0"
eyre = "^0.6.12"
color-eyre = "^0.6.3"
dyn-clone = "^1.0.17"
time = {version="^0.3.36", features = ["formatting"]}
egui_extras = { version = "0.29.1", features = ["all_loaders"] }
[dependencies.dashmap]
features = ["serde"]
version = "^5.4.0"
version = "^6.1.0"
[dependencies.eframe]
version = "^0.25.0"
version = "^0.29.1"
[dependencies.egui]
version = "^0.25.0"
version = "^0.29.1"
[dependencies.futures]
version = "^0.3.25"
version = "^0.3.31"
[dependencies.image]
features = ["png","webp","jpeg"]
version ="^0.24.5"
version ="^0.25.4"
#git = "https://github.com/PhilipK/image"
#rev = "55a668409b28fedcd6cd3dea25ae1b3cc9d25ec5"
[dependencies.reqwest]
default_features = false
version = "^0.11.13"
default-features = false
version = "^0.12.8"
features = ["json","rustls-tls"]
[dependencies.serde]
features = ["derive"]
version = "^1.0.151"
version = "^1.0.213"
[dependencies.tokio]
features = ["full"]
version = "^1.24.2"
version = "^1.41.0"
[dependencies.toml]
version = "^0.8.0"
version = "^0.8.19"
[target."cfg(windows)"]
[target."cfg(windows)".build-dependencies]
winres = "^0.1.12"
[target."cfg(windows)".dependencies]
winreg = "^0.52.0"
sqlite = "^0.32.0"
roxmltree = "^0.19.0"
sqlite = "^0.36.1"
roxmltree = "^0.20.0"
[target.'cfg(not(windows))'.dependencies]
wayland-cursor = "0.31.7"
[features]
# This feature is enabled when building for a flatpak environment
+3570 -957
View File
File diff suppressed because it is too large Load Diff
+13 -6
View File
@@ -1,6 +1,6 @@
use std::{process::Command, thread::sleep, time::Duration};
use std::{ffi::OsStr, process::Command, thread::sleep, time::Duration};
use sysinfo::System;
use sysinfo::{ProcessRefreshKind, ProcessesToUpdate, System};
pub fn ensure_steam_stopped() {
#[cfg(target_os = "windows")]
@@ -8,13 +8,18 @@ pub fn ensure_steam_stopped() {
#[cfg(target_family = "unix")]
let steam_name = "steam";
let os_steam_name = OsStr::new(steam_name);
let s = System::new_all();
let processes = s.processes_by_name(steam_name);
let processes = s.processes_by_name(os_steam_name);
for process in processes {
let mut s = System::new();
process.kill_with(sysinfo::Signal::Quit);
process.kill_with(sysinfo::Signal::Kill);
while s.refresh_process(process.pid()) {
let pid = process.pid();
let pid_arr = [pid];
let process_to_update = ProcessesToUpdate::Some(&pid_arr);
while s.refresh_processes_specifics(process_to_update, true,ProcessRefreshKind::everything()) == 0{
println!("Waiting for steam to stop");
sleep(Duration::from_millis(500));
process.kill_with(sysinfo::Signal::Quit);
@@ -25,8 +30,9 @@ pub fn ensure_steam_stopped() {
#[cfg(target_os = "windows")]
pub fn ensure_steam_started(settings: &super::SteamSettings) {
let steam_name = "steam.exe";
let os_steam_name = OsStr::new(steam_name);
let s = System::new_all();
let mut processes = s.processes_by_name(steam_name);
let mut processes = s.processes_by_name(os_steam_name);
if processes.next().is_none() {
//no steam, we need to start it
println!("Starting steam");
@@ -44,8 +50,9 @@ pub fn ensure_steam_started(settings: &super::SteamSettings) {
#[cfg(target_family = "unix")]
pub fn ensure_steam_started(_settings: &super::SteamSettings) {
let steam_name = "steam";
let os_steam_name = OsStr::new(steam_name);
let s = System::new_all();
let mut processes = s.processes_by_name(steam_name);
let mut processes = s.processes_by_name(os_steam_name);
if processes.next().is_none() {
//no steam, we need to start it
println!("Starting steam");
+1
View File
@@ -99,6 +99,7 @@ pub async fn download_images_for_users<'b>(
.map(|to_download| async move {
if let Err(e) = download_to_download(to_download).await {
println!("Error downloading {:?}: {}", &to_download.path, e);
dbg!(&e);
}
})
.buffer_unordered(CONCURRENT_REQUESTS)
+1 -1
View File
@@ -334,7 +334,7 @@ pub fn run_ui(args: Vec<String>) -> eyre::Result<()> {
native_options,
Box::new(|cc| {
setup(&cc.egui_ctx);
Box::new(app)
Ok(Box::new(app))
}),
);
run_result.map_err(|e| eyre::eyre!("Could not initialize: {:?}", e))