bufrust 1.0.1__tar.gz → 1.0.2__tar.gz

{bufrust-1.0.1 → bufrust-1.0.2}/Cargo.lock

@@ -10,7 +10,7 @@ checksum = "f2032f911046de80f0a198e0901378627c33f59ea0ac00e363d481118bd70a53"
 
 [[package]]
 name = "bufrust"
-version = "1.0.1"
+version = "1.0.2"
 dependencies = [
  "csv",
  "pyo3",

{bufrust-1.0.1 → bufrust-1.0.2}/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "bufrust"
-version = "1.0.1"
+version = "1.0.2"
 edition = "2021"
 rust-version = "1.80"
 license = "Apache-2.0"

{bufrust-1.0.1 → bufrust-1.0.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: bufrust
-Version: 1.0.1
+Version: 1.0.2
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Intended Audience :: Science/Research
 Classifier: Programming Language :: Rust

{bufrust-1.0.1 → bufrust-1.0.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "maturin"
 
 [project]
 name = "bufrust"
-version = "1.0.1"
+version = "1.0.2"
 description = "Fast BUFR edition 4 parser and decoder powered by Rust"
 requires-python = ">=3.9"
 readme = "README.md"

{bufrust-1.0.1 → bufrust-1.0.2}/python/bufrust/__init__.py

@@ -24,7 +24,7 @@ from ._bufrust import (
     parse_file,
 )
 
-__version__ = "1.0.1"
+__version__ = "1.0.2"
 
 
 class BufrustError(ValueError):

bufrust-1.0.2/python/bufrust/definitions/bufr/tables/0/wmo/10

@@ -0,0 +1 @@
+13

bufrust-1.0.2/python/bufrust/definitions/bufr/tables/0/wmo/11

@@ -0,0 +1 @@
+13

bufrust-1.0.2/python/bufrust/definitions/bufr/tables/0/wmo/12

@@ -0,0 +1 @@
+13

bufrust-1.0.2/python/bufrust/definitions/bufr/tables/0/wmo/7

@@ -0,0 +1 @@
+13

bufrust-1.0.2/python/bufrust/definitions/bufr/tables/0/wmo/8

@@ -0,0 +1 @@
+13

bufrust-1.0.2/python/bufrust/definitions/bufr/tables/0/wmo/9

@@ -0,0 +1 @@
+13

{bufrust-1.0.1 → bufrust-1.0.2}/src/lib.rs

@@ -45,6 +45,7 @@ fn expand_descriptors(table_dir: &str, descriptors: Vec<u32>) -> PyResult<Vec<u3
 
 #[pyfunction]
 fn decode_values(data: &[u8], table_dir: &str) -> PyResult<Vec<DecodedValue>> {
+    let data = first_message_data(data).map_err(tables::to_py_err)?;
     let message = parse_message(data).map_err(tables::to_py_err)?;
     let tables = TableSet::from_eccodes_dir(table_dir).map_err(tables::to_py_err)?;
     let section4 = &data
@@ -54,6 +55,7 @@ fn decode_values(data: &[u8], table_dir: &str) -> PyResult<Vec<DecodedValue>> {
 
 #[pyfunction]
 fn decode_values_with_tables(data: &[u8], tables: &TableSet) -> PyResult<Vec<DecodedValue>> {
+    let data = first_message_data(data).map_err(tables::to_py_err)?;
     let message = parse_message(data).map_err(tables::to_py_err)?;
     let section4 = &data
         [message.section4_data_offset..message.section4_data_offset + message.section4_data_length];
@@ -65,6 +67,7 @@ fn decode_values_with_definitions(
     data: &[u8],
     definitions_root: &str,
 ) -> PyResult<Vec<DecodedValue>> {
+    let data = first_message_data(data).map_err(tables::to_py_err)?;
     let message = parse_message(data).map_err(tables::to_py_err)?;
     let tables = TableSet::from_eccodes_definitions(definitions_root, &message)
         .map_err(tables::to_py_err)?;
@@ -74,6 +77,7 @@ fn decode_values_with_definitions(
 }
 
 pub fn decode_values_with_builtin_tables(data: &[u8]) -> Result<Vec<DecodedValue>> {
+    let data = first_message_data(data)?;
     let message = parse_message(data)?;
     let tables = TableSet::from_builtin_definitions(&message)?;
     let section4 = &data
@@ -81,6 +85,13 @@ pub fn decode_values_with_builtin_tables(data: &[u8]) -> Result<Vec<DecodedValue
     decode_uncompressed_values(&message, &tables, section4)
 }
 
+fn first_message_data(data: &[u8]) -> Result<&[u8]> {
+    split_messages(data)?
+        .into_iter()
+        .next()
+        .ok_or(BufrError::MissingMagic)
+}
+
 #[pymodule]
 fn _bufrust(m: &Bound<'_, PyModule>) -> PyResult<()> {
     m.add_class::<BufrMessage>()?;

{bufrust-1.0.1 → bufrust-1.0.2}/src/tables.rs

@@ -87,12 +87,13 @@ impl TableSet {
 
     pub fn from_eccodes_definitions(root: impl AsRef<Path>, message: &BufrMessage) -> Result<Self> {
         let root = root.as_ref();
-        let master_dir = root
-            .join("bufr")
-            .join("tables")
-            .join(message.master_table_number.to_string())
-            .join("wmo")
-            .join(message.master_tables_version_number.to_string());
+        let master_dir = resolve_eccodes_table_dir(
+            root.join("bufr")
+                .join("tables")
+                .join(message.master_table_number.to_string())
+                .join("wmo")
+                .join(message.master_tables_version_number.to_string()),
+        )?;
         let mut tables = Self::from_eccodes_dir(master_dir)?;
         if message.local_tables_version_number != 0 {
             let local_dir = local_table_dir(root, message);
@@ -450,6 +451,33 @@ fn matching_files(path: &Path, prefix: &str, suffix: &str) -> Result<Vec<PathBuf
     Ok(files)
 }
 
+fn resolve_eccodes_table_dir(path: PathBuf) -> Result<PathBuf> {
+    if path.is_dir() {
+        return Ok(path);
+    }
+    if path.is_file() {
+        let alias = std::fs::read_to_string(&path)?;
+        let alias = alias.trim();
+        if alias.is_empty()
+            || alias.contains(std::path::MAIN_SEPARATOR)
+            || alias.contains('/')
+            || alias.contains('\\')
+        {
+            return Err(BufrError::Table(format!(
+                "invalid ecCodes table alias {} -> {alias:?}",
+                path.display()
+            )));
+        }
+        if let Some(parent) = path.parent() {
+            return resolve_eccodes_table_dir(parent.join(alias));
+        }
+    }
+    Err(BufrError::Table(format!(
+        "ecCodes table directory does not exist: {}",
+        path.display()
+    )))
+}
+
 fn unit_to_type(unit: &str) -> &'static str {
     match unit {
         "CCITT IA5" => "string",

{bufrust-1.0.1 → bufrust-1.0.2}/tests/fixture_decode.rs

@@ -33,3 +33,28 @@ fn decodes_rjtd_drifting_buoy_fixture() {
     assert_eq!(values[0].descriptor, 001087);
     assert_eq!(values[0].value, Some(2_102_606.0));
 }
+
+#[test]
+fn decodes_rjtd_iucc10_fixture() {
+    let bytes = include_bytes!("fixtures/rjtd_iucc10.bufr");
+    let messages = parse_messages(bytes).unwrap();
+
+    assert_eq!(messages.len(), 1);
+    assert_eq!(messages[0].originating_centre, 34);
+    assert_eq!(messages[0].data_category, 12);
+    assert_eq!(messages[0].master_tables_version_number, 12);
+    assert_eq!(messages[0].typical_year, 2025);
+    assert_eq!(messages[0].typical_month, 8);
+    assert_eq!(messages[0].typical_day, 22);
+
+    let values = decode_values_with_builtin_tables(bytes).unwrap();
+    assert_eq!(values.len(), 32);
+    assert_eq!(values[7].descriptor, 001007);
+    assert_eq!(values[7].value, Some(174.0));
+    assert_eq!(values[10].descriptor, 001027);
+    assert_eq!(values[10].text.as_deref(), Some("nameless"));
+    assert_eq!(values[14].descriptor, 005002);
+    assert_eq!(values[14].value, Some(17.34));
+    assert_eq!(values[15].descriptor, 006002);
+    assert_eq!(values[15].value, Some(117.8));
+}