Art for steam games (#125)

This commit is contained in:
Philip Kristoffersen
2022-05-14 14:58:51 +02:00
committed by GitHub
parent 7f9c79206d
commit 9bafb9d2c4
6 changed files with 242 additions and 23 deletions
+1
View File
@@ -0,0 +1 @@
+78
View File
@@ -0,0 +1,78 @@
use std::{ffi::OsStr, path::Path};
use super::{get_steam_path, SteamSettings};
#[derive(Debug, Clone)]
pub struct SteamGameInfo {
pub appid: u32,
pub name: String,
}
pub fn get_installed_games(settings: &SteamSettings) -> Vec<SteamGameInfo> {
let path = get_steam_path(settings);
if let Ok(path) = path {
let apps_path = Path::new(&path).join("steamapps");
if let Ok(files) = std::fs::read_dir(apps_path) {
let mut games = vec![];
for file in files {
if let Ok(file) = file {
if let Some(game_info) = parse_manifest_file(&file.path()) {
games.push(game_info);
}
}
}
return games;
}
}
vec![]
}
fn parse_manifest_file(path: &Path) -> Option<SteamGameInfo> {
let extension = path.extension().and_then(OsStr::to_str);
if let Some("acf") = extension {
let file_content = std::fs::read_to_string(path);
if let Ok(file_content) = file_content {
return parse_manifest_string(file_content);
}
}
None
}
fn parse_manifest_string<S: AsRef<str>>(string: S) -> Option<SteamGameInfo> {
let mut lines = string.as_ref().lines();
let app_id_line = lines.find(|l| l.contains("\"appid\""));
let name_line = lines.find(|l| l.contains("\"name\""));
match (app_id_line, name_line) {
(Some(app_id_line), Some(name_line)) => Some(SteamGameInfo {
name: name_line[10..name_line.len() - 1].to_string(),
appid: app_id_line[11..app_id_line.len() - 1]
.to_string()
.parse()
.unwrap(),
}),
_ => None,
}
}
#[cfg(test)]
mod tests {
use super::*;
#[test]
fn parse_steam_game() {
let string = include_str!("../testdata/acf/appmanifest_763890.acf");
let game_info = parse_manifest_string(string);
assert!(game_info.is_some());
let game_info = game_info.unwrap();
assert_eq!("Wildermyth", game_info.name);
assert_eq!(763890, game_info.appid);
}
// #[test]
// fn installed_files() {
// let settings = SteamSettings::default();
// let installed_games = get_installed_games(&settings);
// assert_eq!(installed_games.len(), 7);
// }
}
+2
View File
@@ -1,10 +1,12 @@
mod collections; mod collections;
mod installed_games;
mod proton_vdf_util; mod proton_vdf_util;
mod restarter; mod restarter;
mod settings; mod settings;
mod utils; mod utils;
pub use collections::*; pub use collections::*;
pub use installed_games::*;
pub use proton_vdf_util::*; pub use proton_vdf_util::*;
pub use restarter::*; pub use restarter::*;
pub use settings::SteamSettings; pub use settings::SteamSettings;
+1 -1
View File
@@ -1,6 +1,6 @@
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
#[derive(Debug, Serialize, Deserialize, Clone)] #[derive(Debug, Default, Serialize, Deserialize, Clone)]
pub struct SteamSettings { pub struct SteamSettings {
pub location: Option<String>, pub location: Option<String>,
pub create_collections: bool, pub create_collections: bool,
+32
View File
@@ -0,0 +1,32 @@
"AppState"
{
"appid" "763890"
"universe" "1"
"name" "Wildermyth"
"StateFlags" "4"
"installdir" "Wildermyth"
"LastUpdated" "1651783287"
"UpdateResult" "0"
"SizeOnDisk" "2035740746"
"buildid" "8621142"
"LastOwner" "76561197970608363"
"BytesToDownload" "1706137168"
"BytesDownloaded" "1706137168"
"BytesToStage" "2035740746"
"BytesStaged" "2035740746"
"AutoUpdateBehavior" "0"
"AllowOtherDownloadsWhileRunning" "0"
"ScheduledAutoUpdate" "0"
"InstalledDepots"
{
"763893"
{
"manifest" "8422302896250419544"
"size" "2035740746"
}
}
"UserConfig"
{
"language" "english"
}
}
+128 -22
View File
@@ -7,6 +7,7 @@ use crate::{
config::get_thumbnails_folder, config::get_thumbnails_folder,
steam::{get_shortcuts_paths, SteamUsersInfo}, steam::{get_shortcuts_paths, SteamUsersInfo},
steamgriddb::{get_image_extension, get_query_type, CachedSearch, ImageType, ToDownload}, steamgriddb::{get_image_extension, get_query_type, CachedSearch, ImageType, ToDownload},
steam::{get_installed_games, SteamGameInfo},
}; };
use dashmap::DashMap; use dashmap::DashMap;
use egui::{ImageButton, ScrollArea}; use egui::{ImageButton, ScrollArea};
@@ -18,16 +19,16 @@ use tokio::sync::watch::{self, Receiver};
use super::{ui_images::load_image_from_path, FetcStatus, MyEguiApp}; use super::{ui_images::load_image_from_path, FetcStatus, MyEguiApp};
pub struct ImageSelectState { pub struct ImageSelectState {
pub selected_shortcut: Option<ShortcutOwned>, pub selected_shortcut: Option<GameType>,
pub grid_id: Option<usize>, pub grid_id: Option<usize>,
pub steam_user: Option<SteamUsersInfo>, pub steam_user: Option<SteamUsersInfo>,
pub steam_users: Option<Vec<SteamUsersInfo>>, pub steam_users: Option<Vec<SteamUsersInfo>>,
pub user_shortcuts: Option<Vec<ShortcutOwned>>, pub user_shortcuts: Option<Vec<ShortcutOwned>>,
pub game_mode: GameMode,
pub image_type_selected: Option<ImageType>, pub image_type_selected: Option<ImageType>,
pub image_options: Receiver<FetcStatus<Vec<PossibleImage>>>, pub image_options: Receiver<FetcStatus<Vec<PossibleImage>>>,
pub steam_games: Option<Vec<crate::steam::SteamGameInfo>>,
pub image_handles: std::sync::Arc<DashMap<String, TextureState>>, pub image_handles: std::sync::Arc<DashMap<String, TextureState>>,
pub possible_names: Option<Vec<steamgriddb_api::search::SearchResult>>, pub possible_names: Option<Vec<steamgriddb_api::search::SearchResult>>,
@@ -40,6 +41,21 @@ pub enum TextureState {
Loaded(egui::TextureHandle), Loaded(egui::TextureHandle),
} }
#[derive(Debug)]
pub enum GameMode {
Shortcuts,
SteamGames,
}
impl GameMode {
pub fn is_shortcuts(&self) -> bool {
match self {
GameMode::Shortcuts => true,
GameMode::SteamGames => false,
}
}
}
impl ImageSelectState { impl ImageSelectState {
pub fn has_multiple_users(&self) -> bool { pub fn has_multiple_users(&self) -> bool {
match &self.steam_users { match &self.steam_users {
@@ -66,10 +82,34 @@ impl Default for ImageSelectState {
steam_user: Default::default(), steam_user: Default::default(),
steam_users: Default::default(), steam_users: Default::default(),
user_shortcuts: Default::default(), user_shortcuts: Default::default(),
game_mode: GameMode::Shortcuts,
image_type_selected: Default::default(), image_type_selected: Default::default(),
possible_names: None, possible_names: None,
image_options: watch::channel(FetcStatus::NeedsFetched).1, image_options: watch::channel(FetcStatus::NeedsFetched).1,
image_handles: Arc::new(DashMap::new()), image_handles: Arc::new(DashMap::new()),
steam_games: None,
}
}
}
#[derive(Debug, Clone)]
pub enum GameType {
Shortcut(ShortcutOwned),
SteamGame(SteamGameInfo),
}
impl GameType {
pub fn app_id(&self) -> u32 {
match self {
GameType::Shortcut(shortcut) => shortcut.app_id,
GameType::SteamGame(game) => game.appid,
}
}
pub fn name(&self) -> &str {
match self {
GameType::Shortcut(s) => s.app_name.as_ref(),
GameType::SteamGame(g) => g.name.as_ref(),
} }
} }
} }
@@ -78,11 +118,12 @@ impl Default for ImageSelectState {
enum UserAction { enum UserAction {
CorrectGridId, CorrectGridId,
UserSelected(SteamUsersInfo), UserSelected(SteamUsersInfo),
ShortcutSelected(ShortcutOwned), ShortcutSelected(GameType),
ImageTypeSelected(ImageType), ImageTypeSelected(ImageType),
ImageTypeCleared(ImageType, bool), ImageTypeCleared(ImageType, bool),
ImageSelected(PossibleImage), ImageSelected(PossibleImage),
GridIdChanged(usize), GridIdChanged(usize),
SetGamesMode(GameMode),
BackButton, BackButton,
NoAction, NoAction,
} }
@@ -101,7 +142,7 @@ impl MyEguiApp {
return render_user_select(state, ui); return render_user_select(state, ui);
} }
if let Some(shortcut) = state.selected_shortcut.as_ref() { if let Some(shortcut) = state.selected_shortcut.as_ref() {
ui.heading(&shortcut.app_name); ui.heading(shortcut.name());
if let Some(possible_names) = state.possible_names.as_ref() { if let Some(possible_names) = state.possible_names.as_ref() {
if let Some(value) = render_possible_names(possible_names, ui) { if let Some(value) = render_possible_names(possible_names, ui) {
@@ -112,12 +153,36 @@ impl MyEguiApp {
if let Some(action) = self.render_possible_images(ui, image_type, state) { if let Some(action) = self.render_possible_images(ui, image_type, state) {
return action; return action;
} }
} else if let Some(action) = render_shortcut_images(ui, state) { } else {
if let Some(action) = render_shortcut_images(ui, state) {
return action;
}
}
}
} else {
let is_shortcut = state.game_mode.is_shortcuts();
if ui
.selectable_label(is_shortcut, "Images for shortcuts")
.clicked()
{
return UserAction::SetGamesMode(GameMode::Shortcuts);
}
if ui
.selectable_label(!is_shortcut, "Images for steam games")
.clicked()
{
return UserAction::SetGamesMode(GameMode::SteamGames);
}
if is_shortcut {
if let Some(action) = self.render_shortcut_select(ui) {
return action;
}
} else {
if let Some(action) = render_steam_game_select(ui, state) {
return action; return action;
} }
} }
} else if let Some(action) = self.render_shortcut_select(ui) {
return action;
} }
UserAction::NoAction UserAction::NoAction
} }
@@ -150,7 +215,9 @@ impl MyEguiApp {
let button = ui.button(&shortcut.app_name); let button = ui.button(&shortcut.app_name);
clicked = clicked || button.clicked(); clicked = clicked || button.clicked();
if clicked { if clicked {
return Some(UserAction::ShortcutSelected(shortcut.clone())); return Some(UserAction::ShortcutSelected(GameType::Shortcut(
shortcut.clone(),
)));
} }
} }
} }
@@ -296,7 +363,9 @@ impl MyEguiApp {
UserAction::GridIdChanged(grid_id) => { UserAction::GridIdChanged(grid_id) => {
self.handle_grid_change(grid_id); self.handle_grid_change(grid_id);
} }
UserAction::SetGamesMode(game_mode) => {
self.handle_set_game_mode(game_mode);
}
UserAction::NoAction => {} UserAction::NoAction => {}
UserAction::CorrectGridId => { UserAction::CorrectGridId => {
self.handle_correct_grid_request(); self.handle_correct_grid_request();
@@ -307,7 +376,7 @@ impl MyEguiApp {
.selected_shortcut .selected_shortcut
.as_ref() .as_ref()
.unwrap() .unwrap()
.app_id; .app_id();
self.settings self.settings
.steamgrid_db .steamgrid_db
.set_image_banned(&image_type, app_id, should_ban); .set_image_banned(&image_type, app_id, should_ban);
@@ -329,7 +398,7 @@ impl MyEguiApp {
.selected_shortcut .selected_shortcut
.as_ref() .as_ref()
.unwrap() .unwrap()
.app_id, .app_id(),
ext, ext,
); );
let path = Path::new(data_folder) let path = Path::new(data_folder)
@@ -350,7 +419,7 @@ impl MyEguiApp {
.image_selected_state .image_selected_state
.selected_shortcut .selected_shortcut
.as_ref() .as_ref()
.map(|s| s.app_name.clone()) .map(|s| s.name().clone())
.unwrap_or_default(); .unwrap_or_default();
let auth_key = self let auth_key = self
.settings .settings
@@ -363,6 +432,10 @@ impl MyEguiApp {
self.image_selected_state.possible_names = search_results.ok(); self.image_selected_state.possible_names = search_results.ok();
} }
fn handle_set_game_mode(&mut self, game_mode: GameMode) {
self.image_selected_state.game_mode = game_mode;
self.image_selected_state.steam_games = Some(get_installed_games(&self.settings.steam));
}
fn handle_grid_change(&mut self, grid_id: usize) { fn handle_grid_change(&mut self, grid_id: usize) {
self.image_selected_state.grid_id = Some(grid_id); self.image_selected_state.grid_id = Some(grid_id);
self.image_selected_state.possible_names = None; self.image_selected_state.possible_names = None;
@@ -370,7 +443,7 @@ impl MyEguiApp {
let client = steamgriddb_api::Client::new(auth_key); let client = steamgriddb_api::Client::new(auth_key);
let mut cache = CachedSearch::new(&client); let mut cache = CachedSearch::new(&client);
if let Some(shortcut) = &self.image_selected_state.selected_shortcut { if let Some(shortcut) = &self.image_selected_state.selected_shortcut {
cache.set_cache(shortcut.app_id, shortcut.app_name.clone(), grid_id); cache.set_cache(shortcut.app_id(), shortcut.name().clone(), grid_id);
cache.save(); cache.save();
} }
} }
@@ -456,7 +529,7 @@ impl MyEguiApp {
let to = Path::new(&user.steam_user_data_folder) let to = Path::new(&user.steam_user_data_folder)
.join("config") .join("config")
.join("grid") .join("grid")
.join(selected_image_type.file_name(selected_image.app_id, ext)); .join(selected_image_type.file_name(selected_image.app_id(), ext));
if to.exists() { if to.exists() {
let old_key = to.to_string_lossy().to_string(); let old_key = to.to_string_lossy().to_string();
@@ -470,11 +543,11 @@ impl MyEguiApp {
} }
} }
let app_name = selected_image.app_name.clone(); let app_name = selected_image.name();
let to_download = ToDownload { let to_download = ToDownload {
path: to, path: to,
url: image.full_url.clone(), url: image.full_url.clone(),
app_name, app_name: app_name.to_string(),
image_type: *selected_image_type, image_type: *selected_image_type,
}; };
self.rt.spawn_blocking(move || { self.rt.spawn_blocking(move || {
@@ -500,7 +573,7 @@ impl MyEguiApp {
} }
} }
fn handle_shortcut_selected(&mut self, shortcut: ShortcutOwned, ui: &mut egui::Ui) { fn handle_shortcut_selected(&mut self, shortcut: GameType, ui: &mut egui::Ui) {
let state = &mut self.image_selected_state; let state = &mut self.image_selected_state;
//We must have a user to make see this action; //We must have a user to make see this action;
let user = state.steam_user.as_ref().unwrap(); let user = state.steam_user.as_ref().unwrap();
@@ -509,7 +582,7 @@ impl MyEguiApp {
let search = CachedSearch::new(&client); let search = CachedSearch::new(&client);
state.grid_id = self state.grid_id = self
.rt .rt
.block_on(search.search(shortcut.app_id, &shortcut.app_name)) .block_on(search.search(shortcut.app_id(), shortcut.name()))
.ok() .ok()
.flatten(); .flatten();
} }
@@ -556,6 +629,19 @@ fn render_possible_names(
None None
} }
fn render_steam_game_select(ui: &mut egui::Ui, state: &ImageSelectState) -> Option<UserAction> {
if let Some(steam_games) = state.steam_games.as_ref() {
for game in steam_games {
if ui.button(&game.name).clicked() {
return Some(UserAction::ShortcutSelected(GameType::SteamGame(
game.clone(),
)));
}
}
}
None
}
fn render_shortcut_images(ui: &mut egui::Ui, state: &ImageSelectState) -> Option<UserAction> { fn render_shortcut_images(ui: &mut egui::Ui, state: &ImageSelectState) -> Option<UserAction> {
let mut grid_id_text = state.grid_id.map(|id| id.to_string()).unwrap_or_default(); let mut grid_id_text = state.grid_id.map(|id| id.to_string()).unwrap_or_default();
if ui.text_edit_singleline(&mut grid_id_text).changed() { if ui.text_edit_singleline(&mut grid_id_text).changed() {
@@ -635,11 +721,31 @@ trait HasImageKey {
} }
const POSSIBLE_EXTENSIONS: [&'static str; 4] = ["png", "jpg", "ico", "webp"]; const POSSIBLE_EXTENSIONS: [&'static str; 4] = ["png", "jpg", "ico", "webp"];
impl HasImageKey for GameType {
fn key(&self, image_type: &ImageType, user_path: &Path) -> (PathBuf, String) {
match self {
GameType::Shortcut(s) => s.key(image_type, user_path),
GameType::SteamGame(g) => g.key(image_type, user_path),
}
}
}
impl HasImageKey for SteamGameInfo {
fn key(&self, image_type: &ImageType, user_path: &Path) -> (PathBuf, String) {
let mut keys = POSSIBLE_EXTENSIONS
.iter()
.map(|ext| key_from_extension(self.appid, image_type, user_path, ext));
let first = keys.next().unwrap();
let other = keys.filter(|(exsists, _, _)| *exsists).next();
let (_, path, key) = other.unwrap_or(first);
(path, key)
}
}
impl HasImageKey for ShortcutOwned { impl HasImageKey for ShortcutOwned {
fn key(&self, image_type: &ImageType, user_path: &Path) -> (PathBuf, String) { fn key(&self, image_type: &ImageType, user_path: &Path) -> (PathBuf, String) {
let mut keys = POSSIBLE_EXTENSIONS let mut keys = POSSIBLE_EXTENSIONS
.iter() .iter()
.map(|ext| key_from_extension(self, image_type, user_path, ext)); .map(|ext| key_from_extension(self.app_id, image_type, user_path, ext));
let first = keys.next().unwrap(); let first = keys.next().unwrap();
let other = keys.filter(|(exsists, _, _)| *exsists).next(); let other = keys.filter(|(exsists, _, _)| *exsists).next();
let (_, path, key) = other.unwrap_or(first); let (_, path, key) = other.unwrap_or(first);
@@ -648,12 +754,12 @@ impl HasImageKey for ShortcutOwned {
} }
fn key_from_extension( fn key_from_extension(
shortcut: &ShortcutOwned, app_id: u32,
image_type: &ImageType, image_type: &ImageType,
user_path: &Path, user_path: &Path,
ext: &str, ext: &str,
) -> (bool, PathBuf, String) { ) -> (bool, PathBuf, String) {
let file_name = image_type.file_name(shortcut.app_id, ext); let file_name = image_type.file_name(app_id, ext);
let path = user_path.join("config").join("grid").join(&file_name); let path = user_path.join("config").join("grid").join(&file_name);
let key = path.to_string_lossy().to_string(); let key = path.to_string_lossy().to_string();
(path.exists(), path, key) (path.exists(), path, key)