Skip to content

Commit f09296f

Browse files
authored
Update dependencies (#388)
* Upgrade all dependencies, fix image laod * Fix size of import button * Fix size when picking image * Remove unused code * Forgot images when new image selected * Clippy corrections
1 parent cfb912c commit f09296f

24 files changed

+1365
-831
lines changed

Cargo.lock

+1,257-325
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

+8-7
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ version = "1.9.4"
66
[dependencies]
77
base64 = "^0.21.0"
88
config = "^0.13.3"
9-
copypasta = "^0.8.1"
9+
copypasta = "^0.10.0"
1010
flate2 = "^1.0.25"
1111
is_executable = "^1.0.1"
1212
nom = "^7.1.1"
@@ -15,11 +15,12 @@ serde_json = "^1.0.91"
1515

1616
steam_shortcuts_util = "^1.1.8"
1717
steamgriddb_api = "^0.3.1"
18-
sysinfo = "^0.29.0"
18+
sysinfo = "^0.30.5"
1919
eyre = "^0.6.8"
2020
color-eyre = "^0.6.2"
2121
dyn-clone = "^1.0.10"
2222
time = {version="^0.3.17", features = ["formatting"]}
23+
egui_extras = { version = "0.25.0", features = ["all_loaders"] }
2324

2425
[target."cfg(not(windows))".dependencies]
2526
openssl = { version = "*", features = ["vendored"] }
@@ -29,10 +30,10 @@ features = ["serde"]
2930
version = "^5.4.0"
3031

3132
[dependencies.eframe]
32-
version = "^0.22.0"
33+
version = "^0.25.0"
3334

3435
[dependencies.egui]
35-
version = "^0.22.0"
36+
version = "^0.25.0"
3637

3738
[dependencies.futures]
3839
version = "^0.3.25"
@@ -62,9 +63,9 @@ version = "^0.8.0"
6263
winres = "^0.1.12"
6364

6465
[target."cfg(windows)".dependencies]
65-
winreg = "^0.51.0"
66-
sqlite = "^0.31.1"
67-
roxmltree = "^0.18.0"
66+
winreg = "^0.52.0"
67+
sqlite = "^0.32.0"
68+
roxmltree = "^0.19.0"
6869

6970
[features]
7071
# This feature is enabled when building for a flatpak environment

src/platforms/egs/get_manifests.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ pub(crate) fn get_egs_manifests(
2727

2828
manifests.sort_by_key(|m| m.dedupe_key());
2929
manifests.dedup_by_key(|m| m.dedupe_key());
30-
for mut manifest in &mut manifests {
30+
for manifest in &mut manifests {
3131
manifest.launcher_path = Some(locations.launcher_path.clone());
3232
manifest.compat_folder = locations.compat_folder_path.clone();
3333
if settings.safe_launch.contains(&manifest.display_name)

src/platforms/playnite/playnite_platform.rs

+1-2
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ impl PlaynitePlatform {
8686
fn get_playnite_games(&self) -> eyre::Result<Vec<PlayniteGame>> {
8787
let mut res = vec![];
8888
let (launcher_path, games_file_path) = self.find_paths()?;
89-
let games_bytes = std::fs::read(&games_file_path).map_err(|e| match e.raw_os_error() {
89+
let games_bytes = std::fs::read(games_file_path).map_err(|e| match e.raw_os_error() {
9090
Some(32) => {
9191
eyre::format_err!("It looks like Playnite is running and preventing BoilR from reading its database, please ensure that Playnite closed.")
9292
}
@@ -123,7 +123,6 @@ impl PlaynitePlatform {
123123
return Err(eyre::eyre!("Did not find Playnite installation"));
124124
}
125125
let app_data_path = env::var("APPDATA")?;
126-
let launcher_path = launcher_path;
127126
let playnite_folder = Path::new(&app_data_path).join("Playnite");
128127
let games_file_path = playnite_folder.join("library").join("games.db");
129128
Ok((launcher_path, games_file_path))

src/steam/restarter.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
use std::{process::Command, thread::sleep, time::Duration};
22

3-
use sysinfo::{ProcessExt, System, SystemExt};
3+
use sysinfo::System;
44

55
pub fn ensure_steam_stopped() {
66
#[cfg(target_os = "windows")]

src/steam/utils.rs

-1
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,6 @@ pub fn get_shortcuts_paths(settings: &SteamSettings) -> eyre::Result<Vec<SteamUs
6969
));
7070
}
7171

72-
if !user_data_path.exists() {}
7372
let user_folders = std::fs::read_dir(&user_data_path)?;
7473
let users_info = user_folders
7574
.filter_map(|f| f.ok())

src/steamgriddb/cached_search.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ impl<'a> CachedSearch<'a> {
4646
}
4747
println!("Searching for {}", query.as_ref());
4848
let search = self.client.search(query.as_ref()).await?;
49-
let first_id = search.get(0).map(|f| f.id);
49+
let first_id = search.first().map(|f| f.id);
5050
match first_id {
5151
Some(assumed_id) => {
5252
self.search_map.insert(app_id, (query.into(), assumed_id));

src/steamgriddb/image_type.rs

-10
Original file line numberDiff line numberDiff line change
@@ -22,16 +22,6 @@ impl ImageType {
2222
&ALL_TYPES
2323
}
2424

25-
pub fn ratio(&self) -> f32{
26-
match self {
27-
ImageType::Hero => 0.3,
28-
ImageType::Grid => 1.6,
29-
ImageType::WideGrid => 0.5,
30-
ImageType::Logo => 0.2,
31-
ImageType::BigPicture => 0.5,
32-
ImageType::Icon => 1.0,
33-
}
34-
}
3525

3626
pub fn name(&self) -> &str {
3727
match self {

src/ui/components/game_image_button.rs

-186
This file was deleted.

src/ui/components/mod.rs

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
11
mod steam_user_select;
2-
mod game_image_button;
32

4-
pub use steam_user_select::render_user_select;
5-
pub use game_image_button::GameButton;
3+
pub use steam_user_select::render_user_select;

src/ui/components/steam_user_select.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,6 @@ pub fn render_user_select<'a>(
2626
None
2727
}
2828
} else {
29-
return steam_users.get(0);
29+
return steam_users.first();
3030
}
3131
}

0 commit comments

Comments
 (0)