Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update dependencies #388

Merged
merged 6 commits into from
Jan 15, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1,582 changes: 1,257 additions & 325 deletions Cargo.lock

Large diffs are not rendered by default.

15 changes: 8 additions & 7 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ version = "1.9.4"
[dependencies]
base64 = "^0.21.0"
config = "^0.13.3"
copypasta = "^0.8.1"
copypasta = "^0.10.0"
flate2 = "^1.0.25"
is_executable = "^1.0.1"
nom = "^7.1.1"
Expand All @@ -15,11 +15,12 @@ serde_json = "^1.0.91"

steam_shortcuts_util = "^1.1.8"
steamgriddb_api = "^0.3.1"
sysinfo = "^0.29.0"
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"] }
Expand All @@ -29,10 +30,10 @@ features = ["serde"]
version = "^5.4.0"

[dependencies.eframe]
version = "^0.22.0"
version = "^0.25.0"

[dependencies.egui]
version = "^0.22.0"
version = "^0.25.0"

[dependencies.futures]
version = "^0.3.25"
Expand Down Expand Up @@ -62,9 +63,9 @@ version = "^0.8.0"
winres = "^0.1.12"

[target."cfg(windows)".dependencies]
winreg = "^0.51.0"
sqlite = "^0.31.1"
roxmltree = "^0.18.0"
winreg = "^0.52.0"
sqlite = "^0.32.0"
roxmltree = "^0.19.0"

[features]
# This feature is enabled when building for a flatpak environment
Expand Down
2 changes: 1 addition & 1 deletion src/platforms/egs/get_manifests.rs
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ pub(crate) fn get_egs_manifests(

manifests.sort_by_key(|m| m.dedupe_key());
manifests.dedup_by_key(|m| m.dedupe_key());
for mut manifest in &mut manifests {
for manifest in &mut manifests {
manifest.launcher_path = Some(locations.launcher_path.clone());
manifest.compat_folder = locations.compat_folder_path.clone();
if settings.safe_launch.contains(&manifest.display_name)
Expand Down
3 changes: 1 addition & 2 deletions src/platforms/playnite/playnite_platform.rs
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ impl PlaynitePlatform {
fn get_playnite_games(&self) -> eyre::Result<Vec<PlayniteGame>> {
let mut res = vec![];
let (launcher_path, games_file_path) = self.find_paths()?;
let games_bytes = std::fs::read(&games_file_path).map_err(|e| match e.raw_os_error() {
let games_bytes = std::fs::read(games_file_path).map_err(|e| match e.raw_os_error() {
Some(32) => {
eyre::format_err!("It looks like Playnite is running and preventing BoilR from reading its database, please ensure that Playnite closed.")
}
Expand Down Expand Up @@ -123,7 +123,6 @@ impl PlaynitePlatform {
return Err(eyre::eyre!("Did not find Playnite installation"));
}
let app_data_path = env::var("APPDATA")?;
let launcher_path = launcher_path;
let playnite_folder = Path::new(&app_data_path).join("Playnite");
let games_file_path = playnite_folder.join("library").join("games.db");
Ok((launcher_path, games_file_path))
Expand Down
2 changes: 1 addition & 1 deletion src/steam/restarter.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
use std::{process::Command, thread::sleep, time::Duration};

use sysinfo::{ProcessExt, System, SystemExt};
use sysinfo::System;

pub fn ensure_steam_stopped() {
#[cfg(target_os = "windows")]
Expand Down
1 change: 0 additions & 1 deletion src/steam/utils.rs
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,6 @@ pub fn get_shortcuts_paths(settings: &SteamSettings) -> eyre::Result<Vec<SteamUs
));
}

if !user_data_path.exists() {}
let user_folders = std::fs::read_dir(&user_data_path)?;
let users_info = user_folders
.filter_map(|f| f.ok())
Expand Down
2 changes: 1 addition & 1 deletion src/steamgriddb/cached_search.rs
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ impl<'a> CachedSearch<'a> {
}
println!("Searching for {}", query.as_ref());
let search = self.client.search(query.as_ref()).await?;
let first_id = search.get(0).map(|f| f.id);
let first_id = search.first().map(|f| f.id);
match first_id {
Some(assumed_id) => {
self.search_map.insert(app_id, (query.into(), assumed_id));
Expand Down
10 changes: 0 additions & 10 deletions src/steamgriddb/image_type.rs
Original file line number Diff line number Diff line change
Expand Up @@ -22,16 +22,6 @@ impl ImageType {
&ALL_TYPES
}

pub fn ratio(&self) -> f32{
match self {
ImageType::Hero => 0.3,
ImageType::Grid => 1.6,
ImageType::WideGrid => 0.5,
ImageType::Logo => 0.2,
ImageType::BigPicture => 0.5,
ImageType::Icon => 1.0,
}
}

pub fn name(&self) -> &str {
match self {
Expand Down
186 changes: 0 additions & 186 deletions src/ui/components/game_image_button.rs

This file was deleted.

4 changes: 1 addition & 3 deletions src/ui/components/mod.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
mod steam_user_select;
mod game_image_button;

pub use steam_user_select::render_user_select;
pub use game_image_button::GameButton;
pub use steam_user_select::render_user_select;
2 changes: 1 addition & 1 deletion src/ui/components/steam_user_select.rs
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,6 @@ pub fn render_user_select<'a>(
None
}
} else {
return steam_users.get(0);
return steam_users.first();
}
}
Loading
Loading