archive/md-pdf-rs
Archived
1
Fork 0
Code Releases Packages Activity

Allow getting CSL dir outside csl mod

Browse source
This commit is contained in:
Jake Howard 2017-09-10 12:55:21 +01:00
parent fa9673b397
commit bf09d2c6c8
Signed by: jake
GPG key ID: 57AFB45680EDD477
3 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/build/csl.rs
View file

@ -4,6 +4,11 @@ use std::path::PathBuf;
use utils::get_exe_dir; use utils::get_exe_dir;
use std::fs::File; use std::fs::File;
use std::io::{Read, Write}; use std::io::{Read, Write};
use config::consts::CSL_FILE_NAME;
pub fn get_csl_path() -> PathBuf {
return get_exe_dir().join(CSL_FILE_NAME);
}
fn get_temp_file() -> PathBuf { fn get_temp_file() -> PathBuf {
@ -12,7 +17,7 @@ fn get_temp_file() -> PathBuf {
pub fn unpack_csl(csl_name: String) -> PathBuf { pub fn unpack_csl(csl_name: String) -> PathBuf {
let file = get_temp_file(); let file = get_temp_file();
let zip_file = File::open(get_exe_dir().join("csl.zip")).expect("Failed to read CSL zip"); let zip_file = File::open(get_csl_path()).expect("Failed to read CSL zip");
let mut archive = ZipArchive::new(zip_file).expect("Failed to load zip file"); let mut archive = ZipArchive::new(zip_file).expect("Failed to load zip file");
debug_assert!(archive.len() >= 10); debug_assert!(archive.len() >= 10);
let mut csl_zip_file = archive.by_name(&format!("{}.csl", csl_name)).expect(&format!( let mut csl_zip_file = archive.by_name(&format!("{}.csl", csl_name)).expect(&format!(

3
src/config/consts.rs
View file

@ -1 +1,2 @@
pub const CONFIG_FILE: &str = "mdp.yml"; pub const CONFIG_FILE_NAME: &str = "mdp.yml";
pub const CSL_FILE_NAME: &str = "csl.zip";

2
src/config/read.rs
View file

@ -10,7 +10,7 @@ use utils::result_override;
fn get_config_path() -> PathBuf { fn get_config_path() -> PathBuf {
let mut working_dir = current_dir().unwrap(); let mut working_dir = current_dir().unwrap();
working_dir.push(consts::CONFIG_FILE); working_dir.push(consts::CONFIG_FILE_NAME);
return working_dir; return working_dir;
} }