From ae4616fde2fa7025149ea72272644a63c4ba454a Mon Sep 17 00:00:00 2001
From: Jaby <fenir50@web.de>
Date: Fri, 28 Oct 2022 22:02:04 +0200
Subject: [PATCH] Write cue file

---
 src/Tools/cdtypes/src/types/cue/writer.rs     | 16 +++++++----
 src/Tools/psxcdgen_ex/src/encoder/psx.rs      |  2 +-
 .../psxcdgen_ex/src/file_writer/bin_cue.rs    | 27 ++++++++++++++-----
 src/Tools/psxcdgen_ex/src/file_writer/mod.rs  | 12 +++++++--
 4 files changed, 43 insertions(+), 14 deletions(-)

diff --git a/src/Tools/cdtypes/src/types/cue/writer.rs b/src/Tools/cdtypes/src/types/cue/writer.rs
index e1833603..80d43fbc 100644
--- a/src/Tools/cdtypes/src/types/cue/writer.rs
+++ b/src/Tools/cdtypes/src/types/cue/writer.rs
@@ -1,8 +1,12 @@
 use std::{fs::File, io::Write};
 use super::{{super::super::Error}, *};
 
-pub fn write(mut file: File, data: Vec<Specifier>) -> Result<(), Error> {
-    fn write_indent(file: &mut File, specifier: &Specifier) -> Result<(), Error> {
+pub fn write(file: File, data: Vec<Specifier>) -> Result<(), Error> {
+    write_generic(file, data)
+}
+
+pub fn write_generic<T: Write>(mut dst: T, data: Vec<Specifier>) -> Result<(), Error> {
+    fn write_indent<T: Write>(dst: &mut T, specifier: &Specifier) -> Result<(), Error> {
         let indent = {
             match specifier {
                 Specifier::File{..}  => 0,
@@ -11,14 +15,16 @@ pub fn write(mut file: File, data: Vec<Specifier>) -> Result<(), Error> {
             }
         };
 
-        write!(file, "{:indent$}", " ")?;
+        if indent > 0 {
+            write!(dst, "{:indent$}", " ")?;
+        }
         Ok(())
     }
 
     for specifier in data {
-        write_indent(&mut file, &specifier)?;
+        write_indent(&mut dst, &specifier)?;
         
-        write!(file, "{}\n", specifier)?;
+        write!(dst, "{}\n", specifier)?;
     }
 
     Ok(())
diff --git a/src/Tools/psxcdgen_ex/src/encoder/psx.rs b/src/Tools/psxcdgen_ex/src/encoder/psx.rs
index 6bb90c02..5b5ba14a 100644
--- a/src/Tools/psxcdgen_ex/src/encoder/psx.rs
+++ b/src/Tools/psxcdgen_ex/src/encoder/psx.rs
@@ -116,7 +116,7 @@ fn process_pvd(pvd: &PrimaryVolumeDescriptor, path_table: SharedPtr<PathTable>,
     //Config pvd here
     cd_pvd.system_id = AString::from_str(PLAYSATATION_STR)?;
     cd_pvd.volume_id = DString::from_str("PSX")?;
-    cd_pvd.vol_space_size.write(28 as u32);
+    cd_pvd.vol_space_size.write(vol_sector_count as u32);
 
     //Set PathTable values
     cd_pvd.path_table_size.write(path_table.size_bytes as u32);
diff --git a/src/Tools/psxcdgen_ex/src/file_writer/bin_cue.rs b/src/Tools/psxcdgen_ex/src/file_writer/bin_cue.rs
index 38501e97..9e9b6d7e 100644
--- a/src/Tools/psxcdgen_ex/src/file_writer/bin_cue.rs
+++ b/src/Tools/psxcdgen_ex/src/file_writer/bin_cue.rs
@@ -1,15 +1,21 @@
 use super::{Error, Sector, SectorWriter};
-use cdtypes::types::time::Time;
-use std::io::Write;
+use cdtypes::types::{cue::DataType as CueDataType, cue::Format as CueFormat, cue::Specifier as CueSpecifier, cue::writer::write_generic as cue_write_generic, time::Time};
+use std::{path::PathBuf, io::Write};
+use tool_helper::get_file_name_from_path_buf;
 
 pub struct BinCueWriter {
-    bin_out:      std::boxed::Box<dyn Write>,
-    cd_time:      Time,   
+    bin_out: std::boxed::Box<dyn Write>,
+    cd_time: Time,
+    cue:     Vec<CueSpecifier>,
 }
 
 impl BinCueWriter {
-    pub fn new<T: Write + 'static>(writer: T) -> BinCueWriter {
-        BinCueWriter{bin_out: std::boxed::Box::new(writer), cd_time: Time::cd_start()}
+    pub fn new<T: Write + 'static>(writer: T, cue_path: &PathBuf) -> Result<BinCueWriter, Error> {
+        Ok(BinCueWriter{bin_out: std::boxed::Box::new(writer), cd_time: Time::cd_start(), cue: Self::default_cue(cue_path)?})
+    }
+
+    pub fn write_cue<T: Write>(self, dst: T) -> Result<(), Error> {
+        Ok(cue_write_generic(dst, self.cue)?)
     }
 
     fn finalize(&mut self, sector: &mut Sector) -> Result<(), Error> {
@@ -22,6 +28,15 @@ impl BinCueWriter {
         self.cd_time.add_sector()?;
         Ok(())
     }
+
+    fn default_cue(cue_path: &PathBuf) -> Result<Vec<CueSpecifier>, Error> {
+        let mut cue = Vec::new();
+
+        cue.push(CueSpecifier::File{path: get_file_name_from_path_buf(cue_path, "cue output path")?, format: CueFormat::Binary});
+        cue.push(CueSpecifier::Track{number: 1, data_type: CueDataType::Mode2_2352});
+        cue.push(CueSpecifier::Index{number: 1, time: Time::cue_start()});
+        Ok(cue)
+    }
 }
 
 impl SectorWriter for BinCueWriter {
diff --git a/src/Tools/psxcdgen_ex/src/file_writer/mod.rs b/src/Tools/psxcdgen_ex/src/file_writer/mod.rs
index 7d6f34b8..cac02056 100644
--- a/src/Tools/psxcdgen_ex/src/file_writer/mod.rs
+++ b/src/Tools/psxcdgen_ex/src/file_writer/mod.rs
@@ -38,9 +38,17 @@ pub trait SectorWriter {
 pub fn write_image(cd_desc: CDDesc, encoder: EncoderFunction, image_type: ImageType, output_path: PathBuf) -> Result<(), Error> {
     match image_type {
         ImageType::BinCue => {
-            let mut writer = BinCueWriter::new(open_output_file(output_path)?);
+            let cue_output_path = {
+                let mut cue_output_path = output_path.clone();
 
-            encoder(cd_desc, &mut writer)
+                cue_output_path.set_extension("cue");
+                cue_output_path
+            };
+
+            let mut writer = BinCueWriter::new(open_output_file(output_path)?, &cue_output_path)?;
+            
+            encoder(cd_desc, &mut writer)?;
+            writer.write_cue(open_output_file(cue_output_path)?)
         }
     }
 }
\ No newline at end of file