no message

Author: DESKTOP-U434MT0\hiro

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "umya-spreadsheet"
-version = "1.0.1"
+version = "1.0.2"
 authors = ["MathNya <umya.net.info@gmail.com>"]
 repository = "https://github.com/MathNya/umya-spreadsheet"
 keywords = ["excel", "spreadsheet", "xlsx", "reader", "writer"]

README.md

@@ -12,6 +12,28 @@
 Please use [Gitter](https://gitter.im/MathNya/umya-spreadsheet) for brief chats.
 
 ## New feature
+### ver 1.0.2
+#### **Image data is now easier to acquire.**
+```rust
+// get image data.
+let img = book.get_sheet_by_name("Sheet1").unwrap().get_image("M17").unwrap();
+// or
+let img_list = book.get_sheet_by_name("Sheet1").unwrap().get_image_collection();
+
+// get Coordinate.
+assert_eq!(img.get_coordinate(), "M17");
+assert_eq!(img.get_col(), &12);
+assert_eq!(img.get_row(), &16);
+
+// get file name.
+assert_eq!(img.get_image_name(), "image1.png");
+
+// get binary data.
+dbg!(img.get_image_data());
+
+// get base64 data.
+dbg!(img.get_image_data_base64());
+```
 ### ver 1.0.0
 #### **remove deprecated functions**
 #### **new function move_range**

src/structs/cell.rs

@@ -118,6 +118,11 @@ impl Cell {
         self
     }
 
+    pub(crate) fn set_value_str<S: Into<String>>(&mut self, value: S) -> &mut Self {
+        self.cell_value.set_value_str(value);
+        self
+    }
+
     pub fn set_value_bool(&mut self, value: bool) -> &mut Self {
         self.cell_value.set_value_bool(value);
         self
@@ -322,7 +327,7 @@ impl Cell {
                     }
                     b"v" => {
                         if type_value == "str" {
-                            self.set_value_crate(string_value.clone());
+                            self.set_value_str(string_value.clone());
                         }
                         if type_value == "s" {
                             let index = string_value.parse::<usize>().unwrap();
@@ -375,7 +380,11 @@ impl Cell {
         let mut attributes: Vec<(&str, &str)> = Vec::new();
         let coordinate = self.coordinate.get_coordinate();
         attributes.push(("r", &coordinate));
-        if self.get_data_type_crate() == "s" || self.get_data_type_crate() == "b" {
+        if self.get_data_type_crate() == "s"
+            || self.get_data_type_crate() == "b"
+            || self.get_data_type_crate() == "str"
+            || self.get_data_type_crate() == "e"
+        {
             attributes.push(("t", self.get_data_type_crate()));
         }
         let xf_index_str: String;

src/structs/cell_raw_value.rs

@@ -5,6 +5,7 @@ use std::fmt;
 #[derive(Clone, Debug, PartialEq, PartialOrd)]
 pub enum CellRawValue {
     String(String),
+    Str(String),
     RichText(RichText),
     Lazy(String),
     Numeric(f64),
@@ -17,6 +18,7 @@ impl fmt::Display for CellRawValue {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
         match self {
             Self::String(v) => write!(f, "{}", v),
+            Self::Str(v) => write!(f, "{}", v),
             Self::RichText(v) => write!(f, "{}", v.get_text()),
             Self::Numeric(v) => write!(f, "{}", &v),
             Self::Bool(v) => write!(f, "{}", if v == &true { "TRUE" } else { "FALSE" }),
@@ -33,16 +35,19 @@ impl CellRawValue {
     pub fn get_data_type(&self) -> &str {
         match self {
             Self::String(_) => "s",
+            Self::Str(_) => "str",
             Self::RichText(_) => "s",
             Self::Numeric(_) => "n",
             Self::Bool(_) => "b",
+            Self::Error => "e",
             _ => "",
         }
     }
 
     pub(crate) fn get_text(&self) -> Option<Text> {
         match self {
             Self::String(_) | // _
+            Self::Str(_) | // _
             Self::Numeric(_) | // _
             Self::Bool(_) => {
                 let mut text = Text::default();

src/structs/cell_value.rs

@@ -21,12 +21,6 @@ impl CellValue {
     }
 
     pub(crate) fn get_data_type_crate(&self) -> &str {
-        match &self.formula {
-            Some(_) => {
-                return "f";
-            }
-            None => {}
-        }
         self.raw_value.get_data_type()
     }
 
@@ -98,6 +92,11 @@ impl CellValue {
         self
     }
 
+    pub(crate) fn set_value_str<S: Into<String>>(&mut self, value: S) -> &mut Self {
+        self.raw_value = CellRawValue::Str(value.into());
+        self
+    }
+
     pub fn set_value_bool(&mut self, value: bool) -> &mut Self {
         self.raw_value = CellRawValue::Bool(value);
         self.remove_formula();

src/structs/image.rs

@@ -1,3 +1,4 @@
+use base64::{engine::general_purpose::STANDARD, Engine as _};
 use image::GenericImageView;
 use quick_xml::Writer;
 use std::fs;
@@ -152,15 +153,27 @@ impl Image {
         fs::write(path, self.get_media_object().get_image_data()).unwrap();
     }
 
+    pub fn get_image_name(&self) -> &str {
+        self.get_media_object().get_image_name()
+    }
+
+    pub fn get_image_data(&self) -> &Vec<u8> {
+        self.get_media_object().get_image_data()
+    }
+
+    pub fn get_image_data_base64(&self) -> String {
+        STANDARD.encode(self.get_image_data())
+    }
+
     pub fn get_coordinate(&self) -> String {
         self.get_from_marker_type().get_coordinate()
     }
 
-    pub(crate) fn get_col(&self) -> &u32 {
+    pub fn get_col(&self) -> &u32 {
         self.get_from_marker_type().get_col()
     }
 
-    pub(crate) fn get_row(&self) -> &u32 {
+    pub fn get_row(&self) -> &u32 {
         self.get_from_marker_type().get_row()
     }
 

tests/integration_test.rs

@@ -1181,14 +1181,37 @@ fn issue_72() {
 }
 
 #[test]
-fn issue_128() {
-    let xlsx_path = std::path::Path::new("./tests/test_files/wb_with_shared_strings.xlsx");
+fn issue_129() {
+    let path = std::path::Path::new("./tests/test_files/aaa.xlsx");
+    let book = umya_spreadsheet::reader::xlsx::read(path).unwrap();
+    let img = book
+        .get_sheet_by_name("Sheet1")
+        .unwrap()
+        .get_image("M17")
+        .unwrap();
+    //dbg!(img.get_one_cell_anchor().is_some());
+    //dbg!(img.get_two_cell_anchor().is_some());
+    assert_eq!(img.get_image_name(), "image1.png");
+    assert_eq!(img.get_coordinate(), "M17");
+    assert_eq!(img.get_col(), &12);
+    assert_eq!(img.get_row(), &16);
+
+    let path = std::path::Path::new("./tests/result_files/issue_129.xlsx");
+    let _ = umya_spreadsheet::writer::xlsx::write(&book, path);
+}
 
-    let book = umya_spreadsheet::reader::xlsx::read(xlsx_path).unwrap();
+#[test]
+fn wb_with_shared_strings() {
+    let path = std::path::Path::new("./tests/test_files/wb_with_shared_strings.xlsx");
+    let book = umya_spreadsheet::reader::xlsx::read(path).unwrap();
     let sheet = book.get_sheet_by_name("Sheet To Read From").unwrap();
-    assert_eq!(sheet.get_formatted_value("A2"), "11");
-    assert_eq!(sheet.get_formatted_value("A3"), "22");
-    assert_eq!(sheet.get_formatted_value("A4"), "ABCdef");
-    assert_eq!(sheet.get_formatted_value("A5"), "ABCdef");
-    assert_eq!(sheet.get_formatted_value("A6"), "ABCdef");
+
+    assert_eq!(sheet.get_cell("A2").unwrap().get_value(), "11");
+    assert_eq!(sheet.get_cell("A3").unwrap().get_value(), "22");
+    assert_eq!(sheet.get_cell("A4").unwrap().get_value(), "ABCdef");
+    assert_eq!(sheet.get_cell("A5").unwrap().get_value(), "ABCdef");
+    assert_eq!(sheet.get_cell("A6").unwrap().get_value(), "ABCdef");
+
+    let path = std::path::Path::new("./tests/result_files/wb_with_shared_strings.xlsx");
+    let _ = umya_spreadsheet::writer::xlsx::write(&book, path);
 }