Merge pull request #6 from SpectralOps/remove-panics

anvie · web-flow · commit 06b16004f1ef · 2024-01-30T23:58:00.000+07:00
replace panic to std::io::Error
diff --git a/src/doc.rs b/src/doc.rs
@@ -71,11 +71,16 @@ pub(crate) fn open_doc_read_data<P: AsRef<Path>>(
                     }
                 }
                 Ok(Event::Eof) => break,
-                Err(e) => panic!(
-                    "Error at position {}: {:?}",
-                    xml_reader.buffer_position(),
-                    e
-                ),
+                Err(e) => {
+                    return Err(io::Error::new(
+                        io::ErrorKind::Other,
+                        format!(
+                            "Error at position {}: {:?}",
+                            xml_reader.buffer_position(),
+                            e
+                        ),
+                    ))
+                }
                 _ => (),
             }
         }
diff --git a/src/docx.rs b/src/docx.rs
@@ -67,11 +67,16 @@ impl MsDoc<Docx> for Docx {
                         }
                     }
                     Ok(Event::Eof) => break, // exits the loop when reaching end of file
-                    Err(e) => panic!(
-                        "Error at position {}: {:?}",
-                        xml_reader.buffer_position(),
-                        e
-                    ),
+                    Err(e) => {
+                        return Err(io::Error::new(
+                            io::ErrorKind::Other,
+                            format!(
+                                "Error at position {}: {:?}",
+                                xml_reader.buffer_position(),
+                                e
+                            ),
+                        ))
+                    }
                     _ => (),
                 }
             }
diff --git a/src/odp.rs b/src/odp.rs
@@ -74,7 +74,16 @@ impl OpenOfficeDoc<Odp> for Odp {
         //                 }
         //             },
         //             Ok(Event::Eof) => break,
-        //             Err(e) => panic!("Error at position {}: {:?}", xml_reader.buffer_position(), e),
+        //             Err(e) => {
+        //                 return Err(io::Error::new(
+        //                    io::ErrorKind::Other,
+        //                    format!(
+        //                        "Error at position {}: {:?}",
+        //                        xml_reader.buffer_position(),
+        //                        e
+        //                    ),
+        //                ))
+        //            }
         //             _ => (),
         //         }
         //     }
diff --git a/src/pptx.rs b/src/pptx.rs
@@ -70,11 +70,16 @@ impl MsDoc<Pptx> for Pptx {
                         }
                     }
                     Ok(Event::Eof) => break, // exits the loop when reaching end of file
-                    Err(e) => panic!(
-                        "Error at position {}: {:?}",
-                        xml_reader.buffer_position(),
-                        e
-                    ),
+                    Err(e) => {
+                        return Err(io::Error::new(
+                            io::ErrorKind::Other,
+                            format!(
+                                "Error at position {}: {:?}",
+                                xml_reader.buffer_position(),
+                                e
+                            ),
+                        ))
+                    }
                     _ => (),
                 }
             }
diff --git a/src/xlsx.rs b/src/xlsx.rs
@@ -75,11 +75,16 @@ impl MsDoc<Xlsx> for Xlsx {
                         }
                     }
                     Ok(Event::Eof) => break, // exits the loop when reaching end of file
-                    Err(e) => panic!(
-                        "Error at position {}: {:?}",
-                        xml_reader.buffer_position(),
-                        e
-                    ),
+                    Err(e) => {
+                        return Err(io::Error::new(
+                            io::ErrorKind::Other,
+                            format!(
+                                "Error at position {}: {:?}",
+                                xml_reader.buffer_position(),
+                                e
+                            ),
+                        ))
+                    }
                     _ => (),
                 }
             }

Original file line number	Diff line number	Diff line change
`@@ -71,11 +71,16 @@ pub(crate) fn open_doc_read_data<P: AsRef<Path>>(`
`71`	`71`	`}`
`72`	`72`	`}`
`73`	`73`	`Ok(Event::Eof) => break,`
`74`		`- Err(e) => panic!(`
`75`		`- "Error at position {}: {:?}",`
`76`		`- xml_reader.buffer_position(),`
`77`		`- e`
`78`		`- ),`
	`74`	`+ Err(e) => {`
	`75`	`+ return Err(io::Error::new(`
	`76`	`+ io::ErrorKind::Other,`
	`77`	`+ format!(`
	`78`	`+ "Error at position {}: {:?}",`
	`79`	`+ xml_reader.buffer_position(),`
	`80`	`+ e`
	`81`	`+ ),`
	`82`	`+ ))`
	`83`	`+ }`
`79`	`84`	`_ => (),`
`80`	`85`	`}`
`81`	`86`	`}`
Original file line number	Diff line number	Diff line change
`@@ -67,11 +67,16 @@ impl MsDoc<Docx> for Docx {`
`67`	`67`	`}`
`68`	`68`	`}`
`69`	`69`	`Ok(Event::Eof) => break, // exits the loop when reaching end of file`
`70`		`- Err(e) => panic!(`
`71`		`- "Error at position {}: {:?}",`
`72`		`- xml_reader.buffer_position(),`
`73`		`- e`
`74`		`- ),`
	`70`	`+ Err(e) => {`
	`71`	`+ return Err(io::Error::new(`
	`72`	`+ io::ErrorKind::Other,`
	`73`	`+ format!(`
	`74`	`+ "Error at position {}: {:?}",`
	`75`	`+ xml_reader.buffer_position(),`
	`76`	`+ e`
	`77`	`+ ),`
	`78`	`+ ))`
	`79`	`+ }`
`75`	`80`	`_ => (),`
`76`	`81`	`}`
`77`	`82`	`}`
Original file line number	Diff line number	Diff line change
`@@ -70,11 +70,16 @@ impl MsDoc<Pptx> for Pptx {`
`70`	`70`	`}`
`71`	`71`	`}`
`72`	`72`	`Ok(Event::Eof) => break, // exits the loop when reaching end of file`
`73`		`- Err(e) => panic!(`
`74`		`- "Error at position {}: {:?}",`
`75`		`- xml_reader.buffer_position(),`
`76`		`- e`
`77`		`- ),`
	`73`	`+ Err(e) => {`
	`74`	`+ return Err(io::Error::new(`
	`75`	`+ io::ErrorKind::Other,`
	`76`	`+ format!(`
	`77`	`+ "Error at position {}: {:?}",`
	`78`	`+ xml_reader.buffer_position(),`
	`79`	`+ e`
	`80`	`+ ),`
	`81`	`+ ))`
	`82`	`+ }`
`78`	`83`	`_ => (),`
`79`	`84`	`}`
`80`	`85`	`}`
Original file line number	Diff line number	Diff line change
`@@ -75,11 +75,16 @@ impl MsDoc<Xlsx> for Xlsx {`
`75`	`75`	`}`
`76`	`76`	`}`
`77`	`77`	`Ok(Event::Eof) => break, // exits the loop when reaching end of file`
`78`		`- Err(e) => panic!(`
`79`		`- "Error at position {}: {:?}",`
`80`		`- xml_reader.buffer_position(),`
`81`		`- e`
`82`		`- ),`
	`78`	`+ Err(e) => {`
	`79`	`+ return Err(io::Error::new(`
	`80`	`+ io::ErrorKind::Other,`
	`81`	`+ format!(`
	`82`	`+ "Error at position {}: {:?}",`
	`83`	`+ xml_reader.buffer_position(),`
	`84`	`+ e`
	`85`	`+ ),`
	`86`	`+ ))`
	`87`	`+ }`
`83`	`88`	`_ => (),`
`84`	`89`	`}`
`85`	`90`	`}`