Merge pull request #15 from eta077/main

Prep for 0.0.3 release

.github/dependabot.yml

@@ -0,0 +1,6 @@
+version: 2
+updates:
+  - package-ecosystem: "cargo"
+    directory: "/"
+    schedule:
+      interval: "weekly"

Cargo.toml

@@ -1,11 +1,13 @@
 [package]
 name = "astro-rs"
-version = "0.0.2"
+version = "0.0.3"
 edition = "2021"
 license = "MIT"
 description = "Astronomy utils"
 repository = "https://github.com/eta077/astro-rs"
 readme = "README.md"
+keywords = ["astronomy", "astrophysics", "fits", "utility"]
+categories = ["aerospace", "data-structures", "parser-implementations", "science"]
 
 exclude = [
     ".github",

src/fits/hdu_types.rs

@@ -5,6 +5,11 @@ pub use primary_hdu::*;
 
 use super::*;
 
+/// The header keyword indicating the name of a table column.
+pub const TTYPE_KEYWORD: [u8; 8] = *b"TTYPE   ";
+/// The header keyword indicating the size in bytes of a table column.
+pub const TFORM_KEYWORD: [u8; 8] = *b"TFORM   ";
+
 pub(crate) const DEFAULT_BITPIX_BYTES: [u8; 80] =
     *b"BITPIX  =                    8                                                  ";
 pub(crate) const DEFAULT_NAXIS_BYTES: [u8; 80] =
@@ -117,14 +122,11 @@ pub mod image_hdu {
     }
 }
 
-/// Functions related to an Image type HDU.
+/// Functions related to a Binary Table type HDU.
 pub mod binary_table_hdu {
     use super::*;
     use crate::fits::header_value::TForm;
 
-    const TTYPE_BYTES: [u8; 8] = *b"TTYPE   ";
-    const TFORM_BYTES: [u8; 8] = *b"TFORM   ";
-
     /// Constructs an HDU pre-populated with the required cards to be a Binary Table HDU.
     pub fn default() -> Hdu {
         let xtension_card = FitsHeaderCard::from(
@@ -182,40 +184,24 @@ pub mod binary_table_hdu {
             .get_card(naxis_keyword)
             .and_then(|card| card.get_value::<u32>().ok())
             .unwrap_or_default() as usize;
-        while n <= num_rows {
-            let mut keyword = TFORM_BYTES;
-            let mut i = 5;
-            if n > 99 {
-                keyword[i] = (n / 100 + 48) as u8;
-                i += 1;
-            }
-            if n > 9 {
-                keyword[i] = (n % 100 / 10 + 48) as u8;
-                i += 1;
-            }
-            keyword[i] = (n % 10 + 48) as u8;
-            if let Some(card) = hdu.header.get_card(keyword) {
+        let mut tform_keyword = FitsHeaderKeyword::from(TFORM_KEYWORD);
+        let mut ttype_keyword = FitsHeaderKeyword::from(TTYPE_KEYWORD);
+        while n as usize <= num_rows {
+            tform_keyword.append_number(n);
+            if let Some(card) = hdu.header.get_card(tform_keyword) {
                 if let Ok(tform_value) = card.get_value::<TForm>() {
-                    let mut keyword = TTYPE_BYTES;
-                    let mut i = 5;
-                    if n > 99 {
-                        keyword[i] = (n / 100 + 48) as u8;
-                        i += 1;
-                    }
-                    if n > 9 {
-                        keyword[i] = (n % 100 / 10 + 48) as u8;
-                        i += 1;
-                    }
-                    keyword[i] = (n % 10 + 48) as u8;
-                    if let Some(card) = hdu.header.get_card(keyword) {
-                        if let Ok(value) = card.get_value::<String>() {
-                            // TODO: ignore case
-                            if value.as_str() == name {
-                                tform = Some(tform_value);
-                                break;
-                            }
+                    ttype_keyword.append_number(n);
+                    if let Some(value) = hdu
+                        .header
+                        .get_card(ttype_keyword)
+                        .and_then(|card| card.get_value::<String>().ok())
+                    {
+                        if value.eq_ignore_ascii_case(name) {
+                            tform = Some(tform_value);
+                            break;
                         }
                     }
+
                     column_start += tform_value.value();
                 }
                 n += 1;
@@ -224,8 +210,7 @@ pub mod binary_table_hdu {
             }
         }
         if let Some(tform) = tform {
-            let data = hdu.get_data::<Vec<u8>>().ok()?;
-            return Some(*tform.get_values(&data, column_start, row_len, num_rows));
+            return Some(*tform.create_column(hdu.data_raw(), column_start, row_len, num_rows));
         }
         None
     }
@@ -243,7 +228,7 @@ pub mod binary_table_hdu {
             .get_card(naxis_keyword)
             .and_then(|card| card.get_value::<u32>().ok())
             .unwrap_or_default() as usize;
-        if index > num_rows as u16 {
+        if index as usize > num_rows {
             return None;
         }
         naxis_keyword[5] = b'1';
@@ -252,19 +237,10 @@ pub mod binary_table_hdu {
             .get_card(naxis_keyword)
             .and_then(|card| card.get_value::<u32>().ok())
             .unwrap_or_default() as usize;
+        let mut tform_keyword = FitsHeaderKeyword::from(TFORM_KEYWORD);
         while n <= index {
-            let mut keyword = TFORM_BYTES;
-            let mut i = 5;
-            if n > 99 {
-                keyword[i] = (n / 100 + 48) as u8;
-                i += 1;
-            }
-            if n > 9 {
-                keyword[i] = (n % 100 / 10 + 48) as u8;
-                i += 1;
-            }
-            keyword[i] = (n % 10 + 48) as u8;
-            if let Some(card) = hdu.header.get_card(keyword) {
+            tform_keyword.append_number(n);
+            if let Some(card) = hdu.header.get_card(tform_keyword) {
                 if let Ok(value) = card.get_value::<TForm>() {
                     if n == index {
                         tform = Some(value);
@@ -278,8 +254,7 @@ pub mod binary_table_hdu {
             }
         }
         if let Some(tform) = tform {
-            let data = hdu.get_data::<Vec<u8>>().ok()?;
-            return Some(*tform.get_values(&data, column_start, row_len, num_rows));
+            return Some(*tform.create_column(hdu.data_raw(), column_start, row_len, num_rows));
         }
         None
     }

src/fits/header.rs

@@ -188,6 +188,51 @@ pub struct FitsHeaderKeyword {
     raw: [u8; 8],
 }
 
+impl FitsHeaderKeyword {
+    /// Appends the given number to the keyword.
+    /// If a number is already appended, it is replaced by the given number.
+    ///
+    /// ```
+    /// use astro_rs::fits::*;
+    ///
+    /// let mut naxis_keyword = FitsHeaderKeyword::from(NAXIS_KEYWORD);
+    /// naxis_keyword.append_number(1);
+    /// assert_eq!(naxis_keyword, "NAXIS1");
+    /// naxis_keyword.append_number(2);
+    /// assert_eq!(naxis_keyword, "NAXIS2");
+    ///
+    /// let mut tform_keyword = FitsHeaderKeyword::from(TFORM_KEYWORD);
+    /// tform_keyword.append_number(100);
+    /// assert_eq!(tform_keyword, "TFORM100");
+    /// tform_keyword.append_number(10);
+    /// assert_eq!(tform_keyword, "TFORM10");
+    /// ```
+    pub fn append_number(&mut self, number: u16) {
+        let mut i = 0;
+        while i < 8 {
+            let c = self.raw[i];
+            if c == b' ' || c.is_ascii_digit() {
+                break;
+            }
+            i += 1;
+        }
+        if number > 99 {
+            self.raw[i] = (number / 100 + 48) as u8;
+            i += 1;
+        }
+        if number > 9 {
+            self.raw[i] = (number % 100 / 10 + 48) as u8;
+            i += 1;
+        }
+        self.raw[i] = (number % 10 + 48) as u8;
+        i += 1;
+        while i < 8 {
+            self.raw[i] = b' ';
+            i += 1;
+        }
+    }
+}
+
 impl From<[u8; 8]> for FitsHeaderKeyword {
     fn from(raw: [u8; 8]) -> Self {
         FitsHeaderKeyword { raw }