Remove useless new function for EncodedFilename
This commit is contained in:
parent
c57f9b3a85
commit
4b93f8071f
|
@ -1,5 +1,3 @@
|
||||||
use std::path::Path;
|
|
||||||
|
|
||||||
use sha2::{Digest, Sha256};
|
use sha2::{Digest, Sha256};
|
||||||
|
|
||||||
/// EncodedFilename
|
/// EncodedFilename
|
||||||
|
@ -9,38 +7,6 @@ pub enum EncodedFilename {
|
||||||
LongFilename(LongFilename),
|
LongFilename(LongFilename),
|
||||||
}
|
}
|
||||||
|
|
||||||
impl EncodedFilename {
|
|
||||||
fn new<P>(file: P) -> crate::error::Result<Self>
|
|
||||||
where
|
|
||||||
P: AsRef<Path>,
|
|
||||||
{
|
|
||||||
let path = file.as_ref();
|
|
||||||
|
|
||||||
let filename = path
|
|
||||||
.file_name()
|
|
||||||
.unwrap()
|
|
||||||
.to_str()
|
|
||||||
.expect("Failed to get filename");
|
|
||||||
|
|
||||||
if filename.starts_with("gocryptfs.longname.") {
|
|
||||||
if !filename.ends_with(".name") {
|
|
||||||
let long = std::fs::read_to_string(
|
|
||||||
path.parent().unwrap().join(format!("{}.name", filename)),
|
|
||||||
)
|
|
||||||
.unwrap();
|
|
||||||
Ok(EncodedFilename::LongFilename(LongFilename {
|
|
||||||
filename: filename.to_string(),
|
|
||||||
filename_content: long,
|
|
||||||
}))
|
|
||||||
} else {
|
|
||||||
panic!()
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
Ok(EncodedFilename::ShortFilename(filename.to_string()))
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
#[derive(Debug, PartialEq)]
|
#[derive(Debug, PartialEq)]
|
||||||
pub struct LongFilename {
|
pub struct LongFilename {
|
||||||
pub filename: String,
|
pub filename: String,
|
||||||
|
|
Loading…
Reference in New Issue