From f7787c7326882d75893c88d4d001efe6efffa65c Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Thu, 6 Feb 2025 13:44:21 -0600
Subject: [PATCH] Rename Game Pass to Xbox and update related references

Update Xbox platform to reference xbox_games.ps1 instead of game_pass_games.ps1

Fix typo in XboxPlatform struct and its references
---
 Readme.md                                     |  2 +-
 src/platforms/mod.rs                          |  2 +-
 src/platforms/platforms_load.rs               |  6 ++---
 src/platforms/{gamepass => xbox}/mod.rs       |  0
 src/platforms/{gamepass => xbox}/platform.rs  | 22 +++++++++----------
 .../xbox_games.ps1}                           |  0
 6 files changed, 16 insertions(+), 16 deletions(-)
 rename src/platforms/{gamepass => xbox}/mod.rs (100%)
 rename src/platforms/{gamepass => xbox}/platform.rs (92%)
 rename src/platforms/{gamepass/game_pass_games.ps1 => xbox/xbox_games.ps1} (100%)

diff --git a/Readme.md b/Readme.md
index d7d0aee6..d4d8a2cd 100644
--- a/Readme.md
+++ b/Readme.md
@@ -76,7 +76,7 @@ BoilR can import games from many platforms, but there are limits based
 | [Bottles](https://usebottles.com/)                                              | No      | Yes                           | Yes                                       |
 | [MiniGalaxy](https://sharkwouter.github.io/minigalaxy/)                         | No      | Yes                           | Yes                                       |
 | [Playnite](https://playnite.link/)                                              | Yes     | No                            | No                                        |
-| [Game Pass](https://www.xbox.com/en-US/xbox-game-pass)                          | Yes     | No                            | No                                        |
+| [Xbox](https://www.xbox.com/en-US/)                                             | Yes     | No                            | No                                        |
 
 ## Getting cover art for your shortcuts
 
diff --git a/src/platforms/mod.rs b/src/platforms/mod.rs
index 60be0099..044bf160 100644
--- a/src/platforms/mod.rs
+++ b/src/platforms/mod.rs
@@ -18,7 +18,7 @@ mod amazon;
 mod playnite;
 
 #[cfg(not(target_family = "unix"))]
-mod gamepass;
+mod xbox;
 
 
 
diff --git a/src/platforms/platforms_load.rs b/src/platforms/platforms_load.rs
index d9e5cd93..cb850210 100644
--- a/src/platforms/platforms_load.rs
+++ b/src/platforms/platforms_load.rs
@@ -18,7 +18,7 @@ const PLATFORM_NAMES: [&str; 14] = [
     "uplay",
     "minigalaxy",
     "playnite",
-    "gamepass"
+    "xbox"
 ];
 
 pub type Platforms = Vec<Box<dyn GamesPlatform>>;
@@ -35,11 +35,11 @@ pub fn load_platform<A: AsRef<str>, B: AsRef<str>>(
         //Windows only platforms
         use super::amazon::AmazonPlatform;
         use super::playnite::PlaynitePlatform;
-        use super::gamepass::GamePassPlatForm;
+        use super::xbox::XboxPlatform;
         match name {
             "amazon" => return load::<AmazonPlatform>(s),
             "playnite" => return load::<PlaynitePlatform>(s),
-            "gamepass" => return load::<GamePassPlatForm>(s),
+            "xbox" => return load::<XboxPlatform>(s),
             _ => {}
         }
     }
diff --git a/src/platforms/gamepass/mod.rs b/src/platforms/xbox/mod.rs
similarity index 100%
rename from src/platforms/gamepass/mod.rs
rename to src/platforms/xbox/mod.rs
diff --git a/src/platforms/gamepass/platform.rs b/src/platforms/xbox/platform.rs
similarity index 92%
rename from src/platforms/gamepass/platform.rs
rename to src/platforms/xbox/platform.rs
index 99132d5a..5c67d4db 100644
--- a/src/platforms/gamepass/platform.rs
+++ b/src/platforms/xbox/platform.rs
@@ -10,22 +10,22 @@ use steam_shortcuts_util::Shortcut;
 use crate::platforms::ShortcutToImport;
 
 #[derive(Clone, Deserialize, Default)]
-pub struct GamePassPlatForm {
-    settings: GamePassSettings,
+pub struct XboxPlatform {
+    settings: XboxSettings,
 }
 
 #[derive(Serialize, Deserialize, Default, Clone)]
-pub struct GamePassSettings {
+pub struct XboxSettings {
     enabled: bool,
 }
 
-impl GamesPlatform for GamePassPlatForm {
+impl GamesPlatform for XboxPlatform {
     fn name(&self) -> &str {
-        "Game Pass"
+        "Xbox"
     }
 
     fn code_name(&self) -> &str {
-        "gamepass"
+        "xbox"
     }
 
     fn enabled(&self) -> bool {
@@ -33,7 +33,7 @@ impl GamesPlatform for GamePassPlatForm {
     }
 
     fn get_shortcut_info(&self) -> eyre::Result<Vec<crate::platforms::ShortcutToImport>> {
-        let command = include_str!("./game_pass_games.ps1");
+        let command = include_str!("./xbox_games.ps1");
         let res = run_powershell_command(command)?;
         let apps: Vec<AppInfo> = serde_json::from_str(&res)?;
         let windows_dir = std::env::var("WinDir").unwrap_or("C:\\Windows".to_string());
@@ -82,8 +82,8 @@ impl GamesPlatform for GamePassPlatForm {
     }
 
     fn render_ui(&mut self, ui: &mut egui::Ui) {
-        ui.heading("Game Pass");
-        ui.checkbox(&mut self.settings.enabled, "Import from Game Pass");
+        ui.heading("Xbox");
+        ui.checkbox(&mut self.settings.enabled, "Import from Xbox");
     }
 }
 
@@ -181,9 +181,9 @@ fn run_powershell_command(cmd: &str) -> Result<String, Error> {
     }
 }
 
-impl FromSettingsString for GamePassPlatForm {
+impl FromSettingsString for XboxPlatform {
     fn from_settings_string<S: AsRef<str>>(s: S) -> Self {
-        GamePassPlatForm {
+        XboxPlatform {
             settings: load_settings(s),
         }
     }
diff --git a/src/platforms/gamepass/game_pass_games.ps1 b/src/platforms/xbox/xbox_games.ps1
similarity index 100%
rename from src/platforms/gamepass/game_pass_games.ps1
rename to src/platforms/xbox/xbox_games.ps1