Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

M1 support #110

Closed
alpha0010 opened this issue Nov 11, 2022 · 1 comment
Closed

M1 support #110

alpha0010 opened this issue Nov 11, 2022 · 1 comment

Comments

@alpha0010
Copy link
Contributor

Was looking in to how this might work. With the current implementation, running on an M1 mac appears to always yield iPad8,6. However sentry seems to be able to detect the difference with their implementation. I lack much time to work on this currently, but here is a start, in case that is useful.

Generator/GeneratorDeviceList.plist
	<key>iMac21,1</key>
	<dict>
		<key>name</key>
		<string>iMac (24-inch, M1, 2021)</string>
		<key>enum</key>
		<string>IMAC_2021</string>
	</dict>
	<key>iMac21,2</key>
	<dict>
		<key>name</key>
		<string>iMac (24-inch, M1, 2021)</string>
		<key>enum</key>
		<string>IMAC_2021</string>
	</dict>
	<key>Macmini9,1</key>
	<dict>
		<key>name</key>
		<string>Mac mini (M1, 2020)</string>
		<key>enum</key>
		<string>MAC_MINI_2020</string>
	</dict>
	<key>MacBookAir10,1</key>
	<dict>
		<key>name</key>
		<string>MacBook Air (M1, 2020)</string>
		<key>enum</key>
		<string>MACBOOK_AIR_2020</string>
	</dict>
	<key>Mac14,2</key>
	<dict>
		<key>name</key>
		<string>MacBook Air (M2, 2022)</string>
		<key>enum</key>
		<string>MACBOOK_AIR_2022</string>
	</dict>
	<key>MacBookPro17,1</key>
	<dict>
		<key>name</key>
		<string>MacBook Pro (13-inch, M1, 2020)</string>
		<key>enum</key>
		<string>MACBOOK_PRO_2020</string>
	</dict>
	<key>MacBookPro18,1</key>
	<dict>
		<key>name</key>
		<string>MacBook Pro (16-inch, 2021)</string>
		<key>enum</key>
		<string>MACBOOK_PRO_16_2021</string>
	</dict>
	<key>MacBookPro18,2</key>
	<dict>
		<key>name</key>
		<string>MacBook Pro (16-inch, 2021)</string>
		<key>enum</key>
		<string>MACBOOK_PRO_16_2021</string>
	</dict>
	<key>MacBookPro18,3</key>
	<dict>
		<key>name</key>
		<string>MacBook Pro (14-inch, 2021)</string>
		<key>enum</key>
		<string>MACBOOK_PRO_14_2021</string>
	</dict>
	<key>MacBookPro18,4</key>
	<dict>
		<key>name</key>
		<string>MacBook Pro (14-inch, 2021)</string>
		<key>enum</key>
		<string>MACBOOK_PRO_14_2021</string>
	</dict>
	<key>Mac14,7</key>
	<dict>
		<key>name</key>
		<string>MacBook Pro (13-inch, M2, 2022)</string>
		<key>enum</key>
		<string>MACBOOK_PRO_2022</string>
	</dict>
Generator/main.swift
diff --git a/Generator/main.swift b/Generator/main.swift
index 09c145b..87d7449 100755
--- a/Generator/main.swift
+++ b/Generator/main.swift
@@ -98,6 +98,8 @@ func main() {
     let unknownIpadCase = "unknownIpad"
     let unknownAppleWatchCase = "unknownAppleWatch"
     let unknownAppleTVCase = "unknownAppleTV"
+    let unknownImacCase = "unknownImac"
+    let unknownMacCase = "unknownMac"
 
 
     var deviceList: [String: [String: AnyObject]] = [:]
@@ -128,7 +130,9 @@ func main() {
         + "\n\(tabSpacing)case \(unknownIpodCase)"
         + "\n\(tabSpacing)case \(unknownIpadCase)"
         + "\n\(tabSpacing)case \(unknownAppleWatchCase)"
-        + "\n\(tabSpacing)case \(unknownAppleTVCase)\n"
+        + "\n\(tabSpacing)case \(unknownAppleTVCase)"
+        + "\n\(tabSpacing)case \(unknownImacCase)"
+        + "\n\(tabSpacing)case \(unknownMacCase)\n"
 
         + "\n\(tabSpacing)case simulator\n"
 
@@ -166,6 +170,20 @@ func main() {
         let swiftEnumCase = normalizedEnum($0.enumCase)
         enumString += "\n\(tabSpacing)case \(swiftEnumCase)"
     }
+    enumString += "\n"
+
+    let iMacModels = getUniqueSortedModels(havingPrefix: "iMac", from: generatorDeviceList)
+    iMacModels.forEach {
+        let swiftEnumCase = normalizedEnum($0.enumCase)
+        enumString += "\n\(tabSpacing)case \(swiftEnumCase)"
+    }
+    enumString += "\n"
+
+    let macModels = getUniqueSortedModels(havingPrefix: "Mac", from: generatorDeviceList)
+    macModels.forEach {
+        let swiftEnumCase = normalizedEnum($0.enumCase)
+        enumString += "\n\(tabSpacing)case \(swiftEnumCase)"
+    }
 
     print("Creating \(enumFile)")
     do {
@@ -206,7 +224,9 @@ func main() {
             + "\(tabSpacing)\(tabSpacing)if (hardwareString.hasPrefix(\"iPod\")) { return .\(unknownIpodCase) }\n"
             + "\(tabSpacing)\(tabSpacing)if (hardwareString.hasPrefix(\"iPad\")) { return .\(unknownIpadCase) }\n"
             + "\(tabSpacing)\(tabSpacing)if (hardwareString.hasPrefix(\"Watch\")) { return .\(unknownAppleWatchCase) }\n"
-            + "\(tabSpacing)\(tabSpacing)if (hardwareString.hasPrefix(\"AppleTV\")) { return .\(unknownAppleTVCase) }\n\n"
+            + "\(tabSpacing)\(tabSpacing)if (hardwareString.hasPrefix(\"AppleTV\")) { return .\(unknownAppleTVCase) }\n"
+            + "\(tabSpacing)\(tabSpacing)if (hardwareString.hasPrefix(\"iMac\")) { return .\(unknownImacCase) }\n"
+            + "\(tabSpacing)\(tabSpacing)if (hardwareString.hasPrefix(\"Mac\")) { return .\(unknownMacCase) }\n\n"
             + "\(tabSpacing)\(tabSpacing)return .unknownDevice\n"
             + "\(tabSpacing)}\n"
             + "}\n"
@InderKumarRathore
Copy link
Owner

#117

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

No branches or pull requests

2 participants