From a03f1f478a5f75de79ff2348461c8e9ed9872d3f Mon Sep 17 00:00:00 2001 From: Simon Rettberg Date: Thu, 7 Nov 2019 10:30:37 +0100 Subject: [statistics] Modularize --- modules-available/statistics/inc/parser.inc.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'modules-available/statistics/inc/parser.inc.php') diff --git a/modules-available/statistics/inc/parser.inc.php b/modules-available/statistics/inc/parser.inc.php index fe850109..764d18c1 100644 --- a/modules-available/statistics/inc/parser.inc.php +++ b/modules-available/statistics/inc/parser.inc.php @@ -74,6 +74,8 @@ class Parser { if (preg_match('/^\s*Size:\s*(.*?)\s*$/i', $line, $out)) { $row['extram'] = true; if (preg_match('/(\d+)\s*(\w)i?B/i', $out[1])) { + if (self::convertSize($out[1], 'M', false) < 35) + continue; // TODO: Parsing this line by line is painful. Check for other indicators, like Locator $ramslot['size'] = self::convertSize($out[1], 'G'); } elseif (!isset($row['ramslot']) || (count($row['ramslot']) < 8 && (!isset($row['ramslotcount']) || $row['ramslotcount'] <= 8))) { $ramslot['size'] = '_____'; @@ -126,7 +128,7 @@ class Parser { { if (!preg_match('/(\d+)\s*([TGMK]?)/i', $string, $out)) return false; - $val = (int)$out[1] * self::LOOKUP[$out[2]]; + $val = (int)$out[1] * self::LOOKUP[strtoupper($out[2])]; if (!array_key_exists($scale, self::LOOKUP)) { foreach (self::LOOKUP as $k => $v) { if ($k === '' || $val / 8 >= $v || abs($val - $v) < 50) { -- cgit v1.2.3-55-g7522