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

Download image names based on mime type (#124)

Browse Source
This commit is contained in:
Philip Kristoffersen
2022-05-14 08:05:51 +02:00
committed by GitHub
parent 9f59957edc
commit a5733cbebf
5 changed files with 94 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/steamgriddb/downloader.rs
+23 -4
View File
@@ -6,7 +6,9 @@ use std::{collections::HashMap, path::Path};
use futures::{stream, StreamExt};
use serde::{Deserialize, Serialize};
use std::error::Error;
use steamgriddb_api::query_parameters::{GridDimentions, Nsfw};
use steamgriddb_api::query_parameters::{
GridDimentions, MimeType, MimeTypeIcon, MimeTypeLogo, Nsfw,
};
use tokio::sync::watch::Sender; // 0.3.1
use steam_shortcuts_util::shortcut::ShortcutOwned;
@@ -157,7 +159,7 @@ async fn search_for_images_to_download(
// if we are missing any of the images we need to search for them
types
.iter()
.map(|t| t.file_name(s.app_id))
.map(|t| t.file_name_no_extension(s.app_id))
.any(|image| !known_images.contains(&image))
&& !s.app_name.is_empty()
});
@@ -191,7 +193,7 @@ async fn search_for_images_to_download(
.iter()
.filter(|s| search_results.contains_key(&s.app_id))
.filter(|s| !settings.steamgrid_db.is_image_banned(&image_type, s.app_id))
.filter(|s| !known_images.contains(&image_type.file_name(s.app_id)));
.filter(|s| !known_images.contains(&image_type.file_name_no_extension(s.app_id)));
let image_ids: Vec<usize> = images_needed
.clone()
.filter_map(|s| search_results.get(&s.app_id))
@@ -211,7 +213,12 @@ async fn search_for_images_to_download(
.map(|(index, image)| (image, shortcuts[index], image_ids[index]));
let download_for_this_type = stream::iter(images)
.filter_map(|(image, shortcut, game_id)| {
let path = grid_folder.join(image_type.file_name(shortcut.app_id));
let extension = image
.as_ref()
.map(|image| get_image_extension(&image.mime))
.unwrap_or("png");
let path =
grid_folder.join(image_type.file_name(shortcut.app_id, extension));
async move {
let image_url = match image {
Ok(img) => Some(img.url.clone()),
@@ -237,6 +244,18 @@ async fn search_for_images_to_download(
Ok(to_download)
}
pub fn get_image_extension(mime_type: &steamgriddb_api::images::MimeTypes) -> &'static str {
match mime_type {
steamgriddb_api::images::MimeTypes::Default(MimeType::Jpeg) => "jpg",
steamgriddb_api::images::MimeTypes::Default(MimeType::Png) => "png",
steamgriddb_api::images::MimeTypes::Default(MimeType::Webp) => "webp",
steamgriddb_api::images::MimeTypes::Logo(MimeTypeLogo::Png) => "png",
steamgriddb_api::images::MimeTypes::Logo(MimeTypeLogo::Webp) => "webp",
steamgriddb_api::images::MimeTypes::Icon(MimeTypeIcon::Icon) => "ico",
steamgriddb_api::images::MimeTypes::Icon(MimeTypeIcon::Png) => "png",
}
}
async fn get_images_for_ids(
client: &Client,
image_ids: &[usize],
src/steamgriddb/image_type.rs
+12 -7
View File
@@ -33,14 +33,19 @@ impl ImageType {
}
}
pub fn file_name(&self, app_id: u32) -> String {
pub fn file_name<S: AsRef<str>>(&self, app_id: u32, extension: S) -> String {
let file_name = self.file_name_no_extension(app_id);
format!("{}.{}", file_name, extension.as_ref())
}
pub fn file_name_no_extension(&self, app_id: u32) -> String {
match self {
ImageType::Hero => format!("{}_hero.png", app_id),
ImageType::Grid => format!("{}p.png", app_id),
ImageType::WideGrid => format!("{}.png", app_id),
ImageType::Logo => format!("{}_logo.png", app_id),
ImageType::BigPicture => format!("{}_bigpicture.png", app_id),
ImageType::Icon => format!("{}.ico", app_id),
ImageType::Hero => format!("{}_hero", app_id),
ImageType::Grid => format!("{}p", app_id),
ImageType::WideGrid => format!("{}", app_id),
ImageType::Logo => format!("{}_logo", app_id),
ImageType::BigPicture => format!("{}_bigpicture", app_id),
ImageType::Icon => format!("{}-icon", app_id),
}
}