rojo-rbx/rojo
1
0
Fork 1
mirror of https://github.com/rojo-rbx/rojo.git synced 2026-04-25 15:16:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Simplify snapshot code using match_file_name utility

Browse Source
This commit is contained in:
Lucien Greathouse
2019-10-09 18:27:52 -07:00
parent 6b620ddcef
commit e46f9fd94f
6 changed files with 27 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/snapshot_middleware/txt.rs
View File

@@ -12,6 +12,7 @@ use super::{
error::SnapshotError,
meta_file::AdjacentMetadata,
middleware::{SnapshotFileResult, SnapshotInstanceResult, SnapshotMiddleware},
util::match_file_name,
};
pub struct SnapshotTxt;
@@ -25,25 +26,11 @@ impl SnapshotMiddleware for SnapshotTxt {
return Ok(None);
}
let extension = match entry.path().extension() {
Some(x) => x
.to_str()
.ok_or_else(|| SnapshotError::file_name_bad_unicode(entry.path()))?,
let instance_name = match match_file_name(entry.path(), ".txt") {
Some(name) => name,
None => return Ok(None),
};
if extension != "txt" {
return Ok(None);
}
let instance_name = entry
.path()
.file_stem()
.expect("Could not extract file stem")
.to_str()
.ok_or_else(|| SnapshotError::file_name_bad_unicode(entry.path()))?
.to_string();
let contents = entry.contents(imfs)?;
let contents_str = str::from_utf8(contents)
.map_err(|err| SnapshotError::file_contents_bad_unicode(err, entry.path()))?
@@ -66,7 +53,7 @@ impl SnapshotMiddleware for SnapshotTxt {
relevant_paths: vec![entry.path().to_path_buf(), meta_path.clone()],
..Default::default()
},
name: Cow::Owned(instance_name),
name: Cow::Owned(instance_name.to_owned()),
class_name: Cow::Borrowed("StringValue"),
properties,
children: Vec::new(),