Mirrors/Part-DB-server
2
0
Fork 0
mirror of https://github.com/Part-DB/Part-DB-server.git synced 2026-03-06 15:30:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix RegEx to handle negative values and Ohms without prefix (#530)

Browse Source 
* Fix RegEx to include negative values

* Update RegEx to handle Ω without prefix

* Update RegEx to include %

* Handle plus/minus values as range

* Fix copy&paste error

* Change minimum value to negative

* Escape decimal point and add slash to valid unit characters to be able to pick up for example "ppm/°C"

* Skip empty values
This commit is contained in:
frank-f
2024-02-24 22:48:38 +01:00
committed by GitHub
parent 0d6ab793ce
commit e8bc93f67a
2 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Services/InfoProviderSystem/DTOs/ParameterDTO.php
View File

@@ -106,7 +106,7 @@ class ParameterDTO
*/
public static function splitIntoValueAndUnit(string $value): ?array
{
if (preg_match('/^(?<value>[0-9.]+)\s*(?<unit>[°℃a-zA-Z_]+\s?\w{0,4})$/u', $value, $matches)) {
if (preg_match('/^(?<value>-?[0-9\.]+)\s*(?<unit>[%Ω°℃a-z_\/]+\s?\w{0,4})$/iu', $value, $matches)) {
$value = $matches['value'];
$unit = $matches['unit'];
@@ -115,4 +115,4 @@ class ParameterDTO
return null;
}
}
}

14
src/Services/InfoProviderSystem/Providers/LCSCProvider.php
View File

@@ -270,8 +270,11 @@ class LCSCProvider implements InfoProviderInterface
foreach ($attributes as $attribute) {
//Skip this attribute if it's empty
if (in_array(trim($attribute['paramValueEn']), array('', '-'))) {
continue;
//If the attribute contains a tilde we assume it is a range
if (str_contains($attribute['paramValueEn'], '~')) {
} elseif (str_contains($attribute['paramValueEn'], '~')) {
$parts = explode('~', $attribute['paramValueEn']);
if (count($parts) === 2) {
//Try to extract number and unit from value (allow leading +)
@@ -284,6 +287,13 @@ class LCSCProvider implements InfoProviderInterface
continue;
}
}
//If it's a plus/minus value, we'll also it like a range
} elseif (str_starts_with($attribute['paramValueEn'], '±')) {
[$number, $unit] = ParameterDTO::splitIntoValueAndUnit(ltrim($attribute['paramValueEn'], " ±")) ?? [$attribute['paramValueEn'], null];
if (is_numeric($number)) {
$result[] = new ParameterDTO(name: $attribute['paramNameEn'], value_min: -abs((float) $number), value_max: abs((float) $number), unit: $unit, group: null);
continue;
}
}
$result[] = ParameterDTO::parseValueIncludingUnit(name: $attribute['paramNameEn'], value: $attribute['paramValueEn'], group: null);
@@ -321,4 +331,4 @@ class LCSCProvider implements InfoProviderInterface
ProviderCapabilities::FOOTPRINT,
];
}
}
}