Skip to content

Commit d179a89

Browse files
committed
Update all dependencies at once.
Fixed expected u8. Fix typo in color constant name and update rounding to corner radius Refactor write_collections to initialize WriteBatch with default settings Fix incorrect type conversion in get_steam_image_url function Update dependencies to latest versions Update dependencies and refactor nom parser usage in butler_db_parser Fix deprecated function usage. Fix ambiguous closure. Refactor playnite_parser to use Parser trait for improved readability Fix incorrect casing of AsChar import in playnite_parser
1 parent a83f0e7 commit d179a89

File tree

8 files changed

+1440
-1432
lines changed

8 files changed

+1440
-1432
lines changed

Cargo.lock

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

Cargo.toml

+18-18
Original file line numberDiff line numberDiff line change
@@ -5,68 +5,68 @@ version = "1.9.6"
55

66
[dependencies]
77
base64 = "^0.22.1"
8-
config = "^0.14.1"
8+
config = "^0.15.8"
99
copypasta = "^0.10.1"
10-
flate2 = "^1.0.34"
10+
flate2 = "^1.0.35"
1111
is_executable = "^1.0.4"
12-
nom = "^7.1.1"
13-
rusty-leveldb = "^3.0.0"
14-
serde_json = "^1.0.132"
12+
nom = "^8.0.0"
13+
rusty-leveldb = "^3.0.2"
14+
serde_json = "^1.0.138"
1515

1616
steam_shortcuts_util = "^1.1.8"
1717
steamgriddb_api = "^0.3.1"
18-
sysinfo = "^0.32.0"
18+
sysinfo = "^0.33.1"
1919
eyre = "^0.6.12"
2020
color-eyre = "^0.6.3"
21-
dyn-clone = "^1.0.17"
22-
time = {version="^0.3.36", features = ["formatting"]}
23-
egui_extras = { version = "0.29.1", features = ["all_loaders"] }
21+
dyn-clone = "^1.0.18"
22+
time = {version="^0.3.37", features = ["formatting"]}
23+
egui_extras = { version = "0.31.0", features = ["all_loaders"] }
2424

2525
[dependencies.dashmap]
2626
features = ["serde"]
2727
version = "^6.1.0"
2828

2929
[dependencies.eframe]
30-
version = "^0.29.1"
30+
version = "^0.31.0"
3131

3232
[dependencies.egui]
33-
version = "^0.29.1"
33+
version = "^0.31.0"
3434

3535
[dependencies.futures]
3636
version = "^0.3.31"
3737

3838
[dependencies.image]
3939
features = ["png","webp","jpeg"]
40-
version ="^0.25.4"
40+
version ="^0.25.5"
4141
#git = "https://github.com/PhilipK/image"
4242
#rev = "55a668409b28fedcd6cd3dea25ae1b3cc9d25ec5"
4343

4444
[dependencies.reqwest]
4545
default-features = false
46-
version = "^0.12.8"
46+
version = "^0.12.12"
4747
features = ["json","rustls-tls"]
4848

4949
[dependencies.serde]
5050
features = ["derive"]
51-
version = "^1.0.213"
51+
version = "^1.0.217"
5252

5353
[dependencies.tokio]
5454
features = ["full"]
55-
version = "^1.41.0"
55+
version = "^1.43.0"
5656

5757
[dependencies.toml]
58-
version = "^0.8.19"
58+
version = "^0.8.20"
5959
[target."cfg(windows)"]
6060
[target."cfg(windows)".build-dependencies]
6161
winres = "^0.1.12"
6262

6363
[target."cfg(windows)".dependencies]
64-
winreg = "^0.52.0"
64+
winreg = "^0.55.0"
6565
sqlite = "^0.36.1"
6666
roxmltree = "^0.20.0"
6767

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

7171
[features]
7272
# This feature is enabled when building for a flatpak environment

src/platforms/itch/butler_db_parser.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
use nom::{
22
bytes::complete::{tag, take_until},
33
multi::many0,
4+
Parser,
45
IResult,
56
};
67

@@ -18,7 +19,7 @@ struct Candidate {
1819
}
1920

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

2425
fn parse_path(i: &[u8]) -> nom::IResult<&[u8], DbPaths> {

src/platforms/playnite/playnite_parser.rs

+4-3
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,10 @@ use nom::{
33
complete::{tag, take_until, take_while},
44
streaming::take,
55
},
6-
character::is_alphanumeric,
76
multi::many0,
87
IResult,
8+
AsChar,
9+
Parser,
910
};
1011

1112
pub(crate) struct NamesAndId {
@@ -15,7 +16,7 @@ pub(crate) struct NamesAndId {
1516
}
1617

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

2122
fn parse_game(i: &[u8]) -> nom::IResult<&[u8], NamesAndId> {
@@ -33,7 +34,7 @@ fn parse_game(i: &[u8]) -> nom::IResult<&[u8], NamesAndId> {
3334
let (i, _taken) = take_until("InstallSizeGroup")(i)?;
3435
let (i, _taken) = take_until("Name")(i)?;
3536
let (i, _taken) = take(4usize)(i)?;
36-
let (i, _taken) = take_while(|b| !is_alphanumeric(b))(i)?;
37+
let (i, _taken) = take_while(|b: u8| !b.is_alphanum())(i)?;
3738
let (i, name_bytes) = take_while(|b| b != 0)(i)?;
3839
let name = String::from_utf8_lossy(name_bytes).to_string();
3940
IResult::Ok((

src/steam/collections.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -117,9 +117,10 @@ pub fn write_collections<S: AsRef<str>>(
117117

118118
let mut db = open_db()?;
119119

120+
let mut write_batch = WriteBatch::default();
121+
120122
let current_categories = get_categories(steam_user_id, &mut db)?;
121123
//this is a collection of collections, known as a category
122-
let mut write_batch = WriteBatch::new();
123124

124125
for (category_key, mut collections) in current_categories {
125126
collections.retain(|(_key, collection)| !collection.is_boilr_collection());

src/steamgriddb/downloader.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -391,7 +391,7 @@ async fn get_steam_image_url(game_id: usize, image_type: &ImageType) -> Option<S
391391
if let (Some(Some(Some(steam_app_id))), Some(Some(Some(Some(mtime))))) =
392392
(game_id, mtime)
393393
{
394-
return Some(image_type.steam_url(steam_app_id.to_string(), mtime?));
394+
return Some(image_type.steam_url(steam_app_id, mtime?));
395395
}
396396
}
397397
}

src/ui/defines.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ pub mod ui_colors {
77
pub const BG_STROKE_COLOR: Color32 = Color32::from_rgb(32, 60, 86);
88
pub const LIGHT_ORANGE: Color32 = Color32::from_rgb(255, 212, 163);
99
pub const ORANGE: Color32 = Color32::from_rgb(255, 170, 94);
10-
pub const PURLPLE: Color32 = Color32::from_rgb(84, 78, 104);
10+
pub const PURPLE: Color32 = Color32::from_rgb(84, 78, 104);
1111
}
1212

1313
pub mod ui_images {

src/ui/uiapp.rs

+9-9
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ use std::{collections::HashMap, error::Error, time::Duration};
22

33
use eframe::{egui, App, Frame};
44
use egui::{
5-
ImageButton, Rounding, Stroke, Vec2
5+
ImageButton, CornerRadius, Stroke, Vec2
66
};
77
use tokio::{
88
runtime::Runtime,
@@ -19,7 +19,7 @@ use crate::{
1919
use super::{
2020
images::ImageSelectState,
2121
ui_colors::{
22-
BACKGROUND_COLOR, BG_STROKE_COLOR, EXTRA_BACKGROUND_COLOR, LIGHT_ORANGE, ORANGE, PURLPLE,
22+
BACKGROUND_COLOR, BG_STROKE_COLOR, EXTRA_BACKGROUND_COLOR, LIGHT_ORANGE, ORANGE, PURPLE,
2323
TEXT_COLOR,
2424
},
2525
ui_images::get_logo_icon,
@@ -276,13 +276,13 @@ fn create_style(style: &mut egui::Style) {
276276
style.visuals.dark_mode = true;
277277
style.visuals.panel_fill = BACKGROUND_COLOR;
278278
style.visuals.override_text_color = Some(TEXT_COLOR);
279-
style.visuals.widgets.noninteractive.rounding = Rounding {
280-
ne: 0.0,
281-
nw: 0.0,
282-
se: 0.0,
283-
sw: 0.0,
279+
style.visuals.widgets.noninteractive.corner_radius = CornerRadius {
280+
ne: 0,
281+
nw: 0,
282+
se: 0,
283+
sw: 0,
284284
};
285-
style.visuals.faint_bg_color = PURLPLE;
285+
style.visuals.faint_bg_color = PURPLE;
286286
style.visuals.extreme_bg_color = EXTRA_BACKGROUND_COLOR;
287287
style.visuals.widgets.active.bg_fill = BACKGROUND_COLOR;
288288
style.visuals.widgets.active.bg_stroke = Stroke::new(2.0, BG_STROKE_COLOR);
@@ -299,7 +299,7 @@ fn create_style(style: &mut egui::Style) {
299299
style.visuals.widgets.hovered.bg_fill = BACKGROUND_COLOR;
300300
style.visuals.widgets.hovered.bg_stroke = Stroke::new(2.0, BG_STROKE_COLOR);
301301
style.visuals.widgets.hovered.fg_stroke = Stroke::new(2.0, LIGHT_ORANGE);
302-
style.visuals.selection.bg_fill = PURLPLE;
302+
style.visuals.selection.bg_fill = PURPLE;
303303
}
304304
fn setup(ctx: &egui::Context) {
305305
let mut style: egui::Style = (*ctx.style()).clone();

0 commit comments

Comments
 (0)