Update all dependencies (#208)

This commit is contained in:
Philip Kristoffersen
2022-08-21 16:07:57 +02:00
committed by GitHub
parent 05cd76d552
commit 97f706a2be
9 changed files with 508 additions and 283 deletions
Generated
+469 -249
View File
File diff suppressed because it is too large Load Diff
+8 -8
View File
@@ -5,31 +5,31 @@ version = "1.4.4"
[dependencies] [dependencies]
base64 = "^0.13.0" base64 = "^0.13.0"
chrono = "^0.4.19" chrono = "^0.4.22"
config = "^0.13.2" config = "^0.13.2"
copypasta = "^0.8.1" copypasta = "^0.8.1"
flate2 = "^1.0.24" flate2 = "^1.0.24"
is_executable = "^1.0.1" is_executable = "^1.0.1"
nom = "^7.1.1" nom = "^7.1.1"
rusty-leveldb = "^1.0.3" rusty-leveldb = "^1.0.4"
serde_json = "^1.0.83" serde_json = "^1.0.83"
sqlite = "^0.27.0" sqlite = "^0.27.0"
steam_shortcuts_util = "^1.1.8" steam_shortcuts_util = "^1.1.8"
steamgriddb_api = "^0.3.0" steamgriddb_api = "^0.3.1"
sysinfo = "^0.25.1" sysinfo = "^0.25.2"
[dependencies.dashmap] [dependencies.dashmap]
features = ["serde"] features = ["serde"]
version = "^5.3.4" version = "^5.3.4"
[dependencies.eframe] [dependencies.eframe]
version = "^0.18.0" version = "^0.19.0"
[dependencies.egui] [dependencies.egui]
version = "^0.18.1" version = "^0.19.0"
[dependencies.futures] [dependencies.futures]
version = "^0.3.21" version = "^0.3.23"
[dependencies.image] [dependencies.image]
features = ["png"] features = ["png"]
@@ -41,7 +41,7 @@ version = "^0.11.11"
[dependencies.serde] [dependencies.serde]
features = ["derive"] features = ["derive"]
version = "^1.0.142" version = "^1.0.144"
[dependencies.tokio] [dependencies.tokio]
features = ["full"] features = ["full"]
+2 -4
View File
@@ -16,18 +16,16 @@ mod steamgriddb;
mod sync; mod sync;
mod ui; mod ui;
mod uplay; mod uplay;
use std::error::Error;
fn main() -> Result<(), Box<dyn Error>> { fn main(){
ensure_config_folder(); ensure_config_folder();
migration::migrate_config(); migration::migrate_config();
let args: Vec<String> = std::env::args().collect(); let args: Vec<String> = std::env::args().collect();
if args.contains(&"--no-ui".to_string()) { if args.contains(&"--no-ui".to_string()) {
ui::run_sync(); ui::run_sync();
Ok(())
} else { } else {
ui::run_ui(args) ui::run_ui(args);
} }
} }
+1 -1
View File
@@ -41,7 +41,7 @@ impl MyEguiApp {
ui.label("No backups found, they will be created every time you run import"); ui.label("No backups found, they will be created every time you run import");
} else { } else {
ScrollArea::vertical() ScrollArea::vertical()
.stick_to_right() .stick_to_right(true)
.auto_shrink([false, true]) .auto_shrink([false, true])
.show(ui, |ui| { .show(ui, |ui| {
for backup_path in available_backups { for backup_path in available_backups {
+1 -1
View File
@@ -47,7 +47,7 @@ impl MyEguiApp {
let mut redraw = 0; let mut redraw = 0;
set_scroll_style(ui); set_scroll_style(ui);
ScrollArea::vertical() ScrollArea::vertical()
.stick_to_right() .stick_to_right(true)
.auto_shrink([false, true]) .auto_shrink([false, true])
.show(ui, |ui| { .show(ui, |ui| {
ui.reset_style(); ui.reset_style();
+17 -10
View File
@@ -264,7 +264,11 @@ impl MyEguiApp {
//Need to load //Need to load
let image_data = load_image_from_path(&image.thumbnail_path); let image_data = load_image_from_path(&image.thumbnail_path);
if let Some(image_data) = image_data { if let Some(image_data) = image_data {
let handle = ui.ctx().load_texture(&image_key, image_data); let handle = ui.ctx().load_texture(
&image_key,
image_data,
egui::TextureFilter::Linear,
);
*state.value_mut() = TextureState::Loaded(handle); *state.value_mut() = TextureState::Loaded(handle);
} }
ui.ctx().request_repaint(); ui.ctx().request_repaint();
@@ -327,17 +331,16 @@ impl MyEguiApp {
} }
fn ensure_steam_users_loaded(&mut self) { fn ensure_steam_users_loaded(&mut self) {
if self.image_selected_state.settings_error.is_none() && self.image_selected_state.steam_users.is_none() { if self.image_selected_state.settings_error.is_none()
&& self.image_selected_state.steam_users.is_none()
{
let paths = get_shortcuts_paths(&self.settings.steam); let paths = get_shortcuts_paths(&self.settings.steam);
match paths { match paths {
Ok(paths) => { Ok(paths) => self.image_selected_state.steam_users = Some(paths),
self.image_selected_state.steam_users = Some(paths)
},
Err(err) => { Err(err) => {
self.image_selected_state.settings_error = Some(format!("Could not find user steam location, error message: {} , try to clear the steam location field in settings to let BoilR find it itself",err)); self.image_selected_state.settings_error = Some(format!("Could not find user steam location, error message: {} , try to clear the steam location field in settings to let BoilR find it itself",err));
},
} }
}
} }
} }
@@ -352,7 +355,7 @@ impl MyEguiApp {
let mut action = UserAction::NoAction; let mut action = UserAction::NoAction;
ScrollArea::vertical() ScrollArea::vertical()
.stick_to_right() .stick_to_right(true)
.auto_shrink([false, true]) .auto_shrink([false, true])
.show(ui, |ui| { .show(ui, |ui| {
ui.reset_style(); ui.reset_style();
@@ -479,7 +482,9 @@ impl MyEguiApp {
if !loaded && path.exists() { if !loaded && path.exists() {
let image = load_image_from_path(&path); let image = load_image_from_path(&path);
if let Some(image) = image { if let Some(image) = image {
let texture = ui.ctx().load_texture(&key, image); let texture = ui
.ctx()
.load_texture(&key, image, egui::TextureFilter::Linear);
state state
.image_handles .image_handles
.insert(key, TextureState::Loaded(texture)); .insert(key, TextureState::Loaded(texture));
@@ -603,7 +608,9 @@ impl MyEguiApp {
let (path, key) = shortcut.key(image_type, Path::new(&user.steam_user_data_folder)); let (path, key) = shortcut.key(image_type, Path::new(&user.steam_user_data_folder));
let image = load_image_from_path(&path); let image = load_image_from_path(&path);
if let Some(image) = image { if let Some(image) = image {
let texture = ui.ctx().load_texture(&key, image); let texture = ui
.ctx()
.load_texture(&key, image, egui::TextureFilter::Linear);
state state
.image_handles .image_handles
.insert(key, TextureState::Loaded(texture)); .insert(key, TextureState::Loaded(texture));
+1 -1
View File
@@ -55,7 +55,7 @@ impl MyEguiApp {
scroll_style.visuals.widgets.hovered.bg_fill = EXTRA_BACKGROUND_COLOR; scroll_style.visuals.widgets.hovered.bg_fill = EXTRA_BACKGROUND_COLOR;
ScrollArea::vertical() ScrollArea::vertical()
.stick_to_right() .stick_to_right(true)
.auto_shrink([false,true]) .auto_shrink([false,true])
.show(ui,|ui| { .show(ui,|ui| {
ui.reset_style(); ui.reset_style();
+1 -1
View File
@@ -23,7 +23,7 @@ impl MyEguiApp {
scroll_style.visuals.widgets.hovered.bg_fill = EXTRA_BACKGROUND_COLOR; scroll_style.visuals.widgets.hovered.bg_fill = EXTRA_BACKGROUND_COLOR;
ScrollArea::vertical() ScrollArea::vertical()
.stick_to_right() .stick_to_right(true)
.auto_shrink([false, true]) .auto_shrink([false, true])
.show(ui, |ui| { .show(ui, |ui| {
ui.reset_style(); ui.reset_style();
+4 -4
View File
@@ -243,21 +243,21 @@ impl MyEguiApp {
fn get_import_image(&mut self, ui: &mut egui::Ui) -> &mut TextureHandle { fn get_import_image(&mut self, ui: &mut egui::Ui) -> &mut TextureHandle {
self.ui_images.import_button.get_or_insert_with(|| { self.ui_images.import_button.get_or_insert_with(|| {
// Load the texture only once. // Load the texture only once.
ui.ctx().load_texture("import_image", get_import_image()) ui.ctx().load_texture("import_image", get_import_image(),egui::TextureFilter::Linear)
}) })
} }
fn get_save_image(&mut self, ui: &mut egui::Ui) -> &mut TextureHandle { fn get_save_image(&mut self, ui: &mut egui::Ui) -> &mut TextureHandle {
self.ui_images.save_button.get_or_insert_with(|| { self.ui_images.save_button.get_or_insert_with(|| {
// Load the texture only once. // Load the texture only once.
ui.ctx().load_texture("save_image", get_save_image()) ui.ctx().load_texture("save_image", get_save_image(),egui::TextureFilter::Linear)
}) })
} }
fn get_logo_image(&mut self, ui: &mut egui::Ui) -> &mut TextureHandle { fn get_logo_image(&mut self, ui: &mut egui::Ui) -> &mut TextureHandle {
self.ui_images.logo_32.get_or_insert_with(|| { self.ui_images.logo_32.get_or_insert_with(|| {
// Load the texture only once. // Load the texture only once.
ui.ctx().load_texture("logo32", get_logo()) ui.ctx().load_texture("logo32", get_logo(),egui::TextureFilter::Linear)
}) })
} }
} }
@@ -275,7 +275,7 @@ pub fn run_sync() {
app.run_sync(true); app.run_sync(true);
} }
pub fn run_ui(args: Vec<String>) -> Result<(), Box<dyn Error>> { pub fn run_ui(args: Vec<String>){
let app = MyEguiApp::new(); let app = MyEguiApp::new();
let no_v_sync = args.contains(&"--no-vsync".to_string()); let no_v_sync = args.contains(&"--no-vsync".to_string());
let native_options = eframe::NativeOptions { let native_options = eframe::NativeOptions {