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

Move temp file to utils

Browse source
This commit is contained in:
Jake Howard 2017-09-13 13:37:35 +01:00
parent fef80299ca
commit 9290eed656
Signed by: jake
GPG key ID: 57AFB45680EDD477
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/config/csl.rs
View file

@ -1,7 +1,6 @@
use zip::ZipArchive; use zip::ZipArchive;
use mktemp::Temp;
use std::path::PathBuf; use std::path::PathBuf;
use utils::{get_exe_dir, result_override}; use utils::{get_exe_dir, result_override, get_temp_file};
use std::fs::File; use std::fs::File;
use std::io::{Read, Write}; use std::io::{Read, Write};
use config::consts::CSL_FILE_NAME; use config::consts::CSL_FILE_NAME;
@ -11,11 +10,6 @@ fn get_csl_path() -> PathBuf {
} }
fn get_temp_file() -> PathBuf {
return Temp::new_file().expect("Failed to create temporary file").to_path_buf();
}
fn get_csl_data(csl_name: String) -> Result<String, String> { fn get_csl_data(csl_name: String) -> Result<String, String> {
let zip_file = let zip_file =
try!(result_override(File::open(get_csl_path()), "Failed to read CSL zip".into())); try!(result_override(File::open(get_csl_path()), "Failed to read CSL zip".into()));

6
src/utils.rs
View file

@ -3,6 +3,8 @@ use std::process::exit;
use std::io::{self, Write}; use std::io::{self, Write};
use std::env::{current_exe, current_dir}; use std::env::{current_exe, current_dir};
use std::path::PathBuf; use std::path::PathBuf;
use mktemp::Temp;
#[inline] #[inline]
@ -45,3 +47,7 @@ pub fn resolve_path(path: String) -> PathBuf {
let base_dir = current_dir().unwrap(); let base_dir = current_dir().unwrap();
return base_dir.join(path); return base_dir.join(path);
} }
pub fn get_temp_file() -> PathBuf {
return Temp::new_file().expect("Failed to create temporary file").to_path_buf();
}