Use imperator constant mem melting

rakaly · Jan 17, 2024 · a8deea6 · a8deea6
1 parent bb41a43
commit a8deea6
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 34 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/src/json.rs b/src/json.rs
@@ -9,10 +9,7 @@ use hoi4save::{
     file::{Hoi4ParsedFileKind, Hoi4Text},
     Hoi4File,
 };
-use imperator_save::{
-    file::{ImperatorParsedFileKind, ImperatorText},
-    ImperatorFile,
-};
+use imperator_save::{file::ImperatorText, ImperatorFile};
 use jomini::{
     json::{DuplicateKeyMode, JsonOptions},
     TextTape,
@@ -124,28 +121,21 @@ impl JsonCommand {
             }
             Some(x) if x == "rome" => {
                 let file = ImperatorFile::from_slice(&data)?;
-                let mut zip_sink = Vec::new();
-                let parsed_file = file.parse(&mut zip_sink)?;
-                match parsed_file.kind() {
-                    ImperatorParsedFileKind::Text(text) => text
-                        .reader()
-                        .json()
-                        .with_options(options)
-                        .to_writer(std::io::stdout()),
-                    ImperatorParsedFileKind::Binary(binary) => {
-                        let melted = binary
-                            .melter()
-                            .verbatim(verbatim)
-                            .on_failed_resolve(strategy)
-                            .melt(&imperator_save::EnvTokens)?;
-                        ImperatorText::from_slice(melted.data())
-                            .context("unable to parse melted imperator output")?
-                            .reader()
-                            .json()
-                            .with_options(options)
-                            .to_writer(std::io::stdout())
-                    }
-                }
+                let mut out = Cursor::new(Vec::new());
+                let text = if !matches!(file.encoding(), imperator_save::Encoding::Text) {
+                    file.melter()
+                        .on_failed_resolve(strategy)
+                        .verbatim(verbatim)
+                        .melt(&mut out, &imperator_save::EnvTokens)?;
+                    ImperatorText::from_slice(out.get_ref().as_slice())?
+                } else {
+                    ImperatorText::from_slice(&data)?
+                };
+
+                text.reader()
+                    .json()
+                    .with_options(options)
+                    .to_writer(std::io::stdout())
             }
             Some(x) if x == "hoi4" => {
                 let file = Hoi4File::from_slice(&data)?;

diff --git a/src/melt.rs b/src/melt.rs
@@ -130,15 +130,11 @@ impl Melter {
             }
             MelterKind::Imperator => {
                 let file = imperator_save::ImperatorFile::from_slice(data)?;
-                let mut zip_sink = Vec::new();
-                let parsed_file = file.parse(&mut zip_sink)?;
-                let binary = parsed_file.as_binary().context("not imperator binary")?;
-                let out = binary
+                let out = file
                     .melter()
                     .on_failed_resolve(self.options.resolve)
                     .verbatim(self.options.retain)
-                    .melt(&imperator_save::EnvTokens)?;
-                writer.write_all(out.data())?;
+                    .melt(writer, &imperator_save::EnvTokens)?;
                 Ok(MeltedDocument::Imperator(out))
             }
             MelterKind::Vic3 => {