Adapt to new jbk utf8 locator (#104)

Author: mgautierfr

Cargo.lock

@@ -4,7 +4,7 @@ use log::{debug, info};
 use std::cell::Cell;
 use std::fs::File;
 use std::io::{BufRead, BufReader};
-use std::path::{Path, PathBuf};
+use std::path::{absolute, Path, PathBuf};
 use std::rc::Rc;
 use std::sync::Arc;
 
@@ -86,7 +86,7 @@ pub struct Options {
         required_unless_present("list_compressions"),
         value_hint=ValueHint::FilePath,
     )]
-    outfile: Option<PathBuf>,
+    outfile: Option<jbk::Utf8PathBuf>,
 
     /// Remove STRIP_PREFIX from the entries' name added to the archive.
     #[arg(long, required = false, value_hint=ValueHint::DirPath, help_heading="Input options")]
@@ -192,6 +192,7 @@ fn check_input_paths_exist(file_list: &[PathBuf]) -> Result<()> {
 }
 
 fn check_output_path_writable(out_file: &Path, force: bool) -> Result<()> {
+    let out_file = absolute(out_file)?;
     if !out_file.parent().unwrap().is_dir() {
         Err(anyhow!(
             "Directory {} doesn't exist",
@@ -282,8 +283,7 @@ pub fn create(options: Options) -> Result<()> {
     let out_file = options.outfile.as_ref().expect(
         "Clap unsure it is Some, except if we have list_compressions, and so we return early",
     );
-    let out_file = std::env::current_dir()?.join(out_file);
-    check_output_path_writable(&out_file, options.force)?;
+    check_output_path_writable(out_file.as_std_path(), options.force)?;
 
     info!("Creating archive {:?}", out_file);
     let file_list = options
@@ -302,7 +302,7 @@ pub fn create(options: Options) -> Result<()> {
     };
     let cache_progress = Rc::new(CachedSize::new());
     let mut creator = arx::create::SimpleCreator::new(
-        &out_file,
+        out_file,
         match options.concat_mode {
             None => jbk::creator::ConcatMode::OneFile,
             Some(e) => e.into(),
@@ -341,7 +341,7 @@ pub fn create(options: Options) -> Result<()> {
         }
     };
 
-    let ret = creator.finalize(&out_file);
+    let ret = creator.finalize();
     debug!("Saved place is {}", cache_progress.0.get());
     Ok(ret?)
 }

arx/src/create.rs

@@ -44,8 +44,7 @@ fn dump_entry(
                 MayMissPack::MISSING(pack_info) => {
                     eprintln!(
                         "Missing pack {}. Declared location is {}",
-                        pack_info.uuid,
-                        String::from_utf8_lossy(&pack_info.pack_location)
+                        pack_info.uuid, pack_info.pack_location
                     );
                 }
             }

arx/src/dump.rs

@@ -1,4 +1,3 @@
-use std::path::Path;
 use std::rc::Rc;
 use std::sync::Arc;
 
@@ -12,8 +11,8 @@ pub struct SimpleCreator {
 }
 
 impl SimpleCreator {
-    pub fn new<P: AsRef<Path>>(
-        outfile: P,
+    pub fn new(
+        outfile: impl AsRef<jbk::Utf8Path>,
         concat_mode: ConcatMode,
         progress: Arc<dyn jbk::creator::Progress>,
         cache_progress: Rc<dyn jbk::creator::CacheProgress>,
@@ -37,12 +36,11 @@ impl SimpleCreator {
         })
     }
 
-    pub fn finalize(self, outfile: &Path) -> Void {
-        Ok(self.cached_content_creator.into_inner().finalize(
-            outfile,
-            self.entry_store_creator,
-            vec![],
-        )?)
+    pub fn finalize(self) -> Void {
+        Ok(self
+            .cached_content_creator
+            .into_inner()
+            .finalize(self.entry_store_creator, vec![])?)
     }
 
     pub fn adder(&mut self) -> &mut impl ContentAdder {

libarx/src/create/creator.rs

@@ -310,7 +310,7 @@ where
                     "Missing pack {} for {}. Declared location is {}",
                     pack_info.uuid,
                     abs_path.display(),
-                    String::from_utf8_lossy(&pack_info.pack_location)
+                    pack_info.pack_location
                 );
             }
         }

libarx/src/tools.rs

@@ -16,13 +16,12 @@ use pyo3::prelude::*;
 pub struct Creator {
     started: bool,
     creator: Option<SimpleCreator>,
-    outfile: PathBuf,
 }
 
 #[pymethods]
 impl Creator {
     #[new]
-    fn new(outfile: PathBuf) -> PyResult<Self> {
+    fn new(outfile: String) -> PyResult<Self> {
         Ok(Self {
             started: false,
             creator: Some(
@@ -35,7 +34,6 @@ impl Creator {
                 )
                 .map_err(|e| PyRuntimeError::new_err(e.to_string()))?,
             ),
-            outfile,
         })
     }
 
@@ -63,7 +61,7 @@ impl Creator {
         match slf.creator.take() {
             None => Err(PyRuntimeError::new_err("Creator already finalized")),
             Some(creator) => creator
-                .finalize(&slf.outfile)
+                .finalize()
                 .map_err(|e| PyRuntimeError::new_err(e.to_string())),
         }
     }

python/src/creator.rs

@@ -4,7 +4,6 @@ use clap::{CommandFactory, Parser, ValueHint};
 use anyhow::{anyhow, Result};
 use jbk::creator::ContentAdder;
 use std::io::Read;
-use std::path::{Path, PathBuf};
 use std::rc::Rc;
 use std::sync::Arc;
 
@@ -36,7 +35,7 @@ struct Cli {
         value_parser,
         value_hint=ValueHint::FilePath
     )]
-    outfile: Option<PathBuf>,
+    outfile: Option<jbk::Utf8PathBuf>,
 
     #[command(flatten)]
     concat_mode: Option<jbk::cmd_utils::ConcatMode>,
@@ -239,9 +238,9 @@ impl arx::create::EntryTrait for TarEntry {
 }
 
 impl<R: Read> Converter<R> {
-    pub fn new<P: AsRef<Path>>(
+    pub fn new(
         archive: tar::Archive<R>,
-        outfile: P,
+        outfile: impl AsRef<jbk::Utf8Path>,
         concat_mode: jbk::creator::ConcatMode,
         compression: jbk::creator::Compression,
         progress_bar: indicatif::ProgressBar,
@@ -261,19 +260,19 @@ impl<R: Read> Converter<R> {
         })
     }
 
-    fn finalize(self, outfile: &Path) -> Result<(), arx::CreatorError> {
-        self.arx_creator.finalize(outfile)
+    fn finalize(self) -> Result<(), arx::CreatorError> {
+        self.arx_creator.finalize()
     }
 
-    pub fn run(mut self, outfile: &Path) -> Result<(), arx::CreatorError> {
+    pub fn run(mut self) -> Result<(), arx::CreatorError> {
         let iter = self.archive.entries()?;
         for entry in iter {
             let entry = entry?;
             if let Some(entry) = TarEntry::new(entry, self.arx_creator.adder())? {
                 self.arx_creator.add_entry(&entry)?;
             }
         }
-        self.finalize(outfile)
+        self.finalize()
     }
 }
 
@@ -312,9 +311,9 @@ fn main() -> Result<()> {
     }
 
     let outfile = args.outfile.unwrap_or_else(|| {
-        let p = Path::new(args.tar_file.as_ref().unwrap());
+        let p = jbk::Utf8Path::new(args.tar_file.as_ref().unwrap());
         let p = if p.starts_with("https://") || p.starts_with("http://") {
-            Path::new(p.file_name().unwrap())
+            jbk::Utf8Path::new(p.file_name().unwrap())
                 .with_extension("")
                 .with_extension("arx")
         } else {
@@ -362,5 +361,5 @@ fn main() -> Result<()> {
         args.compression,
         progress_bar,
     )?;
-    Ok(converter.run(&outfile)?)
+    Ok(converter.run()?)
 }

tar2arx/src/main.rs

@@ -41,7 +41,7 @@ struct Cli {
         ),
         value_hint=ValueHint::FilePath
     )]
-    outfile: Option<PathBuf>,
+    outfile: Option<jbk::Utf8PathBuf>,
 
     #[command(flatten)]
     concat_mode: Option<jbk::cmd_utils::ConcatMode>,
@@ -226,10 +226,10 @@ impl arx::create::EntryTrait for ZipEntry {
 }
 
 impl<R: Read + Seek> Converter<R> {
-    pub fn new<P: AsRef<Path>>(
+    pub fn new(
         archive: zip::ZipArchive<R>,
         archive_path: PathBuf,
-        outfile: P,
+        outfile: impl AsRef<jbk::Utf8Path>,
         concat_mode: jbk::creator::ConcatMode,
     ) -> Result<Self, arx::CreatorError> {
         let progress = Arc::new(ProgressBar::new(&archive));
@@ -249,18 +249,18 @@ impl<R: Read + Seek> Converter<R> {
         })
     }
 
-    fn finalize(self, outfile: &Path) -> Result<(), arx::CreatorError> {
-        self.arx_creator.finalize(outfile)
+    fn finalize(self) -> Result<(), arx::CreatorError> {
+        self.arx_creator.finalize()
     }
 
-    pub fn run(mut self, outfile: &Path) -> Result<(), arx::CreatorError> {
+    pub fn run(mut self) -> Result<(), arx::CreatorError> {
         for idx in 0..self.archive.len() {
             self.progress.entries.inc(1);
             let entry = self.archive.by_index(idx).unwrap();
             let entry = ZipEntry::new(entry, self.arx_creator.adder(), &self.archive_path)?;
             self.arx_creator.add_entry(&entry)?;
         }
-        self.finalize(outfile)
+        self.finalize()
     }
 }
 
@@ -302,5 +302,5 @@ fn main() -> Result<(), arx::CreatorError> {
             Some(e) => e.into(),
         },
     )?;
-    converter.run(args.outfile.as_ref().unwrap())
+    converter.run()
 }