Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'imbris/small-improvements' into 'master'

Browse Source 
Small asset code improvements

See merge request veloren/veloren!4151
This commit is contained in:
Imbris 2023-10-20 14:51:15 +00:00
commit 15c5e53b12
2 changed files with 5 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
common/assets/src/lib.rs
View File

@ -258,14 +258,9 @@ impl<T: Concatenate> Concatenate for Ron<T> {
}
/// This wrapper combines several RON files from multiple sources
#[derive(Clone)]
pub struct MultiRon<T>(pub T);
impl<T: Clone> Clone for MultiRon<T> {
fn clone(&self) -> Self { Self(self.0.clone()) }
fn clone_from(&mut self, source: &Self) { self.0.clone_from(&source.0) }
}
#[cfg(feature = "plugins")]
impl<T> Compound for MultiRon<T>
where

42
common/assets/src/tar_source.rs
View File

@ -5,7 +5,6 @@ use tar::EntryType;
use std::{
fmt,
fs::File,
hash,
io::{self, Read, Seek, SeekFrom},
path::{self, Path, PathBuf},
};
@ -15,40 +14,8 @@ use std::{
#[derive(Clone, Hash, PartialEq, Eq)]
struct FileDesc(String, String);
/// This hack enables us to use a `(&str, &str)` as a key for an HashMap without
/// allocating a `FileDesc`
trait FileKey {
fn id(&self) -> &str;
fn ext(&self) -> &str;
}
impl FileKey for FileDesc {
fn id(&self) -> &str { &self.0 }
fn ext(&self) -> &str { &self.1 }
}
impl FileKey for (&'_ str, &'_ str) {
fn id(&self) -> &str { self.0 }
fn ext(&self) -> &str { self.1 }
}
impl<'a> std::borrow::Borrow<dyn FileKey + 'a> for FileDesc {
fn borrow(&self) -> &(dyn FileKey + 'a) { self }
}
impl PartialEq for dyn FileKey + '_ {
fn eq(&self, other: &Self) -> bool { self.id() == other.id() && self.ext() == other.ext() }
}
impl Eq for dyn FileKey + '_ {}
impl hash::Hash for dyn FileKey + '_ {
fn hash<H: hash::Hasher>(&self, hasher: &mut H) {
self.id().hash(hasher);
self.ext().hash(hasher);
}
impl hashbrown::Equivalent<FileDesc> for (&str, &str) {
fn equivalent(&self, key: &FileDesc) -> bool { self.0 == key.0 && self.1 == key.1 }
}
impl fmt::Debug for FileDesc {
@ -164,8 +131,7 @@ impl Tar {
impl Source for Tar {
fn read(&self, id: &str, ext: &str) -> io::Result<FileContent> {
let key: &dyn FileKey = &(id, ext);
let id = *self.files.get(key).ok_or(io::ErrorKind::NotFound)?;
let id = *self.files.get(&(id, ext)).ok_or(io::ErrorKind::NotFound)?;
self.backend.read(id.0, id.1).map(FileContent::Buffer)
}
@ -177,7 +143,7 @@ impl Source for Tar {
fn exists(&self, entry: DirEntry) -> bool {
match entry {
DirEntry::File(id, ext) => self.files.contains_key(&(id, ext) as &dyn FileKey),
DirEntry::File(id, ext) => self.files.contains_key(&(id, ext)),
DirEntry::Directory(id) => self.dirs.contains_key(id),
}
}