From 4d8218b042ff7a67a26ef03b396a0040d9ed8ce1 Mon Sep 17 00:00:00 2001
From: mtkennerly <mtkennerly@gmail.com>
Date: Tue, 5 Jul 2022 15:39:39 +0800
Subject: [PATCH] Fix Steam ID being skipped/cleared

---
 data/wiki-game-cache.yaml |  3 ++-
 src/wiki.ts               | 16 +++++++++-------
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/data/wiki-game-cache.yaml b/data/wiki-game-cache.yaml
index 401720c0..43013baa 100644
--- a/data/wiki-game-cache.yaml
+++ b/data/wiki-game-cache.yaml
@@ -50820,6 +50820,7 @@ Dirty Education:
   renamedFrom:
     - Dirty Education / 肉的教育
   revId: 1261825
+  steam: 1018040
 Dirty Fighter 1:
   pageId: 65329
   revId: 1184703
@@ -166101,7 +166102,7 @@ Sonic Origins:
   steam: 1794960
   templates:
     - |-
-      {{Game data/config|Steam|{{p|appdata}}\Sega\SonicOrigins\steam\{{p|uid}}\option\data.dat | 
+      {{Game data/config|Steam|{{p|appdata}}\Sega\SonicOrigins\steam\{{p|uid}}\option\data.dat |
       {{p|appdata}}\Sega\SonicOrigins\steam\x64\screen_setting.xml}}
     - '{{Game data/saves|Steam|{{p|appdata}}\Sega\SonicOrigins\steam\{{p|uid}}\game\data.dat}}'
 Sonic P-06:
diff --git a/src/wiki.ts b/src/wiki.ts
index e970edcf..d0174cb6 100644
--- a/src/wiki.ts
+++ b/src/wiki.ts
@@ -90,13 +90,15 @@ export class WikiGameCacheFile extends YamlFile<WikiGameCache> {
                     continue;
                 }
             }
-            if (games.length > 0 && !games.includes(pageTitle)) {
-                continue;
+            if (games.length > 0) {
+                if (!games.includes(pageTitle)) {
+                    continue;
+                }
             } else if (!all && this.data[pageTitle].revId !== null && !this.data[pageTitle].recentlyChanged) {
                 continue;
             }
 
-            // console.log(`Refreshing wiki page ${pageTitle}`);
+            // console.log(`Refreshing wiki page: ${pageTitle}`);
             await getGame(pageTitle, this.data, client);
 
             i++;
@@ -139,8 +141,8 @@ export class WikiGameCacheFile extends YamlFile<WikiGameCache> {
                         console.log(`[ M ] ${recentName} <<< ${existingName}`);
                         renamed = true;
                         this.data[recentName] = {
+                            ...existingInfo,
                             pageId: recentInfo.pageId,
-                            revId: existingInfo.revId,
                             recentlyChanged: true,
                             renamedFrom: [...(existingInfo.renamedFrom ?? []), existingName]
                         };
@@ -410,7 +412,7 @@ function getConstraintFromSystem(system: string, path: string): Constraint {
     } else {
         try {
             constraint.os = parseOs(system);
-        } catch {}
+        } catch { }
     }
 
     const storeFromPath = getStoreConstraintFromPath(path);
@@ -568,7 +570,7 @@ export async function getGame(pageTitle: string, cache: WikiGameCache, client: W
     delete cache[pageTitle].templates;
     page.parse().each("template", template => {
         const templateName = template.name.toLowerCase();
-        if (templateName === "Infobox game") {
+        if (templateName === "infobox game") {
             const steamId = Number(template.parameters["steam appid"]);
             if (!isNaN(steamId) && steamId > 0) {
                 cache[pageTitle].steam = steamId;
@@ -591,7 +593,7 @@ export async function getGame(pageTitle: string, cache: WikiGameCache, client: W
 
 function flattenParameter(nodes: Array<WikiNode>): [string, boolean] {
     let composite = "";
-    let regular =  true;
+    let regular = true;
 
     for (const node of nodes) {
         if (typeof node === "string") {