move new_from_name into game::import

Author: ethangreen-dev

src/game/import/mod.rs

@@ -125,6 +125,21 @@ pub fn find_game_exe(possible: &[String], base_path: &Path) -> Option<PathBuf> {
         .find(|x| x.is_file())
 }
 
+/// Convert the provided game id and platform name to a full GamePlatform instance, if
+/// one can be found in the ecosystem schema.
+pub async fn plat_from_name(game_id: &str, plat_name: &str) -> Result<GamePlatform, Error> {
+    let ecosystem = ecosystem::get_schema().await?;
+    let game = ecosystem.games.get(game_id)
+        .ok_or(GameError::BadGameId(game_id.into()))?;
+
+    game
+        .distributions
+        .iter()
+        .find(|x| x.get_platform_name() == plat_name)
+        .ok_or(GameError::NotSupported(game_id.into(), plat_name.into()).into())
+        .cloned()
+}
+
 pub fn construct_data(base: ImportBase, dist: ActiveDistribution) -> GameData {
     GameData {
         identifier: base

src/main.rs

@@ -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 = GamePlatform::new_from_name(&game_id, &platform).await?;
+                let platform = game::import::plat_from_name(&game_id, &platform).await?;
                 let dist = import_base.get_active_dist(&platform)?;
 
                 if dist.is_none() {

src/ts/v1/models/ecosystem.rs

@@ -97,22 +97,6 @@ impl GamePlatform {
             "other",
         ]
     }
-
-    /// Create a new instance of self from the provided platform name and identifier, if
-    /// a valid one can be found.
-    pub async fn new_from_name(game_id: &str, plat_name: &str) -> Result<Self, Error> {
-        let ecosystem = ecosystem::get_schema().await?;
-        let game = ecosystem.games.get(game_id)
-            .ok_or(GameError::BadGameId(game_id.into()))?;
-
-        game
-            .distributions
-            .iter()
-            .find(|x| x.get_platform_name() == plat_name)
-            .ok_or(GameError::NotSupported(game_id.into(), plat_name.into()).into())
-            .cloned()
-    }
-
 }
 
 #[derive(Serialize, Deserialize, Debug, Clone)]