python: faulty unpackers::bnd bindings
It would require to add an implementation to Bnd directly to convert it to a Python class. Committing for history but gonna revert it before merge.
This commit is contained in:
parent
fb3212fd1a
commit
0ad0124b55
|
@ -1,8 +1,20 @@
|
||||||
use std::collections::HashMap;
|
use std::collections::HashMap;
|
||||||
|
|
||||||
use pyo3::wrap_pymodule;
|
use pyo3::wrap_pymodule;
|
||||||
|
use pyo3::exceptions::RuntimeError;
|
||||||
use pyo3::prelude::*;
|
use pyo3::prelude::*;
|
||||||
|
|
||||||
|
fn runtime_error(message: String) -> PyErr {
|
||||||
|
RuntimeError::py_err(message)
|
||||||
|
}
|
||||||
|
|
||||||
|
fn wrap_ironring_errors<T, E: std::fmt::Debug>(result: Result<T, E>) -> PyResult<T> {
|
||||||
|
match result {
|
||||||
|
Ok(r) => Ok(r),
|
||||||
|
Err(e) => Err(runtime_error(format!("{:?}", e))),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
#[pymodule]
|
#[pymodule]
|
||||||
fn name_hashes(_py: Python, m: &PyModule) -> PyResult<()> {
|
fn name_hashes(_py: Python, m: &PyModule) -> PyResult<()> {
|
||||||
use ironring::name_hashes::*;
|
use ironring::name_hashes::*;
|
||||||
|
@ -26,7 +38,26 @@ fn name_hashes(_py: Python, m: &PyModule) -> PyResult<()> {
|
||||||
}
|
}
|
||||||
|
|
||||||
#[pymodule]
|
#[pymodule]
|
||||||
fn pyironring(_py: Python, m: &PyModule) -> PyResult<()> {
|
fn unpack_bnd(_py: Python, m: &PyModule) -> PyResult<()> {
|
||||||
m.add_wrapped(wrap_pymodule!(name_hashes))?;
|
use ironring::unpackers::bnd::*;
|
||||||
|
use ironring::parsers::bnd::Bnd;
|
||||||
|
|
||||||
|
#[pyfn(m, "load_bnd_file")]
|
||||||
|
fn py_load_bnd_file(_py: Python, bnd_path: &str) -> PyResult<(Bnd, Vec<u8>)> {
|
||||||
|
wrap_ironring_errors(load_bnd_file(bnd_path))
|
||||||
|
}
|
||||||
|
|
||||||
|
#[pyfn(m, "load_bnd")]
|
||||||
|
fn py_load_bnd(_py: Python, bnd_data: &[u8]) -> PyResult<Bnd> {
|
||||||
|
wrap_ironring_errors(load_bnd(bnd_data))
|
||||||
|
}
|
||||||
|
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
#[pymodule]
|
||||||
|
fn pyironring(_py: Python, m: &PyModule) -> PyResult<()> {
|
||||||
|
m.add_wrapped(wrap_pymodule!(name_hashes))?;
|
||||||
|
m.add_wrapped(wrap_pymodule!(unpack_bnd))?;
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|
Reference in a new issue