wynd
/
docx-rs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: rels (#34)

main
bokuweb 2020-02-11 22:06:54 +09:00 committed by GitHub
parent 5fe4e4d646
commit b68bdd93b5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
docx-core/src/documents/content_types.rs
View File

@ -17,56 +17,56 @@ impl ContentTypes {
Default::default() Default::default()
} }
pub fn add_content(mut self, namespace: impl Into<String>, path: impl Into<String>) -> Self { pub fn add_content(mut self, path: impl Into<String>, namespace: impl Into<String>) -> Self {
self.types.insert(namespace.into(), path.into()); self.types.insert(path.into(), namespace.into());
self self
} }
pub fn set_default(mut self) -> ContentTypes { pub fn set_default(mut self) -> ContentTypes {
self.types.insert( self.types.insert(
"application/vnd.openxmlformats-package.relationships+xml".to_owned(),
"/_rels/.rels".to_owned(), "/_rels/.rels".to_owned(),
);
self.types.insert(
"application/vnd.openxmlformats-officedocument.extended-properties+xml".to_owned(),
"/docProps/app.xml".to_owned(),
);
self.types.insert(
"application/vnd.openxmlformats-package.core-properties+xml".to_owned(),
"/docProps/core.xml".to_owned(),
);
self.types.insert(
"application/vnd.openxmlformats-package.relationships+xml".to_owned(), "application/vnd.openxmlformats-package.relationships+xml".to_owned(),
"/word/_rels/document.xml.rels".to_owned(),
); );
self.types.insert( self.types.insert(
"/docProps/app.xml".to_owned(),
"application/vnd.openxmlformats-officedocument.extended-properties+xml".to_owned(),
);
self.types.insert(
"/docProps/core.xml".to_owned(),
"application/vnd.openxmlformats-package.core-properties+xml".to_owned(),
);
self.types.insert(
"/word/_rels/document.xml.rels".to_owned(),
"application/vnd.openxmlformats-package.relationships+xml".to_owned(),
);
self.types.insert(
"/word/settings.xml".to_owned(),
"application/vnd.openxmlformats-officedocument.wordprocessingml.settings+xml" "application/vnd.openxmlformats-officedocument.wordprocessingml.settings+xml"
.to_owned(), .to_owned(),
"/word/settings.xml".to_owned(),
); );
self.types.insert( self.types.insert(
"/word/fontTable.xml".to_owned(),
"application/vnd.openxmlformats-officedocument.wordprocessingml.fontTable+xml" "application/vnd.openxmlformats-officedocument.wordprocessingml.fontTable+xml"
.to_owned(), .to_owned(),
"/word/fontTable.xml".to_owned(),
); );
self.types.insert( self.types.insert(
"/word/document.xml".to_owned(),
"application/vnd.openxmlformats-officedocument.wordprocessingml.document.main+xml" "application/vnd.openxmlformats-officedocument.wordprocessingml.document.main+xml"
.to_owned(), .to_owned(),
"/word/document.xml".to_owned(),
); );
self.types.insert( self.types.insert(
"application/vnd.openxmlformats-officedocument.wordprocessingml.styles+xml".to_owned(),
"/word/styles.xml".to_owned(), "/word/styles.xml".to_owned(),
"application/vnd.openxmlformats-officedocument.wordprocessingml.styles+xml".to_owned(),
); );
self.types.insert( self.types.insert(
"/word/comments.xml".to_owned(),
"application/vnd.openxmlformats-officedocument.wordprocessingml.comments+xml" "application/vnd.openxmlformats-officedocument.wordprocessingml.comments+xml"
.to_owned(), .to_owned(),
"/word/comments.xml".to_owned(),
); );
self.types.insert( self.types.insert(
"/word/numbering.xml".to_owned(),
"application/vnd.openxmlformats-officedocument.wordprocessingml.numbering+xml" "application/vnd.openxmlformats-officedocument.wordprocessingml.numbering+xml"
.to_owned(), .to_owned(),
"/word/numbering.xml".to_owned(),
); );
self self
} }
@ -104,7 +104,7 @@ impl FromXML for ContentTypes {
if depth == 1 { if depth == 1 {
let namespace = attributes[0].value.clone(); let namespace = attributes[0].value.clone();
let path = attributes[1].value.clone(); let path = attributes[1].value.clone();
s = s.add_content(namespace, path); s = s.add_content(path, namespace);
} }
depth += 1; depth += 1;
} }
@ -133,9 +133,9 @@ mod tests {
let c = ContentTypes::from_xml(xml.as_bytes()).unwrap(); let c = ContentTypes::from_xml(xml.as_bytes()).unwrap();
let mut types = HashMap::new(); let mut types = HashMap::new();
types.insert( types.insert(
"/word/document.xml".to_owned(),
"application/vnd.openxmlformats-officedocument.wordprocessingml.document.main+xml" "application/vnd.openxmlformats-officedocument.wordprocessingml.document.main+xml"
.to_owned(), .to_owned(),
"/word/document.xml".to_owned(),
); );
assert_eq!(ContentTypes { types }, c); assert_eq!(ContentTypes { types }, c);
} }

2
docx-core/src/documents/mod.rs
View File

@ -49,7 +49,7 @@ pub struct Docx {
impl Default for Docx { impl Default for Docx {
fn default() -> Self { fn default() -> Self {
let content_type = ContentTypes::new().set_default(); let content_type = ContentTypes::new().set_default();
let rels = Rels::new(); let rels = Rels::new().set_default();
let doc_props = DocProps::new(CorePropsConfig::new()); let doc_props = DocProps::new(CorePropsConfig::new());
let styles = Styles::new(); let styles = Styles::new();
let document = Document::new(); let document = Document::new();