rename GameDefPlatform to GamePlatform

Author: ethangreen-dev

src/game/import/ea.rs

@@ -4,7 +4,7 @@ use super::ImportOverrides;
 use crate::error::Error;
 use crate::game::error::GameError;
 use crate::game::registry::ActiveDistribution;
-use crate::ts::v1::models::ecosystem::{GameDef, GameDefPlatform};
+use crate::ts::v1::models::ecosystem::{GameDef, GamePlatform};
 use crate::util::reg::{self, HKey};
 
 pub fn get_gamedist(ident: &str, game_def: &GameDef, overrides: &ImportOverrides) -> Result<Option<ActiveDistribution>, Error> {
@@ -26,7 +26,7 @@ pub fn get_gamedist(ident: &str, game_def: &GameDef, overrides: &ImportOverrides
         })?;
 
     Ok(Some(ActiveDistribution {
-        dist: GameDefPlatform::Origin {
+        dist: GamePlatform::Origin {
             identifier: ident.to_string(),
         },
         game_dir: game_dir.to_path_buf(),

src/game/import/egs.rs

@@ -7,7 +7,7 @@ use super::ImportOverrides;
 use crate::error::{Error, IoError};
 use crate::game::error::GameError;
 use crate::game::registry::ActiveDistribution;
-use crate::ts::v1::models::ecosystem::{GameDef, GameDefPlatform};
+use crate::ts::v1::models::ecosystem::{GameDef, GamePlatform};
 use crate::util::reg::{self, HKey};
 
 #[derive(Serialize, Deserialize, Debug)]
@@ -73,7 +73,7 @@ pub fn get_gamedist(ident: &str, game_def: &GameDef, overrides: &ImportOverrides
         })?;
 
     Ok(Some(ActiveDistribution {
-        dist: GameDefPlatform::Other,
+        dist: GamePlatform::Other,
         game_dir: game_dir.to_path_buf(),
         data_dir: game_dir.join(&r2mm.data_folder_name),
         exe_path,

src/game/import/gamepass.rs

@@ -4,7 +4,7 @@ use super::ImportOverrides;
 use crate::error::Error;
 use crate::game::error::GameError;
 use crate::game::registry::ActiveDistribution;
-use crate::ts::v1::models::ecosystem::{GameDef, GameDefPlatform};
+use crate::ts::v1::models::ecosystem::{GameDef, GamePlatform};
 use crate::util::reg::{self, HKey};
 
 pub fn get_gamedist(ident: &str, game_def: &GameDef, overrides: &ImportOverrides) -> Result<Option<ActiveDistribution>, Error> {
@@ -40,7 +40,7 @@ pub fn get_gamedist(ident: &str, game_def: &GameDef, overrides: &ImportOverrides
         })?;
 
     Ok(Some(ActiveDistribution {
-        dist: GameDefPlatform::XboxGamePass {
+        dist: GamePlatform::XboxGamePass {
             identifier: ident.to_string(),
         },
         game_dir: game_dir.to_path_buf(),

src/game/import/mod.rs

@@ -10,7 +10,7 @@ use super::ecosystem;
 use super::error::GameError;
 use super::registry::{ActiveDistribution, GameData};
 use crate::error::Error;
-use crate::ts::v1::models::ecosystem::{GameDef, GameDefPlatform};
+use crate::ts::v1::models::ecosystem::{GameDef, GamePlatform};
 
 pub trait GameImporter {
     fn construct(self: Box<Self>, base: ImportBase) -> Result<GameData, Error>;
@@ -70,26 +70,26 @@ impl ImportBase {
             .collect::<Vec<_>>())
     }
 
-    pub fn get_active_dist(&self, platform: &GameDefPlatform) -> Result<Option<ActiveDistribution>, Error> {
+    pub fn get_active_dist(&self, platform: &GamePlatform) -> Result<Option<ActiveDistribution>, Error> {
         match platform {
-            GameDefPlatform::EpicGamesStore { identifier } => {
+            GamePlatform::EpicGamesStore { identifier } => {
                 egs::get_gamedist(identifier, &self.game_def, &self.overrides)
             },
-            GameDefPlatform::XboxGamePass { identifier } => {
+            GamePlatform::XboxGamePass { identifier } => {
                 gamepass::get_gamedist(identifier, &self.game_def, &self.overrides)
             },
-            GameDefPlatform::Origin { identifier } => {
+            GamePlatform::Origin { identifier } => {
                 ea::get_gamedist(identifier, &self.game_def, &self.overrides)
             },
-            GameDefPlatform::Steam { identifier } => {
+            GamePlatform::Steam { identifier } => {
                 steam::get_gamedist(
                     identifier.parse().unwrap(), 
                     self.overrides.steam_dir.as_deref(), 
                     &self.game_def, 
                     &self.overrides,
                 )
             },
-            GameDefPlatform::SteamDirect { identifier } => {
+            GamePlatform::SteamDirect { identifier } => {
                 steam::get_gamedist(
                     identifier.parse().unwrap(), 
                     self.overrides.steam_dir.as_deref(), 

src/game/import/nodrm.rs

@@ -4,7 +4,7 @@ use super::ImportOverrides;
 use crate::error::{Error, IoError};
 use crate::game::error::GameError;
 use crate::game::registry::ActiveDistribution;
-use crate::ts::v1::models::ecosystem::{GameDef, GameDefPlatform};
+use crate::ts::v1::models::ecosystem::{GameDef, GamePlatform};
 
 pub struct NoDrmImporter {
     game_dir: PathBuf,
@@ -36,7 +36,7 @@ pub fn get_gamedist(game_dir: &Path, game_def: &GameDef, overrides: &ImportOverr
             base_path: game_dir.to_path_buf(),
         })?;
     Ok(ActiveDistribution {
-        dist: GameDefPlatform::Other,
+        dist: GamePlatform::Other,
         game_dir: game_dir.to_path_buf(),
         data_dir: game_dir.join(&r2mm.data_folder_name),
         exe_path,

src/game/import/steam.rs

@@ -6,7 +6,7 @@ use super::ImportOverrides;
 use crate::error::Error;
 use crate::game::error::GameError;
 use crate::game::registry::ActiveDistribution;
-use crate::ts::v1::models::ecosystem::{GameDef, GameDefPlatform};
+use crate::ts::v1::models::ecosystem::{GameDef, GamePlatform};
 
 pub fn get_gamedist(app_id: u32, steam_dir: Option<&Path>, game_def: &GameDef, overrides: &ImportOverrides) -> Result<Option<ActiveDistribution>, Error> {
     // If an app_dir is provided then we can skip automatic path resolution. If not,
@@ -59,7 +59,7 @@ pub fn get_gamedist(app_id: u32, steam_dir: Option<&Path>, game_def: &GameDef, o
         })?;
 
     Ok(Some(ActiveDistribution {
-        dist: GameDefPlatform::Steam {
+        dist: GamePlatform::Steam {
             identifier: app_id.to_string(),
         },
         data_dir: app_dir.join(&r2mm.data_folder_name),

src/game/registry.rs

@@ -5,7 +5,7 @@ use std::path::{Path, PathBuf};
 use serde::{Deserialize, Serialize};
 
 use crate::error::Error;
-use crate::ts::v1::models::ecosystem::GameDefPlatform;
+use crate::ts::v1::models::ecosystem::GamePlatform;
 use crate::util::os::OS;
 
 #[derive(Serialize, Deserialize, Debug, PartialEq)]
@@ -14,12 +14,12 @@ pub struct GameData {
     pub identifier: String,
     pub display_name: String,
     pub active_distribution: ActiveDistribution,
-    pub possible_distributions: Vec<GameDefPlatform>,
+    pub possible_distributions: Vec<GamePlatform>,
 }
 
 #[derive(Serialize, Deserialize, Debug, PartialEq, Clone)]
 pub struct ActiveDistribution {
-    pub dist: GameDefPlatform,
+    pub dist: GamePlatform,
     pub game_dir: PathBuf,
     pub data_dir: PathBuf,
     pub exe_path: PathBuf,

src/main.rs

@@ -11,7 +11,7 @@ use once_cell::sync::Lazy;
 use project::error::ProjectError;
 use project::ProjectKind;
 use ts::error::ApiError;
-use ts::v1::models::ecosystem::GameDefPlatform;
+use ts::v1::models::ecosystem::GamePlatform;
 use wildmatch::WildMatch;
 
 use crate::cli::{Args, Commands, ListSubcommand};
@@ -190,7 +190,7 @@ async fn main() -> Result<(), Error> {
             let import_base = ImportBase::new(&game_id).await?.with_overrides(overrides);
 
             if let Some(platform) = platform {
-                let platform = GameDefPlatform::new_from_name(&game_id, &platform).await?;
+                let platform = GamePlatform::new_from_name(&game_id, &platform).await?;
                 let dist = import_base.get_active_dist(&platform)?;
 
                 if dist.is_none() {

src/ts/v1/models/ecosystem.rs

@@ -24,7 +24,7 @@ pub struct GameDef {
     pub uuid: String,
     pub label: String,
     pub meta: GameDefMeta,
-    pub distributions: Vec<GameDefPlatform>,
+    pub distributions: Vec<GamePlatform>,
     pub r2modman: Option<Vec<GameDefR2MM>>,
     pub thunderstore: Option<GameDefThunderstore>,
 }
@@ -40,7 +40,7 @@ pub struct GameDefMeta {
 #[derive(Serialize, Deserialize, Debug, Clone, PartialEq, clap::Subcommand)]
 #[serde(tag = "platform")]
 #[serde(rename_all = "kebab-case")]
-pub enum GameDefPlatform {
+pub enum GamePlatform {
     EpicGamesStore {
         identifier: String,
     },
@@ -60,29 +60,29 @@ pub enum GameDefPlatform {
     Other,
 }
 
-impl GameDefPlatform {
+impl GamePlatform {
     /// Hardcoding these for now until we integrate this sorta thing into
     /// the ecosystem schema, preferably as a compile time check.
     pub fn ident_from_name<'a>(&'a self, name: &str) -> Option<&'a str> {
         match (name, self) {
-            ("epic-games-store", GameDefPlatform::EpicGamesStore { identifier }) => Some(identifier),
-            ("gamepass", GameDefPlatform::XboxGamePass { identifier }) => Some(identifier),
-            ("origin" | "ea", GameDefPlatform::Origin { identifier }) => Some(identifier),
-            ("steam", GameDefPlatform::Steam { identifier }) => Some(identifier),
-            ("steam-direct", GameDefPlatform::SteamDirect { identifier }) => Some(identifier),
+            ("epic-games-store", GamePlatform::EpicGamesStore { identifier }) => Some(identifier),
+            ("gamepass", GamePlatform::XboxGamePass { identifier }) => Some(identifier),
+            ("origin" | "ea", GamePlatform::Origin { identifier }) => Some(identifier),
+            ("steam", GamePlatform::Steam { identifier }) => Some(identifier),
+            ("steam-direct", GamePlatform::SteamDirect { identifier }) => Some(identifier),
             _ => None,
         }
     }
 
     pub fn get_platform_name(&self) -> &'static str {
         match self {
-            GameDefPlatform::EpicGamesStore { identifier: _ } => "epic-games-store",
-            GameDefPlatform::XboxGamePass { identifier: _ } => "gamepass",
-            GameDefPlatform::Origin { identifier: _ } => "origin",
-            GameDefPlatform::Steam { identifier: _ } => "steam",
-            GameDefPlatform::SteamDirect { identifier: _ } => "steam-direct",
-            GameDefPlatform::OculusStore => "oculus-store",
-            GameDefPlatform::Other => "other",
+            GamePlatform::EpicGamesStore { identifier: _ } => "epic-games-store",
+            GamePlatform::XboxGamePass { identifier: _ } => "gamepass",
+            GamePlatform::Origin { identifier: _ } => "origin",
+            GamePlatform::Steam { identifier: _ } => "steam",
+            GamePlatform::SteamDirect { identifier: _ } => "steam-direct",
+            GamePlatform::OculusStore => "oculus-store",
+            GamePlatform::Other => "other",
         }
     }
 
@@ -121,7 +121,7 @@ pub struct GameDefR2MM {
     pub meta: GameDefMeta,
     pub internal_folder_name: String,
     pub data_folder_name: String,
-    pub distributions: Vec<GameDefPlatform>,
+    pub distributions: Vec<GamePlatform>,
     pub settings_identifier: String,
     pub package_index: String,
     pub steam_folder_name: String,