lifegpc/msg-tool
1
0
Fork 0
mirror of https://github.com/lifegpc/msg-tool.git synced 2026-06-07 21:38:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

impl Send + Sync mark for archive extract API (#12)

Browse Source
This commit is contained in:
lifegpc
2026-04-13 15:35:01 +08:00
parent 034f4f7a52
commit 4f7d696dbe
21 changed files with 96 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/scripts/base.rs
View File

@@ -262,7 +262,7 @@ pub trait ArchiveContent: Read {
Ok(data)
}
/// Returns a reader that supports reading and seeking.
fn to_data<'a>(&'a mut self) -> Result<Box<dyn ReadSeek + 'a>> {
fn to_data<'a>(&'a mut self) -> Result<Box<dyn ReadSeek + Send + Sync + 'a>> {
Ok(Box::new(MemReader::new(self.data()?)))
}
}
@@ -460,7 +460,10 @@ pub trait Script: std::fmt::Debug {
}
/// Opens a file in the archive by its index.
fn open_file<'a>(&'a self, _index: usize) -> Result<Box<dyn ArchiveContent + 'a>> {
fn open_file<'a>(
&'a self,
_index: usize,
) -> Result<Box<dyn ArchiveContent + Send + Sync + 'a>> {
Err(anyhow::anyhow!(
"This script type does not support opening files."
))
@@ -474,7 +477,7 @@ pub trait Script: std::fmt::Debug {
&'a self,
name: &str,
ignore_case: bool,
) -> Result<Box<dyn ArchiveContent + 'a>> {
) -> Result<Box<dyn ArchiveContent + Send + Sync + 'a>> {
for (i, fname) in self.iter_archive_filename()?.enumerate() {
if let Ok(fname) = fname {
if fname == name || (ignore_case && fname.eq_ignore_ascii_case(name)) {
@@ -489,7 +492,10 @@ pub trait Script: std::fmt::Debug {
}
/// Opens a file in the archive by its offset.
fn open_file_by_offset<'a>(&'a self, offset: u64) -> Result<Box<dyn ArchiveContent + 'a>> {
fn open_file_by_offset<'a>(
&'a self,
offset: u64,
) -> Result<Box<dyn ArchiveContent + Send + Sync + 'a>> {
for (i, off) in self.iter_archive_offset()?.enumerate() {
if let Ok(off) = off {
if off == offset {