Fix multiple redirects to the same title

2024-04-21 14:22:30 -04:00 · 2024-04-21 14:22:30 -04:00 · d92ae89354
commit d92ae89354
parent 9a1902758f
4 changed files with 52 additions and 26 deletions
--- a/data/manifest.yaml
+++ b/data/manifest.yaml
@ -124908,6 +124908,12 @@ Company of Heroes 2:
            store: steam
  steam:
    id: 231430
+Company of Heroes 2 - Ardennes Assault:
+  alias: Company of Heroes 2
+Company of Heroes 2 - The British Forces:
+  alias: Company of Heroes 2
+Company of Heroes 2 - The Western Front Armies:
+  alias: Company of Heroes 2
 Company of Heroes 3:
  files:
    "<winDocuments>/My Games/Company of Heroes 2/Savegames/users/<storeUserId>/savegames":
@ -124944,6 +124950,10 @@ Company of Heroes 3:
    Company of Heroes Relaunch: {}
  steam:
    id: 317600
+"Company of Heroes: Opposing Fronts":
+  alias: Company of Heroes
+"Company of Heroes: Tales of Valor":
+  alias: Company of Heroes
 Complex:
  installDir:
    Complex: {}
@ -139976,6 +139986,8 @@ Cubway:
            store: steam
  steam:
    id: 511160
+Cuckold Simulator:
+  alias: "Cuckold Simulator: Life as a Beta Male Cuck"
 "Cuckold Simulator: Life as a Beta Male Cuck":
  files:
    "<winLocalAppData>/LocalLow/Team SNEED/CuckoldSimulator":
@ -150798,6 +150810,8 @@ Dawn of Man:
        - config
  steam:
    id: 858810
+"Dawn of War II: Retribution - The Last Stand":
+  alias: "Warhammer 40,000: Dawn of War II: Retribution"
 Dawn of Warriors:
  installDir:
    DoW: {}
@ -198564,6 +198578,20 @@ Elon Simulator 2019:
            store: steam
  steam:
    id: 1116550
+Elon on Mars:
+  installDir:
+    ELON on MARS: {}
+  launch:
+    "<base>/ELON on MARS.exe":
+      - when:
+          - os: windows
+            store: steam
+    "<base>/ELON on MARS.x86_64":
+      - when:
+          - os: linux
+            store: steam
+  steam:
+    id: 1120920
 "Elpida: Crônicas de uma guerreira":
  installDir:
    Elpida Crônicas de uma guerreira: {}
@ -657229,6 +657257,7 @@ Warhalla:
  id:
    gogExtra:
      - 1888623650
+    lutris: warhammer-40000-dawn-of-war-ii-retribution
    steamExtra:
      - 56431
      - 56432
--- a/data/missing.md
+++ b/data/missing.md
@ -5124,12 +5124,7 @@
 * [Community Garden](https://www.pcgamingwiki.com/wiki/?curid=72746)
 * [CommunityUs](https://www.pcgamingwiki.com/wiki/?curid=134544)
 * [Companion](https://www.pcgamingwiki.com/wiki/?curid=60215)
-* [Company of Heroes 2 - Ardennes Assault](https://www.pcgamingwiki.com/wiki/?curid=27807)
-* [Company of Heroes 2 - The British Forces](https://www.pcgamingwiki.com/wiki/?curid=27809)
-* [Company of Heroes 2 - The Western Front Armies](https://www.pcgamingwiki.com/wiki/?curid=17597)
 * [Company of Heroes: Eastern Front](https://www.pcgamingwiki.com/wiki/?curid=61842)
-* [Company of Heroes: Opposing Fronts](https://www.pcgamingwiki.com/wiki/?curid=5079)
-* [Company of Heroes: Tales of Valor](https://www.pcgamingwiki.com/wiki/?curid=5082)
 * [ComPet](https://www.pcgamingwiki.com/wiki/?curid=54329)
 * [Complex](https://www.pcgamingwiki.com/wiki/?curid=79692)
 * [Computer Mechanic Simulator 2019](https://www.pcgamingwiki.com/wiki/?curid=127231)
@ -5727,7 +5722,6 @@
 * [Cublast HD](https://www.pcgamingwiki.com/wiki/?curid=57699)
 * [Cubot](https://www.pcgamingwiki.com/wiki/?curid=37379)
 * [Cubrick](https://www.pcgamingwiki.com/wiki/?curid=61108)
-* [Cuckold Simulator](https://www.pcgamingwiki.com/wiki/?curid=156077)
 * [Cuco](https://www.pcgamingwiki.com/wiki/?curid=88410)
 * [Cucumber Blues](https://www.pcgamingwiki.com/wiki/?curid=60910)
 * [Cue Club](https://www.pcgamingwiki.com/wiki/?curid=128836)
@ -6206,7 +6200,6 @@
 * [Dawn of the Killer Zombies](https://www.pcgamingwiki.com/wiki/?curid=64303)
 * [Dawn of the Plow](https://www.pcgamingwiki.com/wiki/?curid=45783)
 * [Dawn of the Robot Empire](https://www.pcgamingwiki.com/wiki/?curid=43644)
-* [Dawn of War II: Retribution - The Last Stand](https://www.pcgamingwiki.com/wiki/?curid=40995)
 * [Dawn of Warriors](https://www.pcgamingwiki.com/wiki/?curid=51855)
 * [Dawn's Light](https://www.pcgamingwiki.com/wiki/?curid=36620)
 * [Dawn's Light 2](https://www.pcgamingwiki.com/wiki/?curid=53039)
@ -8050,7 +8043,7 @@
 * [Elon Musk Simulator](https://www.pcgamingwiki.com/wiki/?curid=103725)
 * [Elon Musk Simulator 2](https://www.pcgamingwiki.com/wiki/?curid=122032)
 * [Elon Must - Road to Respect](https://www.pcgamingwiki.com/wiki/?curid=134880)
-* [ELON on MARS](https://www.pcgamingwiki.com/wiki/?curid=141618)
+* [Elon on Mars](https://www.pcgamingwiki.com/wiki/?curid=182477)
 * [Elon Simulator 2019](https://www.pcgamingwiki.com/wiki/?curid=141614)
 * [Elpida: Crônicas de uma guerreira](https://www.pcgamingwiki.com/wiki/?curid=135387)
 * [Elsewhere High: Chapter 1 - A Visual Novel](https://www.pcgamingwiki.com/wiki/?curid=57823)
--- a/data/wiki-game-cache.yaml
+++ b/data/wiki-game-cache.yaml
@ -35612,6 +35612,9 @@ Company of Crime:
 Company of Heroes:
  lutris: company-of-heroes
  pageId: 468
+  renamedFrom:
+    - "Company of Heroes: Opposing Fronts"
+    - "Company of Heroes: Tales of Valor"
  steam: 4560
  steamSide:
    - 9340
@ -35628,6 +35631,10 @@ Company of Heroes:
 Company of Heroes 2:
  lutris: company-of-heroes-2
  pageId: 6265
+  renamedFrom:
+    - Company of Heroes 2 - Ardennes Assault
+    - Company of Heroes 2 - The British Forces
+    - Company of Heroes 2 - The Western Front Armies
  steam: 231430
  steamSide:
    - 231453
@ -35688,12 +35695,6 @@ Company of Heroes 2:
    - "{{Game data/config|Linux|{{P|xdgdatahome}}/feral-interactive/CompanyOfHeroes2/}}"
    - "{{Game data/saves|Windows|{{p|userprofile\\Documents}}\\My Games\\Company of Heroes 2\\Savegames\\}}"
    - "{{Game data/saves|Linux|{{P|xdgdatahome}}/feral-interactive/CompanyOfHeroes2/}}"
-Company of Heroes 2 - Ardennes Assault:
-  pageId: 27807
-Company of Heroes 2 - The British Forces:
-  pageId: 27809
-Company of Heroes 2 - The Western Front Armies:
-  pageId: 17597
 Company of Heroes 3:
  pageId: 169997
  steam: 1677280
@ -35707,10 +35708,6 @@ Company of Heroes 3:
 "Company of Heroes: Eastern Front":
  pageId: 61842
  steam: 317600
-"Company of Heroes: Opposing Fronts":
-  pageId: 5079
-"Company of Heroes: Tales of Valor":
-  pageId: 5082
 Complex:
  pageId: 79692
  steam: 772420
@ -39931,12 +39928,11 @@ Cubway:
  steam: 511160
  steamSide:
    - 511200
-Cuckold Simulator:
-  pageId: 156077
 "Cuckold Simulator: Life as a Beta Male Cuck":
  pageId: 177232
  renamedFrom:
    - "CUCKOLD SIMULATOR: Life as a Beta Male Cuck"
+    - Cuckold Simulator
  steam: 1141550
  templates:
    - "{{Game data/config|Windows|{{p|localappdata}}\\LocalLow\\Team SNEED\\CuckoldSimulator}}"
@ -43181,8 +43177,6 @@ Dawn of Man:
  templates:
    - "{{Game data/config|Windows|{{P|hkcu}}\\Software\\Madruga Works\\Dawn of Man|{{P|userprofile\\Documents}}\\DawnOfMan\\Settings\\settings.sav}}"
    - "{{Game data/saves|Windows|{{P|userprofile\\Documents}}\\DawnOfMan\\Saves\\}}"
-"Dawn of War II: Retribution - The Last Stand":
-  pageId: 40995
 Dawn of Warriors:
  pageId: 51855
  steam: 540650
@ -54871,8 +54865,6 @@ ELEX II:
  templates:
    - "{{Game data/config|Windows|{{P|localappdata}}\\ELEX2\\}}"
    - "{{Game data/saves|Windows|{{P|userprofile}}\\Saved Games\\ELEX2\\SaveGames}}"
-ELON on MARS:
-  pageId: 141618
 ELYSION:
  pageId: 150142
  steam: 1070110
@ -56780,6 +56772,11 @@ Elon Must - Road to Respect:
 Elon Simulator 2019:
  pageId: 141614
  steam: 1116550
+Elon on Mars:
+  pageId: 182477
+  renamedFrom:
+    - ELON on MARS
+  steam: 1120920
 "Elpida: Crônicas de uma guerreira":
  pageId: 135387
  steam: 1069290
@ -195005,7 +195002,10 @@ Warhalla:
  gog: 2078475324
  gogSide:
    - 1888623650
+  lutris: warhammer-40000-dawn-of-war-ii-retribution
  pageId: 4427
+  renamedFrom:
+    - "Dawn of War II: Retribution - The Last Stand"
  steam: 56437
  steamSide:
    - 56431
--- a/src/wiki.rs
+++ b/src/wiki.rs
@ -294,7 +294,10 @@ impl WikiCache {
                    if let Some(new_title) = latest.new_title.take() {
                        println!("  page {} redirected to '{}'", cached.page_id, &new_title);

+                        let cached = self.0.get(&new_title).cloned().unwrap_or_default();
+                        latest.renamed_from.extend(cached.renamed_from);
                        latest.renamed_from.push(title.to_string());
+
                        self.0.remove(title);
                        self.0.insert(new_title, latest);
                    } else {
@ -336,9 +339,10 @@ impl WikiCache {

                    let new_title = latest.new_title.take().unwrap_or(new_title);

-                    let mut cached = self.0[title].clone();
-                    cached.renamed_from.push(title.clone());
                    latest.renamed_from = cached.renamed_from;
+                    let cached = self.0.get(&new_title).cloned().unwrap_or_default();
+                    latest.renamed_from.extend(cached.renamed_from);
+                    latest.renamed_from.push(title.clone());

                    self.0.insert(new_title.clone(), latest);
                    self.0.remove(title);