Add tests #2
							
								
								
									
										26
									
								
								src/lib.rs
									
									
									
									
									
								
							
							
						
						
									
										26
									
								
								src/lib.rs
									
									
									
									
									
								
							@ -54,7 +54,7 @@ pub fn markdown_to_latex(markdown: String) -> String {
 | 
				
			|||||||
                    output.push_str("sub");
 | 
					                    output.push_str("sub");
 | 
				
			||||||
                }
 | 
					                }
 | 
				
			||||||
                output.push_str("section{");
 | 
					                output.push_str("section{");
 | 
				
			||||||
            },
 | 
					            }
 | 
				
			||||||
            Event::End(Tag::Header(_)) => output.push_str("}\n"),
 | 
					            Event::End(Tag::Header(_)) => output.push_str("}\n"),
 | 
				
			||||||
 | 
					
 | 
				
			||||||
            Event::Start(Tag::Emphasis) => output.push_str("\\emph{"),
 | 
					            Event::Start(Tag::Emphasis) => output.push_str("\\emph{"),
 | 
				
			||||||
@ -73,11 +73,11 @@ pub fn markdown_to_latex(markdown: String) -> String {
 | 
				
			|||||||
                output.push_str("\\href{");
 | 
					                output.push_str("\\href{");
 | 
				
			||||||
                output.push_str(&*url);
 | 
					                output.push_str(&*url);
 | 
				
			||||||
                output.push_str("}{");
 | 
					                output.push_str("}{");
 | 
				
			||||||
            },
 | 
					            }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
            Event::End(Tag::Link(_, _, _)) => {
 | 
					            Event::End(Tag::Link(_, _, _)) => {
 | 
				
			||||||
                output.push_str("}");
 | 
					                output.push_str("}");
 | 
				
			||||||
            },
 | 
					            }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
            Event::Start(Tag::Image(_, path, title)) => {
 | 
					            Event::Start(Tag::Image(_, path, title)) => {
 | 
				
			||||||
                output.push_str("\\begin{figure}\n");
 | 
					                output.push_str("\\begin{figure}\n");
 | 
				
			||||||
@ -88,7 +88,7 @@ pub fn markdown_to_latex(markdown: String) -> String {
 | 
				
			|||||||
                output.push_str("\\caption{");
 | 
					                output.push_str("\\caption{");
 | 
				
			||||||
                output.push_str(&*title);
 | 
					                output.push_str(&*title);
 | 
				
			||||||
                output.push_str("}\n\\end{figure}\n");
 | 
					                output.push_str("}\n\\end{figure}\n");
 | 
				
			||||||
            },
 | 
					            }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
            Event::Start(Tag::Item) => output.push_str("\\item "),
 | 
					            Event::Start(Tag::Item) => output.push_str("\\item "),
 | 
				
			||||||
            Event::End(Tag::Item) => output.push_str("\n"),
 | 
					            Event::End(Tag::Item) => output.push_str("\n"),
 | 
				
			||||||
@ -101,19 +101,19 @@ pub fn markdown_to_latex(markdown: String) -> String {
 | 
				
			|||||||
                } else {
 | 
					                } else {
 | 
				
			||||||
                    output.push_str("\\begin{lstlisting}\n");
 | 
					                    output.push_str("\\begin{lstlisting}\n");
 | 
				
			||||||
                }
 | 
					                }
 | 
				
			||||||
            },
 | 
					            }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
            Event::End(Tag::CodeBlock(_)) => {
 | 
					            Event::End(Tag::CodeBlock(_)) => {
 | 
				
			||||||
                output.push_str("\n\\end{lstlisting}\n");
 | 
					                output.push_str("\n\\end{lstlisting}\n");
 | 
				
			||||||
            },
 | 
					            }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
            Event::Text(t) => {
 | 
					            Event::Text(t) => {
 | 
				
			||||||
                output.push_str(&*t);
 | 
					                output.push_str(&*t);
 | 
				
			||||||
            },
 | 
					            }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
            Event::SoftBreak => {
 | 
					            Event::SoftBreak => {
 | 
				
			||||||
                output.push('\n');
 | 
					                output.push('\n');
 | 
				
			||||||
            },
 | 
					            }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
            _ => (),
 | 
					            _ => (),
 | 
				
			||||||
        }
 | 
					        }
 | 
				
			||||||
@ -131,9 +131,9 @@ pub fn markdown_to_pdf(markdown: String) -> Result<Vec<u8>, tectonic::Error> {
 | 
				
			|||||||
#[cfg(test)]
 | 
					#[cfg(test)]
 | 
				
			||||||
mod tests {
 | 
					mod tests {
 | 
				
			||||||
    use super::{markdown_to_latex, markdown_to_pdf};
 | 
					    use super::{markdown_to_latex, markdown_to_pdf};
 | 
				
			||||||
 | 
					    use lopdf::Document;
 | 
				
			||||||
    use pretty_assertions::assert_eq;
 | 
					    use pretty_assertions::assert_eq;
 | 
				
			||||||
    use std::io::Cursor;
 | 
					    use std::io::Cursor;
 | 
				
			||||||
    use lopdf::Document;
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
    const MARKDOWN_IN: &str = r#"# First title
 | 
					    const MARKDOWN_IN: &str = r#"# First title
 | 
				
			||||||
Some content
 | 
					Some content
 | 
				
			||||||
@ -205,11 +205,11 @@ Text
 | 
				
			|||||||
                match Document::load_from(&mut file) {
 | 
					                match Document::load_from(&mut file) {
 | 
				
			||||||
                    Ok(doc) => {
 | 
					                    Ok(doc) => {
 | 
				
			||||||
                        assert_eq!("1.5", doc.version);
 | 
					                        assert_eq!("1.5", doc.version);
 | 
				
			||||||
                    },
 | 
					 | 
				
			||||||
                    Err(_) => assert!(true)
 | 
					 | 
				
			||||||
                    }
 | 
					                    }
 | 
				
			||||||
            },
 | 
					                    Err(_) => assert!(true),
 | 
				
			||||||
            Err(_) => assert!(true)
 | 
					                }
 | 
				
			||||||
 | 
					            }
 | 
				
			||||||
 | 
					            Err(_) => assert!(true),
 | 
				
			||||||
        }
 | 
					        }
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
							
								
								
									
										54
									
								
								src/main.rs
									
									
									
									
									
								
							
							
						
						
									
										54
									
								
								src/main.rs
									
									
									
									
									
								
							@ -1,10 +1,10 @@
 | 
				
			|||||||
 | 
					use std::ffi::OsStr;
 | 
				
			||||||
use std::fs::File;
 | 
					use std::fs::File;
 | 
				
			||||||
use std::io::{Read, Write};
 | 
					use std::io::{Read, Write};
 | 
				
			||||||
use std::process::exit;
 | 
					 | 
				
			||||||
use std::path::PathBuf;
 | 
					use std::path::PathBuf;
 | 
				
			||||||
use std::ffi::OsStr;
 | 
					use std::process::exit;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
use clap::{crate_authors, crate_description, crate_name, crate_version, Command, Arg};
 | 
					use clap::{crate_authors, crate_description, crate_name, crate_version, Arg, Command};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
use md2pdf::{markdown_to_latex, markdown_to_pdf};
 | 
					use md2pdf::{markdown_to_latex, markdown_to_pdf};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@ -17,36 +17,40 @@ macro_rules! unwrap {
 | 
				
			|||||||
                exit(1);
 | 
					                exit(1);
 | 
				
			||||||
            }
 | 
					            }
 | 
				
			||||||
        }
 | 
					        }
 | 
				
			||||||
    }
 | 
					    };
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
fn main() {
 | 
					fn main() {
 | 
				
			||||||
 | 
					 | 
				
			||||||
    let matches = Command::new(crate_name!())
 | 
					    let matches = Command::new(crate_name!())
 | 
				
			||||||
        .bin_name(crate_name!())
 | 
					        .bin_name(crate_name!())
 | 
				
			||||||
        .version(crate_version!())
 | 
					        .version(crate_version!())
 | 
				
			||||||
        .author(crate_authors!("\n"))
 | 
					        .author(crate_authors!("\n"))
 | 
				
			||||||
        .about(crate_description!())
 | 
					        .about(crate_description!())
 | 
				
			||||||
        .arg(Arg::new("INPUT")
 | 
					        .arg(
 | 
				
			||||||
 | 
					            Arg::new("INPUT")
 | 
				
			||||||
                .long("input")
 | 
					                .long("input")
 | 
				
			||||||
                .short('i')
 | 
					                .short('i')
 | 
				
			||||||
                .help("Input markdown files")
 | 
					                .help("Input markdown files")
 | 
				
			||||||
                .required(true)
 | 
					                .required(true)
 | 
				
			||||||
             .value_parser(clap::value_parser!(PathBuf))
 | 
					                .value_parser(clap::value_parser!(PathBuf)),
 | 
				
			||||||
        )
 | 
					        )
 | 
				
			||||||
        .arg(Arg::new("OUTPUT")
 | 
					        .arg(
 | 
				
			||||||
 | 
					            Arg::new("OUTPUT")
 | 
				
			||||||
                .long("output")
 | 
					                .long("output")
 | 
				
			||||||
                .short('o')
 | 
					                .short('o')
 | 
				
			||||||
                .help("Output tex or pdf file")
 | 
					                .help("Output tex or pdf file")
 | 
				
			||||||
                .required(true)
 | 
					                .required(true)
 | 
				
			||||||
             .value_parser(clap::value_parser!(PathBuf))
 | 
					                .value_parser(clap::value_parser!(PathBuf)),
 | 
				
			||||||
        )
 | 
					        )
 | 
				
			||||||
        .get_matches();
 | 
					        .get_matches();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    let input_path = matches.get_one::<PathBuf>("INPUT").unwrap();
 | 
					    let input_path = matches.get_one::<PathBuf>("INPUT").unwrap();
 | 
				
			||||||
    let mut content = String::new();
 | 
					    let mut content = String::new();
 | 
				
			||||||
    let mut input = unwrap!(File::open(input_path), "couldn't open input file");
 | 
					    let mut input = unwrap!(File::open(input_path), "couldn't open input file");
 | 
				
			||||||
    unwrap!(input.read_to_string(&mut content), "couldn't read file content");
 | 
					    unwrap!(
 | 
				
			||||||
 | 
					        input.read_to_string(&mut content),
 | 
				
			||||||
 | 
					        "couldn't read file content"
 | 
				
			||||||
 | 
					    );
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    let output_path = matches.get_one::<PathBuf>("OUTPUT").unwrap();
 | 
					    let output_path = matches.get_one::<PathBuf>("OUTPUT").unwrap();
 | 
				
			||||||
    let output_path_ext = output_path.extension().and_then(OsStr::to_str);
 | 
					    let output_path_ext = output_path.extension().and_then(OsStr::to_str);
 | 
				
			||||||
@ -56,37 +60,33 @@ fn main() {
 | 
				
			|||||||
        Some("tex") => {
 | 
					        Some("tex") => {
 | 
				
			||||||
            let tex = markdown_to_latex(content);
 | 
					            let tex = markdown_to_latex(content);
 | 
				
			||||||
            unwrap!(output.write(tex.as_bytes()), "couldn't write output file");
 | 
					            unwrap!(output.write(tex.as_bytes()), "couldn't write output file");
 | 
				
			||||||
        },
 | 
					        }
 | 
				
			||||||
        Some("pdf") => {
 | 
					        Some("pdf") => match markdown_to_pdf(content) {
 | 
				
			||||||
            match markdown_to_pdf(content) {
 | 
					            Ok(data) => match output.write(&data) {
 | 
				
			||||||
                Ok(data) => {
 | 
					 | 
				
			||||||
                    match output.write(&data) {
 | 
					 | 
				
			||||||
                Ok(_) => {
 | 
					                Ok(_) => {
 | 
				
			||||||
                    exit(0);
 | 
					                    exit(0);
 | 
				
			||||||
                        },
 | 
					                }
 | 
				
			||||||
                Err(error) => {
 | 
					                Err(error) => {
 | 
				
			||||||
                            eprintln!(
 | 
					                    eprintln!("error while writing file: {}", error);
 | 
				
			||||||
                                "error while writing file: {}", error
 | 
					 | 
				
			||||||
                            );
 | 
					 | 
				
			||||||
                    exit(1);
 | 
					                    exit(1);
 | 
				
			||||||
                        },
 | 
					 | 
				
			||||||
                }
 | 
					                }
 | 
				
			||||||
            },
 | 
					            },
 | 
				
			||||||
            Err(error) => {
 | 
					            Err(error) => {
 | 
				
			||||||
                    eprintln!(
 | 
					                eprintln!("error while compiling latex: {}", error.description());
 | 
				
			||||||
                        "error while compiling latex: {}", error.description()
 | 
					 | 
				
			||||||
                    );
 | 
					 | 
				
			||||||
                exit(1);
 | 
					                exit(1);
 | 
				
			||||||
            }
 | 
					            }
 | 
				
			||||||
            }
 | 
					 | 
				
			||||||
        },
 | 
					        },
 | 
				
			||||||
        Some(ext) => {
 | 
					        Some(ext) => {
 | 
				
			||||||
            eprintln!("unknown file format ({}) for output: {}", ext, output_path.display());
 | 
					            eprintln!(
 | 
				
			||||||
 | 
					                "unknown file format ({}) for output: {}",
 | 
				
			||||||
 | 
					                ext,
 | 
				
			||||||
 | 
					                output_path.display()
 | 
				
			||||||
 | 
					            );
 | 
				
			||||||
            exit(1);
 | 
					            exit(1);
 | 
				
			||||||
        },
 | 
					        }
 | 
				
			||||||
        None => {
 | 
					        None => {
 | 
				
			||||||
            eprintln!("unknown file format for output: {}", output_path.display());
 | 
					            eprintln!("unknown file format for output: {}", output_path.display());
 | 
				
			||||||
            exit(1);
 | 
					            exit(1);
 | 
				
			||||||
        },
 | 
					        }
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user