From 76856da1ca2ace3564f81b28ad2ac183127c86a5 Mon Sep 17 00:00:00 2001 From: Serhiy Mytrovtsiy Date: Tue, 19 Jul 2022 19:01:43 +0200 Subject: [PATCH] feat: removed mac year from the model name. A lot of models could have the same model but different years. --- Kit/plugins/SystemKit.swift | 131 ++++++++++++++++++------------------ 1 file changed, 66 insertions(+), 65 deletions(-) diff --git a/Kit/plugins/SystemKit.swift b/Kit/plugins/SystemKit.swift index 5e3d9ce1..0846f17e 100644 --- a/Kit/plugins/SystemKit.swift +++ b/Kit/plugins/SystemKit.swift @@ -373,86 +373,86 @@ public class SystemKit { let deviceDict: [String: model_s] = [ // Mac Mini - "Macmini6,1": model_s(name: "Mac mini (Late 2012)", year: 2012, type: .macMini), - "Macmini6,2": model_s(name: "Mac mini (Late 2012)", year: 2012, type: .macMini), - "Macmini7,1": model_s(name: "Mac mini (Late 2014)", year: 2014, type: .macMini), - "Macmini8,1": model_s(name: "Mac mini (Late 2018)", year: 2018, type: .macMini), - "Macmini9,1": model_s(name: "Mac mini (M1, 2020)", year: 2020, type: .macMini), + "Macmini6,1": model_s(name: "Mac mini", year: 2012, type: .macMini), + "Macmini6,2": model_s(name: "Mac mini", year: 2012, type: .macMini), + "Macmini7,1": model_s(name: "Mac mini", year: 2014, type: .macMini), + "Macmini8,1": model_s(name: "Mac mini", year: 2018, type: .macMini), + "Macmini9,1": model_s(name: "Mac mini (M1)", year: 2020, type: .macMini), // Mac Studio "Mac13,1": model_s(name: "Mac Studio (M1 Max)", year: 2022, type: .macStudio), "Mac13,2": model_s(name: "Mac Studio (M1 Ultra)", year: 2022, type: .macStudio), // Mac Pro - "MacPro5,1": model_s(name: "Mac Pro (2010/2012)", year: 2010, type: .macPro), - "MacPro6,1": model_s(name: "Mac Pro (Late 2013)", year: 2016, type: .macPro), - "MacPro7,1": model_s(name: "Mac Pro (2019)", year: 2019, type: .macPro), + "MacPro5,1": model_s(name: "Mac Pro", year: 2010, type: .macPro), + "MacPro6,1": model_s(name: "Mac Pro", year: 2016, type: .macPro), + "MacPro7,1": model_s(name: "Mac Pro", year: 2019, type: .macPro), // iMac - "iMac12,1": model_s(name: "iMac 27-Inch (Mid 2011)", year: 2011, type: .imac), - "iMac13,1": model_s(name: "iMac 21.5-Inch (Late 2012)", year: 2012, type: .imac), - "iMac13,2": model_s(name: "iMac 27-Inch (Late 2012)", year: 2012, type: .imac), - "iMac14,2": model_s(name: "iMac 27-Inch (Late 2013)", year: 2013, type: .imac), - "iMac15,1": model_s(name: "iMac 27-Inch (5K, Late 2014)", year: 2014, type: .imac), - "iMac17,1": model_s(name: "iMac 27-Inch (5K, Late 2015)", year: 2015, type: .imac), - "iMac18,1": model_s(name: "iMac 21.5-Inch (Mid 2017)", year: 2017, type: .imac), - "iMac18,2": model_s(name: "iMac 21.5-Inch (4K, Mid 2017)", year: 2017, type: .imac), - "iMac18,3": model_s(name: "iMac 27-Inch (5K, Mid 2017)", year: 2017, type: .imac), - "iMac19,1": model_s(name: "iMac 27-Inch (5K, 2019)", year: 2019, type: .imac), - "iMac20,1": model_s(name: "iMac 27-Inch (5K, 2020)", year: 2020, type: .imac), - "iMac20,2": model_s(name: "iMac 27-Inch (5K, 2020, 5700/XT)", year: 2020, type: .imac), - "iMac21,1": model_s(name: "iMac 24-Inch (M1, 2021)", year: 2021, type: .imac), - "iMac21,2": model_s(name: "iMac 24-Inch (M1, 2021)", year: 2021, type: .imac), + "iMac12,1": model_s(name: "iMac 27-Inch", year: 2011, type: .imac), + "iMac13,1": model_s(name: "iMac 21.5-Inch", year: 2012, type: .imac), + "iMac13,2": model_s(name: "iMac 27-Inch", year: 2012, type: .imac), + "iMac14,2": model_s(name: "iMac 27-Inch", year: 2013, type: .imac), + "iMac15,1": model_s(name: "iMac 27-Inch", year: 2014, type: .imac), + "iMac17,1": model_s(name: "iMac 27-Inch", year: 2015, type: .imac), + "iMac18,1": model_s(name: "iMac 21.5-Inch", year: 2017, type: .imac), + "iMac18,2": model_s(name: "iMac 21.5-Inch", year: 2017, type: .imac), + "iMac18,3": model_s(name: "iMac 27-Inch", year: 2017, type: .imac), + "iMac19,1": model_s(name: "iMac 27-Inch", year: 2019, type: .imac), + "iMac20,1": model_s(name: "iMac 27-Inch", year: 2020, type: .imac), + "iMac20,2": model_s(name: "iMac 27-Inch", year: 2020, type: .imac), + "iMac21,1": model_s(name: "iMac 24-Inch (M1)", year: 2021, type: .imac), + "iMac21,2": model_s(name: "iMac 24-Inch (M1)", year: 2021, type: .imac), // iMac Pro - "iMacPro1,1": model_s(name: "iMac Pro (5K, Late 2017)", year: 2017, type: .imacpro), + "iMacPro1,1": model_s(name: "iMac Pro", year: 2017, type: .imacpro), // MacBook - "MacBook8,1": model_s(name: "MacBook (Early 2015)", year: 2015, type: .macbook), - "MacBook9,1": model_s(name: "MacBook (Early 2016)", year: 2016, type: .macbook), - "MacBook10,1": model_s(name: "MacBook (Early 2017)", year: 2017, type: .macbook), + "MacBook8,1": model_s(name: "MacBook", year: 2015, type: .macbook), + "MacBook9,1": model_s(name: "MacBook", year: 2016, type: .macbook), + "MacBook10,1": model_s(name: "MacBook", year: 2017, type: .macbook), // MacBook Air - "MacBookAir5,1": model_s(name: "MacBook Air 11\" (Mid 2012)", year: 2012, type: .macbookAir), - "MacBookAir5,2": model_s(name: "MacBook Air 13\" (Mid 2012)", year: 2012, type: .macbookAir), - "MacBookAir6,1": model_s(name: "MacBook Air 11\" (Early 2014)", year: 2014, type: .macbookAir), - "MacBookAir6,2": model_s(name: "MacBook Air 13\" (Early 2014)", year: 2014, type: .macbookAir), - "MacBookAir7,1": model_s(name: "MacBook Air 11\" (Early 2015)", year: 2015, type: .macbookAir), - "MacBookAir7,2": model_s(name: "MacBook Air 13\" (Early 2015)", year: 2015, type: .macbookAir), - "MacBookAir8,1": model_s(name: "MacBook Air 13\" (2018)", year: 2018, type: .macbookAir), - "MacBookAir8,2": model_s(name: "MacBook Air 13\" (2019)", year: 2019, type: .macbookAir), - "MacBookAir9,1": model_s(name: "MacBook Air 13\" (2020)", year: 2020, type: .macbookAir), - "MacBookAir10,1": model_s(name: "MacBook Air 13\" (M1, 2020)", year: 2020, type: .macbookAir), + "MacBookAir5,1": model_s(name: "MacBook Air 11\"", year: 2012, type: .macbookAir), + "MacBookAir5,2": model_s(name: "MacBook Air 13\"", year: 2012, type: .macbookAir), + "MacBookAir6,1": model_s(name: "MacBook Air 11\"", year: 2014, type: .macbookAir), + "MacBookAir6,2": model_s(name: "MacBook Air 13\"", year: 2014, type: .macbookAir), + "MacBookAir7,1": model_s(name: "MacBook Air 11\"", year: 2015, type: .macbookAir), + "MacBookAir7,2": model_s(name: "MacBook Air 13\"", year: 2015, type: .macbookAir), + "MacBookAir8,1": model_s(name: "MacBook Air 13\"", year: 2018, type: .macbookAir), + "MacBookAir8,2": model_s(name: "MacBook Air 13\"", year: 2019, type: .macbookAir), + "MacBookAir9,1": model_s(name: "MacBook Air 13\"", year: 2020, type: .macbookAir), + "MacBookAir10,1": model_s(name: "MacBook Air 13\" (M1)", year: 2020, type: .macbookAir), // MacBook Pro - "MacBookPro9,1": model_s(name: "MacBook Pro 15\" (Mid 2012)", year: 2012, type: .macbookPro), - "MacBookPro9,2": model_s(name: "MacBook Pro 13\" (Mid 2012)", year: 2012, type: .macbookPro), - "MacBookPro10,1": model_s(name: "MacBook Pro 15\" (Retina, Mid 2012)", year: 2012, type: .macbookPro), - "MacBookPro10,2": model_s(name: "MacBook Pro 13\" (Retina, Late 2012)", year: 2012, type: .macbookPro), - "MacBookPro11,1": model_s(name: "MacBook Pro 13\" (Retina, Mid 2014)", year: 2014, type: .macbookPro), - "MacBookPro11,2": model_s(name: "MacBook Pro 15\" (Retina, Mid 2014)", year: 2014, type: .macbookPro), - "MacBookPro11,3": model_s(name: "MacBook Pro 15\" (Retina, Mid 2014)", year: 2014, type: .macbookPro), - "MacBookPro11,4": model_s(name: "MacBook Pro 15\" (Retina, Mid 2015)", year: 2015, type: .macbookPro), - "MacBookPro11,5": model_s(name: "MacBook Pro 15\" (Retina, Mid 2015)", year: 2015, type: .macbookPro), - "MacBookPro12,1": model_s(name: "MacBook Pro 13\" (Mid 2015)", year: 2015, type: .macbookPro), - "MacBookPro13,1": model_s(name: "MacBook Pro 13\" (Late 2016)", year: 2016, type: .macbookPro), - "MacBookPro13,2": model_s(name: "MacBook Pro 13\" (Late 2016)", year: 2016, type: .macbookPro), - "MacBookPro13,3": model_s(name: "MacBook Pro 15\" (Late 2016)", year: 2016, type: .macbookPro), - "MacBookPro14,1": model_s(name: "MacBook Pro 13\" (Mid 2017)", year: 2017, type: .macbookPro), - "MacBookPro14,2": model_s(name: "MacBook Pro 13\" (Mid 2017)", year: 2017, type: .macbookPro), - "MacBookPro14,3": model_s(name: "MacBook Pro 15\" (Mid 2017)", year: 2017, type: .macbookPro), - "MacBookPro15,1": model_s(name: "MacBook Pro 15\" (Mid 2018)", year: 2018, type: .macbookPro), - "MacBookPro15,2": model_s(name: "MacBook Pro 13\" (Mid 2019)", year: 2019, type: .macbookPro), - "MacBookPro15,3": model_s(name: "MacBook Pro 15\" (Mid 2019)", year: 2019, type: .macbookPro), - "MacBookPro15,4": model_s(name: "MacBook Pro 13\" (Mid 2019)", year: 2019, type: .macbookPro), - "MacBookPro16,1": model_s(name: "MacBook Pro 16\" (Late 2019)", year: 2019, type: .macbookPro), - "MacBookPro16,2": model_s(name: "MacBook Pro 13\" (Mid 2020)", year: 2019, type: .macbookPro), - "MacBookPro16,3": model_s(name: "MacBook Pro 13\" (Mid 2020)", year: 2020, type: .macbookPro), - "MacBookPro17,1": model_s(name: "MacBook Pro 13\" (M1, 2020)", year: 2020, type: .macbookPro), - "MacBookPro18,1": model_s(name: "MacBook Pro 16\" (M1 Pro, 2021)", year: 2021, type: .macbookPro), - "MacBookPro18,2": model_s(name: "MacBook Pro 16\" (M1 Max, 2021)", year: 2021, type: .macbookPro), - "MacBookPro18,3": model_s(name: "MacBook Pro 14\" (M1 Pro, 2021)", year: 2021, type: .macbookPro), - "MacBookPro18,4": model_s(name: "MacBook Pro 14\" (M1 Max, 2021)", year: 2021, type: .macbookPro) + "MacBookPro9,1": model_s(name: "MacBook Pro 15\"", year: 2012, type: .macbookPro), + "MacBookPro9,2": model_s(name: "MacBook Pro 13\"", year: 2012, type: .macbookPro), + "MacBookPro10,1": model_s(name: "MacBook Pro 15\"", year: 2012, type: .macbookPro), + "MacBookPro10,2": model_s(name: "MacBook Pro 13\"", year: 2012, type: .macbookPro), + "MacBookPro11,1": model_s(name: "MacBook Pro 13\"", year: 2014, type: .macbookPro), + "MacBookPro11,2": model_s(name: "MacBook Pro 15\"", year: 2014, type: .macbookPro), + "MacBookPro11,3": model_s(name: "MacBook Pro 15\"", year: 2014, type: .macbookPro), + "MacBookPro11,4": model_s(name: "MacBook Pro 15\"", year: 2015, type: .macbookPro), + "MacBookPro11,5": model_s(name: "MacBook Pro 15\"", year: 2015, type: .macbookPro), + "MacBookPro12,1": model_s(name: "MacBook Pro 13\"", year: 2015, type: .macbookPro), + "MacBookPro13,1": model_s(name: "MacBook Pro 13\"", year: 2016, type: .macbookPro), + "MacBookPro13,2": model_s(name: "MacBook Pro 13\"", year: 2016, type: .macbookPro), + "MacBookPro13,3": model_s(name: "MacBook Pro 15\"", year: 2016, type: .macbookPro), + "MacBookPro14,1": model_s(name: "MacBook Pro 13\"", year: 2017, type: .macbookPro), + "MacBookPro14,2": model_s(name: "MacBook Pro 13\"", year: 2017, type: .macbookPro), + "MacBookPro14,3": model_s(name: "MacBook Pro 15\"", year: 2017, type: .macbookPro), + "MacBookPro15,1": model_s(name: "MacBook Pro 15\"", year: 2018, type: .macbookPro), + "MacBookPro15,2": model_s(name: "MacBook Pro 13\"", year: 2019, type: .macbookPro), + "MacBookPro15,3": model_s(name: "MacBook Pro 15\"", year: 2019, type: .macbookPro), + "MacBookPro15,4": model_s(name: "MacBook Pro 13\"", year: 2019, type: .macbookPro), + "MacBookPro16,1": model_s(name: "MacBook Pro 16\"", year: 2019, type: .macbookPro), + "MacBookPro16,2": model_s(name: "MacBook Pro 13\"", year: 2019, type: .macbookPro), + "MacBookPro16,3": model_s(name: "MacBook Pro 13\"", year: 2020, type: .macbookPro), + "MacBookPro17,1": model_s(name: "MacBook Pro 13\" (M1)", year: 2020, type: .macbookPro), + "MacBookPro18,1": model_s(name: "MacBook Pro 16\" (M1 Pro)", year: 2021, type: .macbookPro), + "MacBookPro18,2": model_s(name: "MacBook Pro 16\" (M1 Max)", year: 2021, type: .macbookPro), + "MacBookPro18,3": model_s(name: "MacBook Pro 14\" (M1 Pro)", year: 2021, type: .macbookPro), + "MacBookPro18,4": model_s(name: "MacBook Pro 14\" (M1 Max)", year: 2021, type: .macbookPro) ] let osDict: [String: String] = [ @@ -460,5 +460,6 @@ let osDict: [String: String] = [ "10.14": "Mojave", "10.15": "Catalina", "11": "Big Sur", - "12": "Monterey" + "12": "Monterey", + "13": "Ventura" ]