🩹 Quick fix for vehicles missing in the tankopedia

eigenein · Jun 28, 2021 · ae1fe51 · ae1fe51
1 parent f6cd96c
commit ae1fe51
Show file tree

Hide file tree

Showing 3 changed files with 46 additions and 30 deletions.
diff --git a/src/models.rs b/src/models.rs
@@ -118,6 +118,9 @@ pub enum TankType {
 
     #[serde(rename = "AT-SPG")]
     AT,
+
+    #[serde(rename = "unknown")]
+    Unknown,
 }
 
 #[derive(Serialize, Deserialize, Clone)]

diff --git a/src/web/player/view.rs b/src/web/player/view.rs
@@ -1,6 +1,6 @@
 use chrono_humanize::{Accuracy, HumanTime, Tense};
 use clap::crate_name;
-use maud::{html, Markup, Render, DOCTYPE};
+use maud::{html, Markup, PreEscaped, Render, DOCTYPE};
 use tide::StatusCode;
 
 use crate::models::Vehicle;
@@ -233,14 +233,12 @@ pub async fn get(request: tide::Request<State>) -> tide::Result {
                                             }
                                             tbody {
                                                 @for snapshot in &model.tank_snapshots {
-                                                    @if let Some(vehicle) = state.get_vehicle(snapshot.tank_id).await?.as_ref() {
-                                                        tr {
-                                                            th { (vehicle) }
-                                                            td { (snapshot.all_statistics.battles) }
-                                                            (render_confidence_interval_td(snapshot.all_statistics.battles, snapshot.all_statistics.wins))
-                                                            td { (snapshot.all_statistics.damage_dealt) }
-                                                            td { (format!("{:.0}", f64::from(snapshot.all_statistics.damage_dealt) / f64::from(snapshot.all_statistics.battles))) }
-                                                        }
+                                                    tr {
+                                                        th { (state.get_vehicle(snapshot.tank_id).await?.as_ref()) }
+                                                        td { (snapshot.all_statistics.battles) }
+                                                        (render_confidence_interval_td(snapshot.all_statistics.battles, snapshot.all_statistics.wins))
+                                                        td { (snapshot.all_statistics.damage_dealt) }
+                                                        td { (format!("{:.0}", f64::from(snapshot.all_statistics.damage_dealt) / f64::from(snapshot.all_statistics.battles))) }
                                                     }
                                                 }
                                             }
@@ -272,24 +270,25 @@ pub fn get_account_url(account_id: i32) -> String {
 
 impl Render for &Vehicle {
     fn render(&self) -> Markup {
-        let tier = match self.tier {
-            1 => "Ⅰ",
-            2 => "Ⅱ",
-            3 => "Ⅲ",
-            4 => "Ⅳ",
-            5 => "Ⅴ",
-            6 => "Ⅵ",
-            7 => "Ⅶ",
-            8 => "Ⅷ",
-            9 => "Ⅸ",
-            10 => "Ⅹ",
-            _ => "?",
+        let tier = PreEscaped(match self.tier {
+            1 => "Ⅰ&nbsp;",
+            2 => "Ⅱ&nbsp;",
+            3 => "Ⅲ&nbsp;",
+            4 => "Ⅳ&nbsp;",
+            5 => "Ⅴ&nbsp;",
+            6 => "Ⅵ&nbsp;",
+            7 => "Ⅶ&nbsp;",
+            8 => "Ⅷ&nbsp;",
+            9 => "Ⅸ&nbsp;",
+            10 => "Ⅹ&nbsp;",
+            _ => "",
+        });
+        let class = if self.is_premium {
+            "has-text-warning-dark"
+        } else {
+            ""
         };
-        html! {
-            span.(if self.is_premium { "has-text-warning-dark" } else { "" }) title=(self.tank_id) {
-                (tier) " " (self.name)
-            }
-        }
+        html! { span.(class) title=(self.tank_id) { (tier) (self.name) } }
     }
 }
 

diff --git a/src/web/state.rs b/src/web/state.rs
@@ -2,10 +2,11 @@ use std::sync::Arc;
 use std::time::Duration;
 
 use async_std::sync::Mutex;
+use chrono::Utc;
 use lru_time_cache::LruCache;
 
 use crate::database::Database;
-use crate::models::Vehicle;
+use crate::models::{TankType, Vehicle};
 use crate::wargaming::WargamingApi;
 
 /// Web application global state.
@@ -14,7 +15,7 @@ pub struct State {
     pub api: WargamingApi,
     pub database: Arc<Mutex<Database>>,
 
-    tankopedia_cache: Arc<Mutex<LruCache<i32, Arc<Option<Vehicle>>>>>,
+    tankopedia_cache: Arc<Mutex<LruCache<i32, Arc<Vehicle>>>>,
 }
 
 impl State {
@@ -29,12 +30,25 @@ impl State {
     }
 
     /// Retrieves cached vehicle information.
-    pub async fn get_vehicle(&self, tank_id: i32) -> crate::Result<Arc<Option<Vehicle>>> {
+    pub async fn get_vehicle(&self, tank_id: i32) -> crate::Result<Arc<Vehicle>> {
         let mut cache = self.tankopedia_cache.lock().await;
         match cache.get(&tank_id) {
             Some(vehicle) => Ok(vehicle.clone()),
             None => {
-                let vehicle = Arc::new(self.database.lock().await.retrieve_vehicle(tank_id)?);
+                let vehicle = match self.database.lock().await.retrieve_vehicle(tank_id)? {
+                    Some(vehicle) => Arc::new(vehicle),
+                    None => {
+                        log::warn!("Tank #{} is not found in the tankopedia.", tank_id);
+                        Arc::new(Vehicle {
+                            tank_id,
+                            name: format!("#{}", tank_id),
+                            tier: 0,
+                            is_premium: false,
+                            type_: TankType::Unknown,
+                            imported_at: Utc::now(),
+                        })
+                    }
+                };
                 cache.insert(tank_id, vehicle.clone());
                 Ok(vehicle)
             }