fireinfo: Shorten some more CPU names of AMD

diff --git a/webapp/backend/fireinfo.py b/webapp/backend/fireinfo.py
index aa405f406c9332d0795cf03081cab9dc64592135..91abbf47a42df9cd3a784b7f901ec16298fd153d 100644 (file)
--- a/webapp/backend/fireinfo.py
+++ b/webapp/backend/fireinfo.py
@@ -34,6 +34,7 @@ CPU_STRINGS = (
        ### AMD ###
        # APU
        (r"AMD ([\w\-]+) APU with Radeon\(tm\) HD Graphics", r"AMD \1 APU"),
+       (r"AMD ([\w\-]+) Radeon R\d+, \d+ Compute Cores \d+C\+\d+G", r"AMD \1 APU"),
        # Athlon
        (r"AMD Athlon.* II X2 ([a-z0-9]+).*", r"AMD Athlon X2 \1"),
        (r"AMD Athlon\(tm\) 64 Processor (\w+)", r"AMD Athlon64 \1"),
@@ -45,6 +46,8 @@ CPU_STRINGS = (
        # Geode
        (r"Geode\(TM\) Integrated Processor by AMD PCS", r"AMD Geode"),
        (r"(Geode).*", r"\1"),
+       # Mobile
+       (r"Mobile AMD (Athlon|Sempron)\(tm\) Processor (\d+\+?)", r"AMD \1-M \2"),
 
        # Intel
        (r"Intel\(R\) (Atom|Celeron).*CPU\s*([A-Z0-9]+) .*", r"Intel \1 \2"),