Update to point to new factorio-file-parser lib

Cargo.toml

@@ -13,7 +13,7 @@ bytes = "1.0"
 chrono = { version = "0.4.37", features = [ "serde" ] }
 derive_more = "0.99"
 env_logger = "0.11.3"
-factorio-mod-settings-parser = { git = "https://github.com/circlesabound/factorio-mod-settings-parser", rev = "a9fecd6" }
+factorio-file-parser = { git = "https://github.com/circlesabound/factorio-file-parser", rev = "172a700" }
 futures = "0.3"
 futures-util = "0.3"
 http = "1.0"

src/agent/error.rs

@@ -23,9 +23,9 @@ pub enum Error {
     Aggregate(Vec<Error>),
 
     // Generic wrappers around external error types
+    FactorioDatFileSerde(factorio_file_parser::Error),
     Io(std::io::Error),
     Json(serde_json::error::Error),
-    ModSettingsSerde(factorio_mod_settings_parser::Error),
     Rcon(rcon::Error),
     Reqwest(reqwest::Error),
     TomlDe(toml::de::Error),
@@ -52,9 +52,9 @@ impl From<serde_json::error::Error> for Error {
     }
 }
 
-impl From<factorio_mod_settings_parser::Error> for Error {
-    fn from(e: factorio_mod_settings_parser::Error) -> Self {
-        Error::ModSettingsSerde(e)
+impl From<factorio_file_parser::Error> for Error {
+    fn from(e: factorio_file_parser::Error) -> Self {
+        Error::FactorioDatFileSerde(e)
     }
 }
 

src/agent/main.rs

@@ -18,7 +18,7 @@ use crate::{
     },
 };
 use chrono::Utc;
-use factorio_mod_settings_parser::ModSettings;
+use factorio_file_parser::ModSettings;
 use fctrl::schema::*;
 use futures::Sink;
 use futures_util::{

src/agent/server/mods.rs

@@ -4,7 +4,7 @@ use std::{
     path::{Path, PathBuf},
 };
 
-use factorio_mod_settings_parser::ModSettings;
+use factorio_file_parser::ModSettings;
 use futures::future;
 use lazy_static::lazy_static;
 use log::{debug, error, info};

src/mgmt-server/error.rs

@@ -27,10 +27,10 @@ pub enum Error {
     Rpc(String),
 
     // Specific errors
+    FactorioDatFileParseError(factorio_file_parser::Error),
     DiscordAlertingDisabled,
     InvalidLink,
     ModSettingsNotInitialised,
-    ModSettingsParseError(factorio_mod_settings_parser::Error),
     SaveNotFound,
     SecretsNotInitialised,
 
@@ -51,9 +51,9 @@ impl std::fmt::Display for Error {
     }
 }
 
-impl From<factorio_mod_settings_parser::Error> for Error {
-    fn from(e: factorio_mod_settings_parser::Error) -> Self {
-        Error::ModSettingsParseError(e)
+impl From<factorio_file_parser::Error> for Error {
+    fn from(e: factorio_file_parser::Error) -> Self {
+        Error::FactorioDatFileParseError(e)
     }
 }
 
@@ -121,7 +121,7 @@ impl<'r> Responder<'r, 'static> for Error {
             | Error::Io(_)
             | Error::Json(_)
             | Error::Reqwest(_)
-            | Error::ModSettingsParseError(_)
+            | Error::FactorioDatFileParseError(_)
             | Error::Misconfiguration(_)
             | Error::NotImplemented
             | Error::Rpc(_) => Status::InternalServerError,

src/mgmt-server/routes/server.rs

@@ -4,7 +4,7 @@ use std::{
     time::Duration,
 };
 
-use factorio_mod_settings_parser::ModSettings;
+use factorio_file_parser::ModSettings;
 use fctrl::schema::{
     mgmt_server_rest::*, FactorioVersion, ModSettingsBytes, RconConfig, SecretsObject, ServerSettingsConfig, ServerStartSaveFile, ServerStatus
 };
@@ -13,7 +13,7 @@ use rocket::{get, post, put};
 use rocket::{http::Status, State};
 
 use crate::{
-    auth::AuthorizedUser, clients::AgentApiClient, guards::HostHeader, link_download::{LinkDownloadManager, LinkDownloadTarget}, routes::ContentDisposition, ws::WebSocketServer
+    auth::AuthorizedUser, clients::AgentApiClient, guards::HostHeader, link_download::{LinkDownloadManager, LinkDownloadTarget}, ws::WebSocketServer
 };
 use crate::{error::Result, routes::WsStreamingResponder};