pakin/libtbr
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity Actions

fix ownership bug

Browse source
This commit is contained in:
Pakin 2025-09-08 13:48:32 +07:00
parent 477b726442
commit fa9f35bfac
1 changed files with 9 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/firmware/xbuilder.rs
View file

@ -198,11 +198,14 @@ impl XBuilder {
Self { saved_firmwares } Self { saved_firmwares }
} }
pub fn get_latest_by_options(&self, option: FirmwareFilterOptions) -> Vec<LastBuildFirmware> { pub fn get_latest_by_options(
&self,
option: &mut FirmwareFilterOptions,
) -> Vec<LastBuildFirmware> {
let mut result = Vec::new(); let mut result = Vec::new();
if option.short_country_code.is_some() { if option.short_country_code.is_some() {
let cc_option = option.short_country_code.unwrap(); let cc_option = option.short_country_code.as_ref().unwrap();
result = self result = self
.saved_firmwares .saved_firmwares
.iter() .iter()
@ -217,11 +220,11 @@ impl XBuilder {
} else { } else {
result.clone() result.clone()
}; };
let version_option = option.version.unwrap(); let version_option = option.version.as_ref().unwrap();
result = filter_target result = filter_target
.iter() .iter()
.filter(|fw| fw.path.contains(&version_option)) .filter(|fw| fw.path.contains(version_option))
.map(|fw| fw.clone()) .map(|fw| fw.clone())
.collect(); .collect();
} }
@ -232,7 +235,7 @@ impl XBuilder {
} else { } else {
result.clone() result.clone()
}; };
let fw_type = option.fw_type.unwrap(); let fw_type = option.fw_type.as_ref().unwrap();
result = filter_target result = filter_target
.iter() .iter()
@ -248,7 +251,7 @@ impl XBuilder {
result.clone() result.clone()
}; };
let mut f_result = Vec::new(); let mut f_result = Vec::new();
let mut predicate = option.additional_condition.unwrap(); let predicate = option.additional_condition.as_mut().unwrap();
for fw in filter_target { for fw in filter_target {
if predicate(fw.clone()) { if predicate(fw.clone()) {