dece/RustedIronRing
Archived
1
0
Fork 0
Code Issues Pull requests Releases Activity

Revert "python: faulty unpackers::bnd bindings"

Browse source 
This reverts commit 0ad0124b55.
This commit is contained in:
dece 2020-05-15 19:21:37 +02:00
parent 0ad0124b55
commit 4777affc2b
1 changed files with 0 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
bindings/python/src/lib.rs
View file

@ -1,20 +1,8 @@
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::*;
@ -37,27 +25,8 @@ fn name_hashes(_py: Python, m: &PyModule) -> PyResult<()> {
Ok(()) Ok(())
} }
#[pymodule]
fn unpack_bnd(_py: Python, m: &PyModule) -> PyResult<()> {
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] #[pymodule]
fn pyironring(_py: Python, m: &PyModule) -> PyResult<()> { fn pyironring(_py: Python, m: &PyModule) -> PyResult<()> {
m.add_wrapped(wrap_pymodule!(name_hashes))?; m.add_wrapped(wrap_pymodule!(name_hashes))?;
m.add_wrapped(wrap_pymodule!(unpack_bnd))?;
Ok(()) Ok(())
} }