chore: move tiff tag structs to top level (#150)

* move tiff tag structs to top level

* Move code out of historical `tiff` module

* Rename `cog.rs` to `tiff.rs`

* Rename Value to TagValue

* fmt

Author: kylebarron

python/src/decoder.rs

@@ -3,7 +3,7 @@ use std::sync::Arc;
 
 use async_tiff::decoder::{Decoder, DecoderRegistry};
 use async_tiff::error::{AsyncTiffError, AsyncTiffResult};
-use async_tiff::tiff::tags::PhotometricInterpretation;
+use async_tiff::tags::PhotometricInterpretation;
 use bytes::Bytes;
 use pyo3::exceptions::PyTypeError;
 use pyo3::intern;

python/src/enums.rs

@@ -1,5 +1,5 @@
 use async_tiff::reader::Endianness;
-use async_tiff::tiff::tags::{
+use async_tiff::tags::{
     CompressionMethod, PhotometricInterpretation, PlanarConfiguration, Predictor, ResolutionUnit,
     SampleFormat,
 };

python/src/value.rs

@@ -1,9 +1,9 @@
-use async_tiff::tiff::Value;
+use async_tiff::TagValue;
 use pyo3::exceptions::PyRuntimeError;
 use pyo3::prelude::*;
 use pyo3::IntoPyObjectExt;
 
-pub struct PyValue(Value);
+pub struct PyValue(TagValue);
 
 impl<'py> IntoPyObject<'py> for PyValue {
     type Target = PyAny;
@@ -12,37 +12,39 @@ impl<'py> IntoPyObject<'py> for PyValue {
 
     fn into_pyobject(self, py: Python<'py>) -> Result<Self::Output, Self::Error> {
         match self.0 {
-            Value::Byte(val) => val.into_bound_py_any(py),
-            Value::Short(val) => val.into_bound_py_any(py),
-            Value::SignedByte(val) => val.into_bound_py_any(py),
-            Value::SignedShort(val) => val.into_bound_py_any(py),
-            Value::Signed(val) => val.into_bound_py_any(py),
-            Value::SignedBig(val) => val.into_bound_py_any(py),
-            Value::Unsigned(val) => val.into_bound_py_any(py),
-            Value::UnsignedBig(val) => val.into_bound_py_any(py),
-            Value::Float(val) => val.into_bound_py_any(py),
-            Value::Double(val) => val.into_bound_py_any(py),
-            Value::List(val) => val
+            TagValue::Byte(val) => val.into_bound_py_any(py),
+            TagValue::Short(val) => val.into_bound_py_any(py),
+            TagValue::SignedByte(val) => val.into_bound_py_any(py),
+            TagValue::SignedShort(val) => val.into_bound_py_any(py),
+            TagValue::Signed(val) => val.into_bound_py_any(py),
+            TagValue::SignedBig(val) => val.into_bound_py_any(py),
+            TagValue::Unsigned(val) => val.into_bound_py_any(py),
+            TagValue::UnsignedBig(val) => val.into_bound_py_any(py),
+            TagValue::Float(val) => val.into_bound_py_any(py),
+            TagValue::Double(val) => val.into_bound_py_any(py),
+            TagValue::List(val) => val
                 .into_iter()
                 .map(|v| PyValue(v).into_bound_py_any(py))
                 .collect::<PyResult<Vec<_>>>()?
                 .into_bound_py_any(py),
-            Value::Rational(num, denom) => (num, denom).into_bound_py_any(py),
-            Value::RationalBig(num, denom) => (num, denom).into_bound_py_any(py),
-            Value::SRational(num, denom) => (num, denom).into_bound_py_any(py),
-            Value::SRationalBig(num, denom) => (num, denom).into_bound_py_any(py),
-            Value::Ascii(val) => val.into_bound_py_any(py),
-            Value::Ifd(_val) => Err(PyRuntimeError::new_err("Unsupported value type 'Ifd'")),
-            Value::IfdBig(_val) => Err(PyRuntimeError::new_err("Unsupported value type 'IfdBig'")),
+            TagValue::Rational(num, denom) => (num, denom).into_bound_py_any(py),
+            TagValue::RationalBig(num, denom) => (num, denom).into_bound_py_any(py),
+            TagValue::SRational(num, denom) => (num, denom).into_bound_py_any(py),
+            TagValue::SRationalBig(num, denom) => (num, denom).into_bound_py_any(py),
+            TagValue::Ascii(val) => val.into_bound_py_any(py),
+            TagValue::Ifd(_val) => Err(PyRuntimeError::new_err("Unsupported value type 'Ifd'")),
+            TagValue::IfdBig(_val) => {
+                Err(PyRuntimeError::new_err("Unsupported value type 'IfdBig'"))
+            }
             v => Err(PyRuntimeError::new_err(format!(
                 "Unknown value type: {v:?}"
             ))),
         }
     }
 }
 
-impl From<Value> for PyValue {
-    fn from(value: Value) -> Self {
+impl From<TagValue> for PyValue {
+    fn from(value: TagValue) -> Self {
         Self(value)
     }
 }

src/decoder.rs

@@ -7,9 +7,8 @@ use std::io::{Cursor, Read};
 use bytes::Bytes;
 use flate2::bufread::ZlibDecoder;
 
-use crate::error::AsyncTiffResult;
-use crate::tiff::tags::{CompressionMethod, PhotometricInterpretation};
-use crate::tiff::{TiffError, TiffUnsupportedError};
+use crate::error::{AsyncTiffResult, TiffError, TiffUnsupportedError};
+use crate::tags::{CompressionMethod, PhotometricInterpretation};
 
 /// A registry of decoders.
 ///