feat(hwp): 묶음개체 글상자 (#93)

hahnlee · Nov 11, 2022 · 0509a37 · 0509a37
1 parent 62980da
commit 0509a37
Show file tree

Hide file tree

Showing 5 changed files with 43 additions and 12 deletions.
diff --git a/crates/hwp/src/hwp/paragraph/control/shape_object/container.rs b/crates/hwp/src/hwp/paragraph/control/shape_object/container.rs
@@ -1,8 +1,9 @@
 use crate::hwp::{
     paragraph::control::{
-        common_properties::CommonProperties, element_properties::ElementProperties,
+        common_properties::CommonProperties, draw_text::DrawText,
+        element_properties::ElementProperties,
     },
-    record::{Record, RecordCursor},
+    record::{tags::BodyTextRecord, Record, RecordCursor},
     version::Version,
 };
 
@@ -23,7 +24,7 @@ impl ContainerControl {
     pub fn from_record(record: &mut Record, cursor: &mut RecordCursor, version: &Version) -> Self {
         let common_properties = CommonProperties::from_record(record, cursor, version);
         let element_properties = ElementProperties::from_record_cursor(cursor, false);
-        let content = ContainerContent::from_record_cursor(&element_properties, cursor);
+        let content = ContainerContent::from_record_cursor(&element_properties, cursor, version);
 
         Self {
             common_properties,
@@ -39,13 +40,17 @@ pub struct ContainerContent {
 }
 
 impl ContainerContent {
-    pub fn from_record_cursor(properties: &ElementProperties, cursor: &mut RecordCursor) -> Self {
+    pub fn from_record_cursor(
+        properties: &ElementProperties,
+        cursor: &mut RecordCursor,
+        version: &Version,
+    ) -> Self {
         let children = properties
             .children_ids
             .as_ref()
             .unwrap()
             .into_iter()
-            .map(|_| ContainerElement::from_record_cursor(cursor))
+            .map(|_| ContainerElement::from_record_cursor(cursor, version))
             .collect();
 
         Self { children }
@@ -58,16 +63,24 @@ pub struct ContainerElement {
     pub element_properties: ElementProperties,
     /// 컨텐츠
     pub content: ShapeObjectContent,
+    /// 글상자
+    pub draw_text: Option<DrawText>,
 }
 
 impl ContainerElement {
-    pub fn from_record_cursor(cursor: &mut RecordCursor) -> Self {
+    pub fn from_record_cursor(cursor: &mut RecordCursor, version: &Version) -> Self {
         let element_properties = ElementProperties::from_record_cursor(cursor, false);
-        let content = parse_content(&element_properties, cursor);
+        let draw_text = if cursor.record_id(BodyTextRecord::HWPTAG_LIST_HEADER as u32) {
+            Some(DrawText::from_record_cursor(cursor, version))
+        } else {
+            None
+        };
+        let content = parse_content(&element_properties, cursor, version);
 
         Self {
             element_properties,
             content,
+            draw_text,
         }
     }
 }
diff --git a/crates/hwp/src/hwp/paragraph/control/shape_object/content.rs b/crates/hwp/src/hwp/paragraph/control/shape_object/content.rs
@@ -2,7 +2,7 @@ use hwp_macro::make_4chid;
 
 use crate::hwp::{
     paragraph::control::element_properties::ElementProperties, record::RecordCursor,
-    unknown::UnknownRecord,
+    unknown::UnknownRecord, version::Version,
 };
 
 use super::{
@@ -29,14 +29,15 @@ pub enum ShapeObjectContent {
 pub fn parse_content(
     properties: &ElementProperties,
     cursor: &mut RecordCursor,
+    version: &Version,
 ) -> ShapeObjectContent {
     match properties.ctrl_id {
         make_4chid!('$', 'a', 'r', 'c') => {
             ShapeObjectContent::Arc(ArcRecord::from_record_cursor(cursor))
         }
-        make_4chid!('$', 'c', 'o', 'n') => {
-            ShapeObjectContent::Container(ContainerContent::from_record_cursor(properties, cursor))
-        }
+        make_4chid!('$', 'c', 'o', 'n') => ShapeObjectContent::Container(
+            ContainerContent::from_record_cursor(properties, cursor, version),
+        ),
         make_4chid!('$', 'c', 'u', 'r') => {
             ShapeObjectContent::Curve(CurveRecord::from_record_cursor(cursor))
         }

diff --git a/crates/hwp/src/hwp/paragraph/control/shape_object/gen_shape_object.rs b/crates/hwp/src/hwp/paragraph/control/shape_object/gen_shape_object.rs
@@ -33,7 +33,7 @@ impl GenShapeObjectControl {
             None
         };
 
-        let content = parse_content(&element_properties, cursor);
+        let content = parse_content(&element_properties, cursor, version);
 
         Self {
             common_properties,

diff --git a/crates/hwp/tests/integration/project/files/group_with_draw_text.hwp b/crates/hwp/tests/integration/project/files/group_with_draw_text.hwp
diff --git a/crates/hwp/tests/integration/project/mod.rs b/crates/hwp/tests/integration/project/mod.rs
@@ -223,3 +223,20 @@ fn check_image_fill() {
 
     assert_eq!(hwp.body_texts.sections.len(), 1);
 }
+
+#[test]
+fn check_group_with_draw_text() {
+    let path = get_tests_path("integration/project/files/group_with_draw_text.hwp");
+    let file = fs::read(path).unwrap();
+
+    let hwp = HWP::from_bytes(&file);
+
+    assert_eq!(hwp.header.version.to_string(), "5.1.0.1");
+    assert_eq!(hwp.header.flags.compressed, true);
+    assert_eq!(hwp.header.flags.distributed, false);
+
+    assert_eq!(hwp.header.license.ccl, false);
+    assert_eq!(hwp.header.license.replication_restrictions, false);
+
+    assert_eq!(hwp.body_texts.sections.len(), 1);
+}