lifegpc/msg-tool
1
0
Fork 0
mirror of https://github.com/lifegpc/msg-tool.git synced 2026-06-10 15:12:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix lifetime

Browse Source
This commit is contained in:
lifegpc
2026-04-12 16:25:59 +08:00
parent 3457dcb5df
commit acbd18a3f6
30 changed files with 267 additions and 226 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/scripts/bgi/archive/v1.rs
View File

@@ -77,15 +77,15 @@ impl ScriptBuilder for BgiArchiveBuilder {
}
}
fn build_script_from_reader(
fn build_script_from_reader<'a>(
&self,
reader: Box<dyn ReadSeek>,
reader: Box<dyn ReadSeek + 'a>,
filename: &str,
_encoding: Encoding,
archive_encoding: Encoding,
config: &ExtraConfig,
_archive: Option<&Box<dyn Script>>,
) -> Result<Box<dyn Script>> {
) -> Result<Box<dyn Script + 'a>> {
Ok(Box::new(BgiArchive::new(
reader,
archive_encoding,
@@ -219,15 +219,16 @@ impl<T: Read + Seek> Seek for Entry<T> {
#[derive(Debug)]
/// Buriko General Interpreter/Ethornell Archive File Version 1 (.arc)
pub struct BgiArchive<T: Read + Seek + std::fmt::Debug> {
pub struct BgiArchive<'a, T: Read + Seek + std::fmt::Debug + 'a> {
reader: Arc<Mutex<T>>,
entries: Vec<BgiFileHeader>,
base_offset: u64,
#[cfg(feature = "bgi-img")]
is_sysgrp_arc: bool,
_mark: std::marker::PhantomData<&'a ()>,
}
impl<T: Read + Seek + std::fmt::Debug> BgiArchive<T> {
impl<'b, T: Read + Seek + std::fmt::Debug + 'b> BgiArchive<'b, T> {
/// Creates a new BGI archive from a reader.
///
/// * `reader` - The reader to read the archive from.
@@ -267,11 +268,12 @@ impl<T: Read + Seek + std::fmt::Debug> BgiArchive<T> {
base_offset: 16 + (file_count as u64 * 32),
#[cfg(feature = "bgi-img")]
is_sysgrp_arc,
_mark: std::marker::PhantomData,
})
}
}
impl<T: Read + Seek + std::fmt::Debug + 'static> Script for BgiArchive<T> {
impl<'b, T: Read + Seek + std::fmt::Debug + 'b> Script for BgiArchive<'b, T> {
fn default_output_script_type(&self) -> OutputScriptType {
OutputScriptType::Json
}

14
src/scripts/bgi/archive/v2.rs
View File

@@ -77,15 +77,15 @@ impl ScriptBuilder for BgiArchiveBuilder {
}
}
fn build_script_from_reader(
fn build_script_from_reader<'a>(
&self,
reader: Box<dyn ReadSeek>,
reader: Box<dyn ReadSeek + 'a>,
filename: &str,
_encoding: Encoding,
archive_encoding: Encoding,
config: &ExtraConfig,
_archive: Option<&Box<dyn Script>>,
) -> Result<Box<dyn Script>> {
) -> Result<Box<dyn Script + 'a>> {
Ok(Box::new(BgiArchive::new(
reader,
archive_encoding,
@@ -251,15 +251,16 @@ impl<F: Fn(&[u8], usize, &str) -> Option<&'static ScriptType>> ArchiveContent fo
#[derive(Debug)]
/// BGI Archive Version 2
pub struct BgiArchive<T: Read + Seek + std::fmt::Debug> {
pub struct BgiArchive<'b, T: Read + Seek + std::fmt::Debug + 'b> {
reader: Arc<Mutex<T>>,
entries: Vec<BgiFileHeader>,
base_offset: u64,
#[cfg(feature = "bgi-img")]
is_sysgrp_arc: bool,
_mark: std::marker::PhantomData<&'b ()>,
}
impl<T: Read + Seek + std::fmt::Debug> BgiArchive<T> {
impl<'b, T: Read + Seek + std::fmt::Debug + 'b> BgiArchive<'b, T> {
/// Creates a new BGI Archive from a reader.
///
/// * `reader` - The reader to read the archive from.
@@ -299,11 +300,12 @@ impl<T: Read + Seek + std::fmt::Debug> BgiArchive<T> {
base_offset: 16 + (file_count as u64 * 0x80),
#[cfg(feature = "bgi-img")]
is_sysgrp_arc,
_mark: std::marker::PhantomData,
})
}
}
impl<T: Read + Seek + std::fmt::Debug + 'static> Script for BgiArchive<T> {
impl<'b, T: Read + Seek + std::fmt::Debug + 'b> Script for BgiArchive<'b, T> {
fn default_output_script_type(&self) -> OutputScriptType {
OutputScriptType::Json
}

6
src/scripts/bgi/audio/audio.rs
View File

@@ -46,15 +46,15 @@ impl ScriptBuilder for BgiAudioBuilder {
Ok(Box::new(BgiAudio::new(f, config)?))
}
fn build_script_from_reader(
fn build_script_from_reader<'a>(
&self,
reader: Box<dyn ReadSeek>,
reader: Box<dyn ReadSeek + 'a>,
_filename: &str,
_encoding: Encoding,
_archive_encoding: Encoding,
config: &ExtraConfig,
_archive: Option<&Box<dyn Script>>,
) -> Result<Box<dyn Script>> {
) -> Result<Box<dyn Script + 'a>> {
Ok(Box::new(BgiAudio::new(reader, config)?))
}