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

move plugin list into source

Browse Source
This commit is contained in:
Christof Petig 2023-10-15 00:13:57 +02:00
parent 3a6d94bd3c
commit baccdeb22f
1 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
common/assets/src/plugin_cache.rs
View File

@ -5,30 +5,26 @@ use crate::Concatenate;
use super::{fs::FileSystem, tar_source::Tar}; use super::{fs::FileSystem, tar_source::Tar};
use assets_manager::{ use assets_manager::{
source::{FileContent, Source}, source::{FileContent, Source},
AnyCache, AssetCache, BoxedError, AnyCache, AssetCache, BoxedError, hot_reloading::{EventSender, DynUpdateSender},
}; };
use lazy_static::lazy_static;
struct PluginEntry { struct PluginEntry {
path: PathBuf, path: PathBuf,
cache: AssetCache<Tar>, cache: AssetCache<Tar>,
} }
lazy_static! {
static ref PLUGIN_LIST: RwLock<Vec<PluginEntry>> = RwLock::new(Vec::new());
}
/// The source combining filesystem and plugins (typically used via /// The source combining filesystem and plugins (typically used via
/// CombinedCache) /// CombinedCache)
#[derive(Debug, Clone)]
pub struct CombinedSource { pub struct CombinedSource {
fs: FileSystem, fs: FileSystem,
plugin_list: RwLock<Vec<PluginEntry>>,
} }
impl CombinedSource { impl CombinedSource {
pub fn new() -> std::io::Result<Self> { pub fn new() -> std::io::Result<Self> {
Ok(Self { Ok(Self {
fs: FileSystem::new()?, fs: FileSystem::new()?,
plugin_list: RwLock::new(Vec::new()),
}) })
} }
} }
@ -39,7 +35,7 @@ impl CombinedSource {
if let Ok(file_entry) = self.fs.read(id, ext) { if let Ok(file_entry) = self.fs.read(id, ext) {
result.push((None, file_entry)); result.push((None, file_entry));
} }
if let Ok(guard) = PLUGIN_LIST.read() { if let Ok(guard) = self.plugin_list.read() {
for (n, p) in guard.iter().enumerate() { for (n, p) in guard.iter().enumerate() {
if let Ok(entry) = p.cache.raw_source().read(id, ext) { if let Ok(entry) = p.cache.raw_source().read(id, ext) {
result.push((Some(n), match entry { result.push((Some(n), match entry {
@ -58,7 +54,7 @@ impl CombinedSource {
// we don't want to keep the lock, so we clone // we don't want to keep the lock, so we clone
fn plugin_path(&self, index: Option<usize>) -> Option<PathBuf> { fn plugin_path(&self, index: Option<usize>) -> Option<PathBuf> {
if let Some(index) = index { if let Some(index) = index {
PLUGIN_LIST self.plugin_list
.read() .read()
.ok() .ok()
.and_then(|p| p.get(index).map(|p| p.path.clone())) .and_then(|p| p.get(index).map(|p| p.path.clone()))
@ -97,13 +93,18 @@ impl Source for CombinedSource {
fn exists(&self, entry: assets_manager::source::DirEntry) -> bool { fn exists(&self, entry: assets_manager::source::DirEntry) -> bool {
self.fs.exists(entry) self.fs.exists(entry)
|| PLUGIN_LIST || self.plugin_list
.read() .read()
.map(|p| p.iter().any(|p| p.cache.raw_source().exists(entry))) .map(|p| p.iter().any(|p| p.cache.raw_source().exists(entry)))
.unwrap_or_default() .unwrap_or_default()
} }
fn make_source(&self) -> Option<Box<dyn Source + Send>> { None } // TODO: Enable hot reloading for plugins
fn make_source(&self) -> Option<Box<dyn Source + Send>> { self.fs.make_source() }
fn configure_hot_reloading(&self, events: EventSender) -> Result<DynUpdateSender, BoxedError> {
self.fs.configure_hot_reloading(events)
}
} }
/// A cache combining filesystem and plugin assets /// A cache combining filesystem and plugin assets
@ -120,7 +121,7 @@ impl CombinedCache {
load_from: impl Fn(AnyCache) -> Result<T, BoxedError>, load_from: impl Fn(AnyCache) -> Result<T, BoxedError>,
) -> Result<T, BoxedError> { ) -> Result<T, BoxedError> {
let mut result = load_from(self.as_any_cache()); let mut result = load_from(self.as_any_cache());
for i in PLUGIN_LIST.read().unwrap().iter() { for i in self.0.raw_source().plugin_list.read().unwrap().iter() {
if let Ok(b) = load_from(i.cache.as_any_cache()) { if let Ok(b) = load_from(i.cache.as_any_cache()) {
result = if let Ok(a) = result { result = if let Ok(a) = result {
Ok(a.concatenate(b)) Ok(a.concatenate(b))
@ -136,7 +137,7 @@ impl CombinedCache {
let tar_source = Tar::from_path(&path)?; let tar_source = Tar::from_path(&path)?;
println!("Tar {:?} {:?}", path, tar_source); println!("Tar {:?} {:?}", path, tar_source);
let cache = AssetCache::with_source(tar_source); let cache = AssetCache::with_source(tar_source);
PLUGIN_LIST.write().unwrap().push(PluginEntry { path, cache }); self.0.raw_source().plugin_list.write().unwrap().push(PluginEntry { path, cache });
Ok(()) Ok(())
} }
} }