Merge pull request #79 from jubako/r/0.3.2

New version 0.3.2

Cargo.toml

@@ -4,14 +4,14 @@ resolver = "2"
 
 [workspace.package]
 edition = "2021"
-version = "0.3.1"
+version = "0.3.2"
 authors = ["Matthieu Gautier <mgautier@kymeria.fr>"]
 repository = "https://github.com/jubako/arx"
 homepage = "https://github.com/jubako/arx"
 license = "MIT"
 
 [workspace.dependencies]
-jbk = { git = "https://github.com/jubako/jubako.git", package = "jubako", features = ["clap"], version = "0.3.2-dev" }
+jbk = { git = "https://github.com/jubako/jubako.git", package = "jubako", features = ["clap"], version = "0.3.3" }
 clap = { version = "4.4.5", features = ["derive", "cargo"] }
 clap_mangen = "0.2.20"
 clap_complete = "4.5.0"

Changelog.md

@@ -1,3 +1,17 @@
+# Arx 0.3.2
+
+- `--version` option now includes the git commit.
+- `arx create` has a new option `--follow-symlink` telling if arx must follow symlink or
+  create the entry as a symlink.
+- Fix various small issues when creating a arx giving a file to add through a file list (`-L` option).
+- Check input paths given on command line before starting arx creation.
+- Add help content to `arx create --help`.
+- Add more testing on arx command line.
+- Fix 32bits compilation of python wrapping.
+- Fix python CI publishing.
+- Use `jbk::cmd_utils` instead of our own.
+- Update README
+
 # Arx 0.3.1
 
 - Use version 0.3.1 of Jubako

arx/Cargo.toml

@@ -23,7 +23,7 @@ human-panic.workspace = true
 anyhow.workspace = true
 git-version.workspace = true
 const_format.workspace = true
-env_logger = "0.10.0"
+env_logger = "0.11.5"
 log = "0.4.20"
 tempfile = "3.10.1"
 libc = "0.2.158"

arx/tests/create.rs

@@ -28,6 +28,7 @@ macro_rules! cmd {
     ("arx", $sub_command:literal, $($args:expr),*) => {{
         let arx_bin = env!("CARGO_BIN_EXE_arx");
         let mut command = std::process::Command::new(&arx_bin);
+        command.env("NO_COLOR", "1");
         cmd!("{cmd}", command, $sub_command, $($args),*)
     }};
     ($prog:literal, $($args:expr),*) => {{

libarx/Cargo.toml

@@ -27,7 +27,7 @@ bstr = "1.9.1"
 log = "0.4.22"
 
 [target.'cfg(not(windows))'.dependencies]
-fuser = { version = "0.14.0", optional = true }
+fuser = { version = "0.15.0", optional = true }
 
 [features]
 cmd_utils = [ "dep:clap"]

libarx/src/arx_fs.rs

@@ -496,7 +496,13 @@ impl<'a, S: Stats> fuser::Filesystem for ArxFs<'a, S> {
         }
     }
 
-    fn getattr(&mut self, _req: &fuser::Request, ino: u64, reply: fuser::ReplyAttr) {
+    fn getattr(
+        &mut self,
+        _req: &fuser::Request,
+        ino: u64,
+        _fh: Option<u64>,
+        reply: fuser::ReplyAttr,
+    ) {
         self.stats.getattr();
         let ino = Ino::from(ino);
         match ino.try_into() {

python/Cargo.toml

@@ -18,4 +18,4 @@ crate-type = ["cdylib"]
 [dependencies]
 jbk.workspace = true
 arx = { path = "../libarx", version = "0.3.0", package = "libarx"}
-pyo3 = "0.22"
+pyo3 = "0.23"

python/src/arx.rs

@@ -10,7 +10,7 @@ use jbk::reader::MayMissPack;
 use pyo3::exceptions::PyRuntimeError;
 use pyo3::exceptions::{PyOSError, PyUnicodeDecodeError, PyValueError};
 use pyo3::prelude::*;
-use pyo3::types::PyUnicode;
+use pyo3::types::PyString;
 
 /// An Arx archive.
 ///
@@ -66,7 +66,7 @@ impl Arx {
 #[pymethods]
 impl Arx {
     #[new]
-    fn py_new(path: Bound<PyUnicode>) -> PyResult<Self> {
+    fn py_new(path: Bound<PyString>) -> PyResult<Self> {
         let path: std::path::PathBuf = path.extract()?;
         match arx::Arx::new(path) {
             Ok(a) => Ok(Self::new(a)),

python/src/stream.rs

@@ -20,7 +20,7 @@ impl Stream {
             self.0.read_exact(slice).unwrap();
             Ok(())
         };
-        pyo3::types::PyBytes::new_bound_with(py, size, read_fn)
+        pyo3::types::PyBytes::new_with(py, size, read_fn)
     }
 
     /// Get the full size of the stream.