djib/BoilR
1
0
Fork 0
mirror of https://github.com/djibux/BoilR.git synced 2026-09-01 05:53:41 +02:00
Code Issues Packages Projects Releases Wiki Activity

Update dependencies (#282)

Browse Source
This commit is contained in:
Philip Kristoffersen
2022-12-26 14:58:31 +01:00
committed by GitHub
parent 8d3c27c822
commit e76c84b130
8 changed files with 938 additions and 678 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/workflows/main.yml
+13 -13
View File
@@ -50,17 +50,17 @@ jobs:
uses: Swatinem/rust-cache@v2 uses: Swatinem/rust-cache@v2
- name: Test - name: Test
run: cargo test run: cargo test
test_Macos: # test_Macos:
runs-on: macos-latest # runs-on: macos-latest
steps: # steps:
- uses: actions/checkout@v3 # - uses: actions/checkout@v3
- name: Install latest stable # - name: Install latest stable
uses: actions-rs/toolchain@v1 # uses: actions-rs/toolchain@v1
with: # with:
toolchain: stable # toolchain: stable
- name: Rust Cache # - name: Rust Cache
id: rust_cache # id: rust_cache
uses: Swatinem/rust-cache@v2 # uses: Swatinem/rust-cache@v2
- name: Test # - name: Test
run: cargo test # run: cargo test
.github/workflows/release_on_v_tag.yml
+11 -11
View File
@@ -40,17 +40,17 @@ jobs:
asset_name: windows_BoilR.exe asset_name: windows_BoilR.exe
args: -9 args: -9
strip: false strip: false
- os: macos-latest #- os: macos-latest
file: target/release/boilr # file: target/release/boilr
asset_name: macos_x86_64_BoilR # asset_name: macos_x86_64_BoilR
args: -9 # args: -9
strip: false # strip: false
- os: macos-latest #- os: macos-latest
file: target/aarch64-apple-darwin/release/boilr # file: target/aarch64-apple-darwin/release/boilr
asset_name: macos_darwin_BoilR # asset_name: macos_darwin_BoilR
args: -9 # args: -9
strip: false # strip: false
target: aarch64-apple-darwin # target: aarch64-apple-darwin
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v3
- name: Install dependencies - name: Install dependencies
Cargo.lock
Generated
+877 -622
View File
File diff suppressed because it is too large Load Diff
Cargo.toml
+21 -20
View File
@@ -1,61 +1,62 @@
[package] [package]
edition = "2021" edition = "2021"
name = "boilr" name = "boilr"
version = "1.7.6" version = "1.7.8"
[dependencies] [dependencies]
base64 = "^0.13.0" base64 = "^0.20.0"
chrono = "^0.4.22" chrono = "^0.4.23"
config = "^0.13.2" config = "^0.13.3"
copypasta = "^0.8.1" copypasta = "^0.8.1"
flate2 = "^1.0.24" flate2 = "^1.0.25"
is_executable = "^1.0.1" is_executable = "^1.0.1"
nom = "^7.1.1" nom = "^7.1.1"
rusty-leveldb = "^1.0.4" rusty-leveldb = "^1.0.4"
serde_json = "^1.0.83" serde_json = "^1.0.91"
steam_shortcuts_util = "^1.1.8" steam_shortcuts_util = "^1.1.8"
steamgriddb_api = "^0.3.1" steamgriddb_api = "^0.3.1"
sysinfo = "^0.26.4" sysinfo = "^0.27.1"
eyre = "^0.6.8" eyre = "^0.6.8"
color-eyre = "^0.6" color-eyre = "^0.6.2"
dyn-clone = "^1.0.9" dyn-clone = "^1.0.10"
[dependencies.sqlite] [dependencies.sqlite]
version = "^0.27.0" version = "^0.30.3"
[dependencies.dashmap] [dependencies.dashmap]
features = ["serde"] features = ["serde"]
version = "^5.3.4" version = "^5.4.0"
[dependencies.eframe] [dependencies.eframe]
version = "^0.19.0" version = "^0.20.1"
[dependencies.egui] [dependencies.egui]
version = "^0.19.0" version = "^0.20.1"
[dependencies.futures] [dependencies.futures]
version = "^0.3.23" version = "^0.3.25"
[dependencies.image] [dependencies.image]
features = ["png","webp","jpeg"] features = ["png","webp","jpeg"]
git = "https://github.com/PhilipK/image" version ="^0.24.5"
rev = "55a668409b28fedcd6cd3dea25ae1b3cc9d25ec5" #git = "https://github.com/PhilipK/image"
#rev = "55a668409b28fedcd6cd3dea25ae1b3cc9d25ec5"
[dependencies.reqwest] [dependencies.reqwest]
default_features = false default_features = false
version = "^0.11.11" version = "^0.11.13"
[dependencies.serde] [dependencies.serde]
features = ["derive"] features = ["derive"]
version = "^1.0.144" version = "^1.0.151"
[dependencies.tokio] [dependencies.tokio]
features = ["full"] features = ["full"]
version = "^1.20.1" version = "^1.23.0"
[dependencies.toml] [dependencies.toml]
version = "^0.5.9" version = "^0.5.10"
[target] [target]
[target."cfg(windows)"] [target."cfg(windows)"]
src/platforms/amazon/amazon_platform.rs
+2 -2
View File
@@ -90,8 +90,8 @@ impl AmazonPlatform {
let mut statement = let mut statement =
connection.prepare("SELECT Id, ProductTitle FROM DbSet WHERE Installed = 1")?; connection.prepare("SELECT Id, ProductTitle FROM DbSet WHERE Installed = 1")?;
while let State::Row = statement.next().unwrap() { while let State::Row = statement.next().unwrap() {
let id = statement.read::<String>(0); let id = statement.read::<String,usize>(0);
let title = statement.read::<String>(1); let title = statement.read::<String,usize>(1);
if let (Ok(id), Ok(title)) = (id, title) { if let (Ok(id), Ok(title)) = (id, title) {
result.push(AmazonGame { result.push(AmazonGame {
title, title,
src/steam/collections.rs
+7 -4
View File
@@ -330,10 +330,13 @@ fn serialize_collection_value<S: AsRef<str>>(name: S, game_ids: &[usize]) -> Str
} }
fn name_to_key<S: AsRef<str>>(name: S) -> String { fn name_to_key<S: AsRef<str>>(name: S) -> String {
let config = base64::Config::new(base64::CharacterSet::Standard, false); let base64 = base64::encode(name.as_ref());
let base64 = base64::encode_config(name.as_ref(), config); let base64_no_end = if base64.ends_with("==") {
let key = format!("{}-{}", BOILR_TAG, base64); &base64[..base64.len() - 2]
key } else {
&base64
};
format!("{}-{}", BOILR_TAG, base64_no_end)
} }
fn parse_steam_collections<S: AsRef<str>>( fn parse_steam_collections<S: AsRef<str>>(
src/ui/ui_image_download.rs
+3 -3
View File
@@ -348,7 +348,7 @@ impl MyEguiApp {
let handle = ui.ctx().load_texture( let handle = ui.ctx().load_texture(
&image_key, &image_key,
image_data, image_data,
egui::TextureFilter::Linear, egui::TextureOptions::LINEAR,
); );
*state.value_mut() = *state.value_mut() =
TextureState::Loaded(handle); TextureState::Loaded(handle);
@@ -750,7 +750,7 @@ impl MyEguiApp {
if let Ok(image) = image { if let Ok(image) = image {
let texture = ui let texture = ui
.ctx() .ctx()
.load_texture(&key, image, egui::TextureFilter::Linear); .load_texture(&key, image, egui::TextureOptions::LINEAR);
state state
.image_handles .image_handles
.insert(key, TextureState::Loaded(texture)); .insert(key, TextureState::Loaded(texture));
@@ -791,7 +791,7 @@ fn load_image_grids(user: &SteamUsersInfo, state: &mut ImageSelectState, ui: &mu
if let Ok(image) = image { if let Ok(image) = image {
let texture = ui let texture = ui
.ctx() .ctx()
.load_texture(&key, image, egui::TextureFilter::Linear); .load_texture(&key, image, egui::TextureOptions::LINEAR);
state state
.image_handles .image_handles
.insert(key, TextureState::Loaded(texture)); .insert(key, TextureState::Loaded(texture));
src/ui/uiapp.rs
+4 -3
View File
@@ -273,6 +273,7 @@ fn create_style(style: &mut egui::Style) {
style.spacing.item_spacing = egui::vec2(15.0, 15.0); style.spacing.item_spacing = egui::vec2(15.0, 15.0);
style.visuals.button_frame = false; style.visuals.button_frame = false;
style.visuals.dark_mode = true; style.visuals.dark_mode = true;
style.visuals.panel_fill = BACKGROUND_COLOR;
style.visuals.override_text_color = Some(TEXT_COLOR); style.visuals.override_text_color = Some(TEXT_COLOR);
style.visuals.widgets.noninteractive.rounding = Rounding { style.visuals.widgets.noninteractive.rounding = Rounding {
ne: 0.0, ne: 0.0,
@@ -307,7 +308,7 @@ impl MyEguiApp {
ui.ctx().load_texture( ui.ctx().load_texture(
"import_image", "import_image",
get_import_image(), get_import_image(),
egui::TextureFilter::Linear, egui::TextureOptions::LINEAR,
) )
}) })
} }
@@ -316,7 +317,7 @@ impl MyEguiApp {
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() ui.ctx()
.load_texture("save_image", get_save_image(), egui::TextureFilter::Linear) .load_texture("save_image", get_save_image(), egui::TextureOptions::LINEAR)
}) })
} }
@@ -324,7 +325,7 @@ impl MyEguiApp {
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() ui.ctx()
.load_texture("logo32", get_logo(), egui::TextureFilter::Linear) .load_texture("logo32", get_logo(), egui::TextureOptions::LINEAR)
}) })
} }
} }