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

UI image selection (#97)

Browse Source
This commit is contained in:
Philip Kristoffersen
2022-04-23 20:33:16 +02:00
committed by GitHub
parent 91782b74eb
commit e77f2b5f31
49 changed files with 1368 additions and 801 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/steamgriddb/cached_search.rs
+7
View File
@@ -20,6 +20,13 @@ impl<'a> CachedSearch<'a> {
save_search_map(&self.search_map);
}
pub fn set_cache<S>(&mut self, app_id: u32, name:S, new_grid_id:usize)
where
S: Into<String>{
self.search_map.insert(app_id,(name.into(),new_grid_id));
self.save();
}
pub async fn search<S>(
&self,
app_id: u32,
src/steamgriddb/downloader.rs
+37 -33
View File
@@ -5,9 +5,9 @@ use std::{collections::HashMap, path::Path};
use futures::{stream, StreamExt};
use serde::{Deserialize, Serialize};
use tokio::sync::watch::Sender;
use std::error::Error;
use steamgriddb_api::query_parameters::{GridDimentions, Nsfw}; // 0.3.1
use steamgriddb_api::query_parameters::{GridDimentions, Nsfw};
use tokio::sync::watch::Sender; // 0.3.1
use steam_shortcuts_util::shortcut::ShortcutOwned;
use steamgriddb_api::Client;
@@ -25,7 +25,7 @@ pub async fn download_images_for_users<'b>(
settings: &Settings,
users: &[SteamUsersInfo],
download_animated: bool,
sender:&mut Option<Sender<SyncProgress>>
sender: &mut Option<Sender<SyncProgress>>,
) {
let auth_key = &settings.steamgrid_db.auth_key;
if let Some(auth_key) = auth_key {
@@ -35,7 +35,7 @@ pub async fn download_images_for_users<'b>(
let search = CachedSearch::new(&client);
let search = &search;
let client = &client;
if let Some(sender) = sender{
if let Some(sender) = sender {
let _ = sender.send(SyncProgress::FindingImages);
}
let to_downloads = stream::iter(users)
@@ -62,7 +62,7 @@ pub async fn download_images_for_users<'b>(
let to_downloads = to_downloads.iter().flatten().collect::<Vec<&ToDownload>>();
let total = to_downloads.len();
if !to_downloads.is_empty() {
if let Some(sender) = sender{
if let Some(sender) = sender {
let _ = sender.send(SyncProgress::DownloadingImages { to_download: total });
}
search.save();
@@ -82,7 +82,7 @@ pub async fn download_images_for_users<'b>(
}
} else {
println!("Steamgrid DB Auth Key not found, please add one as described here: https://github.com/PhilipK/steam_shortcuts_sync#configuration");
}
}
}
#[derive(Serialize, Deserialize, Debug, Clone)]
@@ -183,7 +183,7 @@ async fn search_for_images_to_download(
let shortcuts: Vec<&ShortcutOwned> = images_needed.collect();
if let ImageType::Icon = image_type {
for (index,image_id) in image_ids.iter().enumerate() {
for (index, image_id) in image_ids.iter().enumerate() {
let shortcut = shortcuts[index];
if let Some(url) = get_steam_icon_url(*image_id).await {
let path = grid_folder.join(image_type.file_name(shortcut.app_id));
@@ -196,9 +196,9 @@ async fn search_for_images_to_download(
}
}
} else {
for image_ids in image_ids.chunks(99){
for image_ids in image_ids.chunks(99) {
let image_search_result =
get_images_for_ids(client, &image_ids, &image_type, download_animated).await;
get_images_for_ids(client, image_ids, &image_type, download_animated).await;
match image_search_result {
Ok(images) => {
let images = images
@@ -239,21 +239,26 @@ async fn get_images_for_ids(
image_ids: &[usize],
image_type: &ImageType,
download_animated: bool,
) -> Result<
Vec<steamgriddb_api::response::SteamGridDbResult<steamgriddb_api::images::Image>>,
String,
> {
use steamgriddb_api::query_parameters::AnimtionType;
use steamgriddb_api::query_parameters::QueryType::*;
) -> Result<Vec<steamgriddb_api::response::SteamGridDbResult<steamgriddb_api::images::Image>>, String>
{
let query_type = get_query_type(download_animated, image_type);
let image_search_result = client.get_images_for_ids(image_ids, &query_type).await;
image_search_result.map_err(|e| format!("Image search failed {:?}", e))
}
const BIG_PICTURE_DIMS : [GridDimentions;2] = [GridDimentions::D920x430, GridDimentions::D460x215];
pub fn get_query_type(download_animated: bool, image_type: &ImageType) -> steamgriddb_api::QueryType {
let anymation_type = if download_animated {
Some(&[AnimtionType::Animated][..])
Some(&[steamgriddb_api::query_parameters::AnimtionType::Animated][..])
} else {
None
};
let big_picture_dims = [GridDimentions::D920x430, GridDimentions::D460x215];
use steamgriddb_api::query_parameters::GridQueryParameters;
let big_picture_parameters = GridQueryParameters {
dimentions: Some(&big_picture_dims),
dimentions: Some(&BIG_PICTURE_DIMS),
types: anymation_type,
nsfw: Some(&Nsfw::False),
..Default::default()
@@ -275,19 +280,15 @@ async fn get_images_for_ids(
nsfw: Some(&Nsfw::False),
..Default::default()
};
let query_type = match image_type {
ImageType::Hero => Hero(Some(hero_parameters)),
ImageType::BigPicture => Grid(Some(big_picture_parameters)),
ImageType::Grid => Grid(Some(grid_parameters)),
ImageType::WideGrid => Grid(Some(big_picture_parameters)),
ImageType::Logo => Logo(Some(logo_parameters)),
ImageType::Hero => steamgriddb_api::QueryType::Hero(Some(hero_parameters)),
ImageType::BigPicture => steamgriddb_api::QueryType::Grid(Some(big_picture_parameters)),
ImageType::Grid => steamgriddb_api::QueryType::Grid(Some(grid_parameters)),
ImageType::WideGrid => steamgriddb_api::QueryType::Grid(Some(big_picture_parameters)),
ImageType::Logo => steamgriddb_api::QueryType::Logo(Some(logo_parameters)),
_ => panic!("Unsupported image type"),
};
let image_search_result = client.get_images_for_ids(image_ids, &query_type).await;
image_search_result.map_err(|e| format!("Image search failed {:?}",e))
query_type
}
async fn get_steam_image_url(game_id: usize, image_type: &ImageType) -> Option<String> {
@@ -345,7 +346,7 @@ fn icon_url(steam_app_id: &str, icon_id: &str) -> String {
)
}
async fn download_to_download(to_download: &ToDownload) -> Result<(), Box<dyn Error>> {
pub async fn download_to_download(to_download: &ToDownload) -> Result<(), Box<dyn Error>> {
println!(
"Downloading {:?} for {} to {:?}",
to_download.image_type, to_download.app_name, to_download.path
@@ -360,8 +361,11 @@ async fn download_to_download(to_download: &ToDownload) -> Result<(), Box<dyn Er
}
pub struct ToDownload {
path: PathBuf,
url: String,
app_name: String,
image_type: ImageType,
pub path: PathBuf,
pub url: String,
pub app_name: String,
pub image_type: ImageType,
}
unsafe impl Send for ToDownload {
}
src/steamgriddb/image_type.rs
+45 -13
View File
@@ -1,14 +1,33 @@
#[derive(Debug, Clone, Copy)]
#[derive(Debug, Clone, Copy,PartialEq)]
pub enum ImageType {
Hero,
Grid,
WideGrid,
Logo,
BigPicture,
Icon
Icon,
}
pub const ALL_TYPES : [ImageType;6] =
[ImageType::Hero,ImageType::Grid,ImageType::WideGrid,ImageType::Logo,ImageType::BigPicture,ImageType::Icon];
impl ImageType {
pub fn all() -> &'static [ImageType;6]{
&ALL_TYPES
}
pub fn name(&self) -> &str{
match self {
ImageType::Hero => "Hero",
ImageType::Grid => "Grid",
ImageType::WideGrid => "Wide Grid",
ImageType::Logo => "Logo",
ImageType::BigPicture => "Big Picture",
ImageType::Icon => "Icon",
}
}
pub fn file_name(&self, app_id: u32) -> String {
match self {
ImageType::Hero => format!("{}_hero.png", app_id),
@@ -20,18 +39,31 @@ impl ImageType {
}
}
pub fn steam_url<S:AsRef<str>>(&self,steam_app_id:S,mtime:u64) -> String{
pub fn steam_url<S: AsRef<str>>(&self, steam_app_id: S, mtime: u64) -> String {
let steam_app_id = steam_app_id.as_ref();
match self{
ImageType::Hero => format!("https://cdn.cloudflare.steamstatic.com/steam/apps/{}/library_hero.jpg?t={}",steam_app_id,mtime),
ImageType::Grid => format!("https://cdn.cloudflare.steamstatic.com/steam/apps/{}/library_600x900_2x.jpg?t={}",steam_app_id,mtime),
ImageType::WideGrid => format!("https://cdn.cloudflare.steamstatic.com/steam/apps/{}/header.jpg?t={}",steam_app_id,mtime),
ImageType::Logo => format!("https://cdn.cloudflare.steamstatic.com/steam/apps/{}/logo.png?t={}",steam_app_id,mtime),
ImageType::BigPicture => format!("https://cdn.cloudflare.steamstatic.com/steam/apps/{}/header.jpg?t={}",steam_app_id,mtime),
match self {
ImageType::Hero => format!(
"https://cdn.cloudflare.steamstatic.com/steam/apps/{}/library_hero.jpg?t={}",
steam_app_id, mtime
),
ImageType::Grid => format!(
"https://cdn.cloudflare.steamstatic.com/steam/apps/{}/library_600x900_2x.jpg?t={}",
steam_app_id, mtime
),
ImageType::WideGrid => format!(
"https://cdn.cloudflare.steamstatic.com/steam/apps/{}/header.jpg?t={}",
steam_app_id, mtime
),
ImageType::Logo => format!(
"https://cdn.cloudflare.steamstatic.com/steam/apps/{}/logo.png?t={}",
steam_app_id, mtime
),
ImageType::BigPicture => format!(
"https://cdn.cloudflare.steamstatic.com/steam/apps/{}/header.jpg?t={}",
steam_app_id, mtime
),
// This should not happen
_ => "".to_string()
}
_ => "".to_string(),
}
}
}
src/steamgriddb/settings.rs
+1 -1
View File
@@ -1,6 +1,6 @@
use serde::{Deserialize, Serialize};
#[derive(Debug, Serialize, Deserialize,Clone)]
#[derive(Debug, Serialize, Deserialize, Clone)]
pub struct SteamGridDbSettings {
pub enabled: bool,
pub auth_key: Option<String>,