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. #443

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft
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
2,801 changes: 1,403 additions & 1,398 deletions Cargo.lock

Large diffs are not rendered by default.

36 changes: 18 additions & 18 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,68 +5,68 @@ version = "1.9.6"

[dependencies]
base64 = "^0.22.1"
config = "^0.14.1"
config = "^0.15.8"
copypasta = "^0.10.1"
flate2 = "^1.0.34"
flate2 = "^1.0.35"
is_executable = "^1.0.4"
nom = "^7.1.1"
rusty-leveldb = "^3.0.0"
serde_json = "^1.0.132"
nom = "^8.0.0"
rusty-leveldb = "^3.0.2"
serde_json = "^1.0.138"

steam_shortcuts_util = "^1.1.8"
steamgriddb_api = "^0.3.1"
sysinfo = "^0.32.0"
sysinfo = "^0.33.1"
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"] }
dyn-clone = "^1.0.18"
time = {version="^0.3.37", features = ["formatting"]}
egui_extras = { version = "0.31.0", features = ["all_loaders"] }

[dependencies.dashmap]
features = ["serde"]
version = "^6.1.0"

[dependencies.eframe]
version = "^0.29.1"
version = "^0.31.0"

[dependencies.egui]
version = "^0.29.1"
version = "^0.31.0"

[dependencies.futures]
version = "^0.3.31"

[dependencies.image]
features = ["png","webp","jpeg"]
version ="^0.25.4"
version ="^0.25.5"
#git = "https://github.com/PhilipK/image"
#rev = "55a668409b28fedcd6cd3dea25ae1b3cc9d25ec5"

[dependencies.reqwest]
default-features = false
version = "^0.12.8"
version = "^0.12.12"
features = ["json","rustls-tls"]

[dependencies.serde]
features = ["derive"]
version = "^1.0.213"
version = "^1.0.217"

[dependencies.tokio]
features = ["full"]
version = "^1.41.0"
version = "^1.43.0"

[dependencies.toml]
version = "^0.8.19"
version = "^0.8.20"
[target."cfg(windows)"]
[target."cfg(windows)".build-dependencies]
winres = "^0.1.12"

[target."cfg(windows)".dependencies]
winreg = "^0.52.0"
winreg = "^0.55.0"
sqlite = "^0.36.1"
roxmltree = "^0.20.0"

[target.'cfg(not(windows))'.dependencies]
wayland-cursor = "0.31.7"
wayland-cursor = "0.31.8"

[features]
# This feature is enabled when building for a flatpak environment
Expand Down
3 changes: 2 additions & 1 deletion src/platforms/itch/butler_db_parser.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
use nom::{
bytes::complete::{tag, take_until},
multi::many0,
Parser,
IResult,
};

Expand All @@ -18,7 +19,7 @@ struct Candidate {
}

pub(crate) fn parse_butler_db(content: &[u8]) -> nom::IResult<&[u8], Vec<DbPaths>> {
many0(parse_path)(content)
many0(parse_path).parse(content)
}

fn parse_path(i: &[u8]) -> nom::IResult<&[u8], DbPaths> {
Expand Down
7 changes: 4 additions & 3 deletions src/platforms/playnite/playnite_parser.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,10 @@ use nom::{
complete::{tag, take_until, take_while},
streaming::take,
},
character::is_alphanumeric,
multi::many0,
IResult,
AsChar,
Parser,
};

pub(crate) struct NamesAndId {
Expand All @@ -15,7 +16,7 @@ pub(crate) struct NamesAndId {
}

pub(crate) fn parse_db(content: &[u8]) -> nom::IResult<&[u8], Vec<NamesAndId>> {
many0(parse_game)(content)
many0(parse_game).parse(content)
}

fn parse_game(i: &[u8]) -> nom::IResult<&[u8], NamesAndId> {
Expand All @@ -33,7 +34,7 @@ fn parse_game(i: &[u8]) -> nom::IResult<&[u8], NamesAndId> {
let (i, _taken) = take_until("InstallSizeGroup")(i)?;
let (i, _taken) = take_until("Name")(i)?;
let (i, _taken) = take(4usize)(i)?;
let (i, _taken) = take_while(|b| !is_alphanumeric(b))(i)?;
let (i, _taken) = take_while(|b: u8| !b.is_alphanum())(i)?;
let (i, name_bytes) = take_while(|b| b != 0)(i)?;
let name = String::from_utf8_lossy(name_bytes).to_string();
IResult::Ok((
Expand Down
3 changes: 2 additions & 1 deletion src/steam/collections.rs
Original file line number Diff line number Diff line change
Expand Up @@ -117,9 +117,10 @@ pub fn write_collections<S: AsRef<str>>(

let mut db = open_db()?;

let mut write_batch = WriteBatch::default();

let current_categories = get_categories(steam_user_id, &mut db)?;
//this is a collection of collections, known as a category
let mut write_batch = WriteBatch::new();

for (category_key, mut collections) in current_categories {
collections.retain(|(_key, collection)| !collection.is_boilr_collection());
Expand Down
2 changes: 1 addition & 1 deletion src/steamgriddb/downloader.rs
Original file line number Diff line number Diff line change
Expand Up @@ -391,7 +391,7 @@ async fn get_steam_image_url(game_id: usize, image_type: &ImageType) -> Option<S
if let (Some(Some(Some(steam_app_id))), Some(Some(Some(Some(mtime))))) =
(game_id, mtime)
{
return Some(image_type.steam_url(steam_app_id.to_string(), mtime?));
return Some(image_type.steam_url(steam_app_id, mtime?));
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/ui/defines.rs
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ pub mod ui_colors {
pub const BG_STROKE_COLOR: Color32 = Color32::from_rgb(32, 60, 86);
pub const LIGHT_ORANGE: Color32 = Color32::from_rgb(255, 212, 163);
pub const ORANGE: Color32 = Color32::from_rgb(255, 170, 94);
pub const PURLPLE: Color32 = Color32::from_rgb(84, 78, 104);
pub const PURPLE: Color32 = Color32::from_rgb(84, 78, 104);
}

pub mod ui_images {
Expand Down
18 changes: 9 additions & 9 deletions src/ui/uiapp.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ use std::{collections::HashMap, error::Error, time::Duration};

use eframe::{egui, App, Frame};
use egui::{
ImageButton, Rounding, Stroke, Vec2
ImageButton, CornerRadius, Stroke, Vec2
};
use tokio::{
runtime::Runtime,
Expand All @@ -19,7 +19,7 @@ use crate::{
use super::{
images::ImageSelectState,
ui_colors::{
BACKGROUND_COLOR, BG_STROKE_COLOR, EXTRA_BACKGROUND_COLOR, LIGHT_ORANGE, ORANGE, PURLPLE,
BACKGROUND_COLOR, BG_STROKE_COLOR, EXTRA_BACKGROUND_COLOR, LIGHT_ORANGE, ORANGE, PURPLE,
TEXT_COLOR,
},
ui_images::get_logo_icon,
Expand Down Expand Up @@ -276,13 +276,13 @@ fn create_style(style: &mut egui::Style) {
style.visuals.dark_mode = true;
style.visuals.panel_fill = BACKGROUND_COLOR;
style.visuals.override_text_color = Some(TEXT_COLOR);
style.visuals.widgets.noninteractive.rounding = Rounding {
ne: 0.0,
nw: 0.0,
se: 0.0,
sw: 0.0,
style.visuals.widgets.noninteractive.corner_radius = CornerRadius {
ne: 0,
nw: 0,
se: 0,
sw: 0,
};
style.visuals.faint_bg_color = PURLPLE;
style.visuals.faint_bg_color = PURPLE;
style.visuals.extreme_bg_color = EXTRA_BACKGROUND_COLOR;
style.visuals.widgets.active.bg_fill = BACKGROUND_COLOR;
style.visuals.widgets.active.bg_stroke = Stroke::new(2.0, BG_STROKE_COLOR);
Expand All @@ -299,7 +299,7 @@ fn create_style(style: &mut egui::Style) {
style.visuals.widgets.hovered.bg_fill = BACKGROUND_COLOR;
style.visuals.widgets.hovered.bg_stroke = Stroke::new(2.0, BG_STROKE_COLOR);
style.visuals.widgets.hovered.fg_stroke = Stroke::new(2.0, LIGHT_ORANGE);
style.visuals.selection.bg_fill = PURLPLE;
style.visuals.selection.bg_fill = PURPLE;
}
fn setup(ctx: &egui::Context) {
let mut style: egui::Style = (*ctx.style()).clone();
Expand Down
Loading