UI image system(s) rework

Merge pull request #20 from ArmchairDevelopers/ui-image-rework

Author: headassbtw

maxima-ui/src/bridge/game_images.rs

@@ -5,13 +5,13 @@ use maxima::{core::LockedMaxima, rtm::client::BasicPresence};
 use std::sync::mpsc::Sender;
 
 use crate::{
-    bridge_thread::{MaximaLibResponse, InteractThreadFriendListResponse},
-    views::friends_view::{UIFriend, UIFriendImageWrapper},
+    bridge_thread::{InteractThreadFriendListResponse, MaximaLibResponse}, ui_image::UIImageCacheLoaderCommand, views::friends_view::UIFriend
 };
 
 pub async fn get_friends_request(
     maxima_arc: LockedMaxima,
     channel: Sender<MaximaLibResponse>,
+    remote_provider_channel: Sender<UIImageCacheLoaderCommand>,
     ctx: &Context,
 ) -> Result<()> {
     debug!("recieved request to load friends");
@@ -23,14 +23,13 @@ pub async fn get_friends_request(
 
     let friends = maxima.friends(0).await?;
     for bitchass in friends {
-
+        remote_provider_channel.send(UIImageCacheLoaderCommand::ProvideRemote(crate::ui_image::UIImageType::Avatar(bitchass.id().to_string()), bitchass.avatar().as_ref().unwrap().medium().path().to_string())).unwrap();
         let friend_info = UIFriend {
             name: bitchass.display_name().to_string(),
             id: bitchass.id().to_string(),
             online: BasicPresence::Offline,
             game: None,
             game_presence: None,
-            avatar: UIFriendImageWrapper::Unloaded(bitchass.avatar().as_ref().unwrap().medium().path().to_string()),
         };
 
         let res = MaximaLibResponse::FriendInfoResponse(InteractThreadFriendListResponse {

maxima-ui/src/bridge/get_friends.rs

@@ -1,43 +1,122 @@
 use anyhow::{Ok, Result, bail};
 use egui::Context;
-use log::debug;
-use maxima::core::LockedMaxima;
-use std::sync::mpsc::Sender;
+use log::{debug, info};
+use maxima::{core::{service_layer::{ServiceGame, ServiceGameImagesRequestBuilder, ServiceLayerClient, SERVICE_REQUEST_GAMEIMAGES}, LockedMaxima}, util::native::maxima_dir};
+use std::{fs, sync::mpsc::Sender};
 
 use crate::{
-    bridge_thread::{InteractThreadGameListResponse, MaximaLibResponse},
-    GameDetailsWrapper, GameInfo, GameUIImagesWrapper,
+    bridge_thread::{InteractThreadGameListResponse, MaximaLibResponse}, ui_image::UIImageCacheLoaderCommand, GameDetailsWrapper, GameInfo
 };
 
+async fn get_preferred_hero_image(images: &Option<ServiceGame>) -> Option<String> {
+    if images.is_none() {
+        return None;
+    }
+
+    let key_art = images.as_ref().unwrap().key_art();
+    if key_art.is_none() {
+        return None;
+    }
+
+    let key_art = key_art.as_ref().unwrap();
+
+    debug!("{:?}", key_art);
+    if let Some(img) = key_art.aspect_10x3_image() {
+        return Some(img.path().clone());
+    }
+
+    if let Some(img) = key_art.aspect_2x1_image() {
+        return Some(img.path().clone());
+    }
+
+    if let Some(img) = key_art.aspect_16x9_image() {
+        return Some(img.path().clone());
+    }
+
+    None
+}
+
+fn get_logo_image(images: &Option<ServiceGame>) -> Option<String> {
+    if images.is_none() {
+        return None;
+    }
+
+    let logo_set = images.as_ref().unwrap().primary_logo();
+    if logo_set.is_none() {
+        return None;
+    }
+
+    let largest_logo = logo_set.as_ref().unwrap().largest_image();
+    if largest_logo.is_none() {
+        return None;
+    }
+
+    Some(largest_logo.as_ref().unwrap().path().to_string())
+}
+
+async fn handle_images(slug: String, locale: String, has_hero: bool, has_logo: bool, channel: Sender<UIImageCacheLoaderCommand>, service_layer: ServiceLayerClient) -> Result<()> {
+    debug!("handling image downloads for {}", &slug);
+    let images = service_layer
+    .request(SERVICE_REQUEST_GAMEIMAGES, ServiceGameImagesRequestBuilder::default()
+    .should_fetch_context_image(!has_logo)
+    .should_fetch_backdrop_images(!has_hero)
+    .game_slug(slug.clone())
+    .locale(locale.clone())
+    .build()?).await?;
+
+    if !has_hero {
+        if let Some(hero) = get_preferred_hero_image(&images).await {
+            channel.send(UIImageCacheLoaderCommand::ProvideRemote(crate::ui_image::UIImageType::Hero(slug.clone()), hero)).unwrap()
+        }
+    }
+
+    if !has_logo {
+        if let Some(logo) = get_logo_image(&images) {
+            channel.send(UIImageCacheLoaderCommand::ProvideRemote(crate::ui_image::UIImageType::Logo(slug), logo))?
+        } else {
+            channel.send(UIImageCacheLoaderCommand::Stub(crate::ui_image::UIImageType::Logo(slug)))?
+        }
+    }
+
+    Ok(())
+}
+
+
 pub async fn get_games_request(
     maxima_arc: LockedMaxima,
     channel: Sender<MaximaLibResponse>,
+    channel1: Sender<UIImageCacheLoaderCommand>,
     ctx: &Context,
 ) -> Result<()> {
     debug!("recieved request to load games");
     let mut maxima = maxima_arc.lock().await;
+    let service_layer = maxima.service_layer().clone();
+    let locale = maxima.locale().short_str().to_owned();
     let logged_in = maxima.auth_storage().lock().await.current().is_some();
     if !logged_in {
         bail!("Ignoring request to load games, not logged in.");
     }
 
+
     let owned_games = maxima.mut_library().games().await;
 
+    
     if owned_games.len() <= 0 {
         return Ok(());
     }
 
     for game in owned_games {
+        info!("processing {}", &game.base_offer().slug());
         let game_info = GameInfo {
             slug: game.base_offer().slug().to_string(),
             offer: game.base_offer().offer().offer_id().to_string(),
             name: game.name(),
-            images: GameUIImagesWrapper::Unloaded,
             details: GameDetailsWrapper::Unloaded,
             dlc: game.extra_offers().clone(),
             installed: game.base_offer().installed().await,
             has_cloud_saves: game.base_offer().offer().has_cloud_save(),
         };
+        let slug = game_info.slug.clone();
         let settings = crate::GameSettings {
             //TODO: eventually support cloud saves, the option is here for that but for now, keep it disabled in ui!
             cloud_saves: true,
@@ -49,6 +128,30 @@ pub async fn get_games_request(
             settings
         });
         channel.send(res)?;
+        
+        let game_hero = maxima_dir()
+            .unwrap()
+            .join("cache/ui/images/")
+            .join(&slug)
+            .join("hero.jpg");
+        let game_logo = maxima_dir()
+            .unwrap()
+            .join("cache/ui/images/")
+            .join(&slug)
+            .join("logo.png");
+        let has_hero = fs::metadata(&game_hero).is_ok();
+        let has_logo = fs::metadata(&game_logo).is_ok();
+
+        if !has_hero || !has_logo {
+            //we're like 20 tasks deep i swear but this shit's gonna be real fast, trust
+            let slug_send = slug.clone();
+            let locale_send = locale.clone();
+            let channel_send = channel1.clone();
+            let service_layer_send = service_layer.clone();
+            tokio::task::spawn(async move { handle_images(slug_send, locale_send, has_hero, has_logo, channel_send, service_layer_send).await });
+            tokio::task::yield_now().await;
+
+        }
 
         egui::Context::request_repaint(&ctx);
     }

maxima-ui/src/bridge/get_games.rs

@@ -1,7 +1,5 @@
 pub mod game_details;
-pub mod game_images;
 pub mod get_friends;
 pub mod get_games;
-pub mod get_user_avatar;
 pub mod login_oauth;
 pub mod start_game;