Revert "UTTypes"

This reverts commit 3e081ab.
Whisky-App · Aug 2, 2023 · 611bd0c · 611bd0c
1 parent 90f1af4
commit 611bd0c
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 114 deletions.
diff --git a/Whisky.xcodeproj/project.pbxproj b/Whisky.xcodeproj/project.pbxproj
@@ -38,7 +38,6 @@
 		6E5E23E82A30D59600ABC192 /* GPTK.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6E5E23E72A30D59600ABC192 /* GPTK.swift */; };
 		6E5E23EC2A30DBCA00ABC192 /* Hdiutil.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6E5E23EB2A30DBCA00ABC192 /* Hdiutil.swift */; };
 		6E621CEF2A5F631300C9AAB3 /* Winetricks.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6E621CEE2A5F631200C9AAB3 /* Winetricks.swift */; };
-		6E621CF12A61617900C9AAB3 /* UTTypeExtensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6E621CF02A61617900C9AAB3 /* UTTypeExtensions.swift */; };
 		6E6915452A3265BB0085BBB7 /* Logger.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6E6915442A3265BB0085BBB7 /* Logger.swift */; };
 		6E6C0CF22A419A6800356232 /* WelcomeView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6E6C0CF12A419A6800356232 /* WelcomeView.swift */; };
 		6E6C0CF42A419A7600356232 /* RosettaView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6E6C0CF32A419A7600356232 /* RosettaView.swift */; };
@@ -96,7 +95,6 @@
 		6E5E23E72A30D59600ABC192 /* GPTK.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GPTK.swift; sourceTree = "<group>"; };
 		6E5E23EB2A30DBCA00ABC192 /* Hdiutil.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Hdiutil.swift; sourceTree = "<group>"; };
 		6E621CEE2A5F631200C9AAB3 /* Winetricks.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Winetricks.swift; sourceTree = "<group>"; };
-		6E621CF02A61617900C9AAB3 /* UTTypeExtensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UTTypeExtensions.swift; sourceTree = "<group>"; };
 		6E62F24D29E0A58A0098FEFD /* es */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = es; path = es.lproj/Localizable.strings; sourceTree = "<group>"; };
 		6E62F24E29E0A58E0098FEFD /* pl */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = pl; path = pl.lproj/Localizable.strings; sourceTree = "<group>"; };
 		6E62F24F29E0A6B10098FEFD /* ru */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ru; path = ru.lproj/Localizable.strings; sourceTree = "<group>"; };
@@ -149,7 +147,6 @@
 			children = (
 				6E26058929D9282000DDD788 /* DataExtensions.swift */,
 				6E5D41792A39021B0038ABEA /* URLExtensions.swift */,
-				6E621CF02A61617900C9AAB3 /* UTTypeExtensions.swift */,
 			);
 			path = Extensions;
 			sourceTree = "<group>";
@@ -430,7 +427,6 @@
 				6E621CEF2A5F631300C9AAB3 /* Winetricks.swift in Sources */,
 				6E26058A29D9282000DDD788 /* DataExtensions.swift in Sources */,
 				6E5E23E82A30D59600ABC192 /* GPTK.swift in Sources */,
-				6E621CF12A61617900C9AAB3 /* UTTypeExtensions.swift in Sources */,
 				6E064B1429DD331F00D9A2D2 /* SparkleView.swift in Sources */,
 				6E3F750829EDBF7F0066D318 /* AppDBView.swift in Sources */,
 				6E40495629CCA19C006E3F1B /* WhiskyApp.swift in Sources */,

diff --git a/Whisky/Extensions/UTTypeExtensions.swift b/Whisky/Extensions/UTTypeExtensions.swift
diff --git a/Whisky/Info.plist b/Whisky/Info.plist
@@ -2,45 +2,6 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-	<key>CFBundleDocumentTypes</key>
-	<array>
-		<dict>
-			<key>CFBundleTypeExtensions</key>
-			<array>
-				<string>exe</string>
-			</array>
-			<key>CFBundleTypeIconSystemGenerated</key>
-			<integer>1</integer>
-			<key>CFBundleTypeName</key>
-			<string>Windows Executable</string>
-			<key>CFBundleTypeRole</key>
-			<string>Editor</string>
-		</dict>
-		<dict>
-			<key>CFBundleTypeExtensions</key>
-			<array>
-				<string>msi</string>
-			</array>
-			<key>CFBundleTypeIconSystemGenerated</key>
-			<integer>1</integer>
-			<key>CFBundleTypeName</key>
-			<string>Windows MSI Installer</string>
-			<key>CFBundleTypeRole</key>
-			<string>Editor</string>
-		</dict>
-		<dict>
-			<key>CFBundleTypeExtensions</key>
-			<array>
-				<string>lnk</string>
-			</array>
-			<key>CFBundleTypeIconSystemGenerated</key>
-			<integer>1</integer>
-			<key>CFBundleTypeName</key>
-			<string>Windows Shortcut</string>
-			<key>CFBundleTypeRole</key>
-			<string>Editor</string>
-		</dict>
-	</array>
 	<key>SUFeedURL</key>
 	<string>https://raw.githubusercontent.com/IsaacMarovitz/Whisky/sparkle/appcast.xml</string>
 	<key>SUPublicEDKey</key>
@@ -53,14 +14,9 @@
 				<string>public.data</string>
 			</array>
 			<key>UTTypeDescription</key>
-			<string>Windows MSI Installer</string>
+			<string>Microsoft MSI Installer</string>
 			<key>UTTypeIcons</key>
-			<dict>
-				<key>UTTypeIconBadgeName</key>
-				<string>AppIcon</string>
-				<key>UTTypeIconText</key>
-				<string>installer</string>
-			</dict>
+			<dict/>
 			<key>UTTypeIdentifier</key>
 			<string>com.microsoft.msi-installer</string>
 			<key>UTTypeTagSpecification</key>
@@ -71,55 +27,6 @@
 				</array>
 			</dict>
 		</dict>
-		<dict>
-			<key>UTTypeConformsTo</key>
-			<array>
-				<string>public.data</string>
-			</array>
-			<key>UTTypeDescription</key>
-			<string>Windows Shortcut</string>
-			<key>UTTypeIcons</key>
-			<dict>
-				<key>UTTypeIconBadgeName</key>
-				<string>AppIcon</string>
-				<key>UTTypeIconText</key>
-				<string>shortcut</string>
-			</dict>
-			<key>UTTypeIdentifier</key>
-			<string>com.microsoft.lnk-shortcut</string>
-			<key>UTTypeTagSpecification</key>
-			<dict>
-				<key>public.filename-extension</key>
-				<array>
-					<string>lnk</string>
-				</array>
-			</dict>
-		</dict>
-		<dict>
-			<key>UTTypeConformsTo</key>
-			<array>
-				<string>public.data</string>
-				<string>public.executable</string>
-			</array>
-			<key>UTTypeDescription</key>
-			<string>Windows Executable</string>
-			<key>UTTypeIcons</key>
-			<dict>
-				<key>UTTypeIconBadgeName</key>
-				<string>AppIcon</string>
-				<key>UTTypeIconText</key>
-				<string>executable</string>
-			</dict>
-			<key>UTTypeIdentifier</key>
-			<string>public.windows-executable</string>
-			<key>UTTypeTagSpecification</key>
-			<dict>
-				<key>public.filename-extension</key>
-				<array>
-					<string>exe</string>
-				</array>
-			</dict>
-		</dict>
 	</array>
 	<key>WineBinaryVersion</key>
 	<integer>4</integer>

diff --git a/Whisky/Views/Bottle Views/BottleView.swift b/Whisky/Views/Bottle Views/BottleView.swift
@@ -140,8 +140,7 @@ struct BottleView: View {
                     panel.canChooseDirectories = false
                     panel.canChooseFiles = true
                     panel.allowedContentTypes = [UTType.exe,
-                                                 UTType.msiInstaller,
-                                                 UTType.shortcut]
+                                                 UTType(importedAs: "com.microsoft.msi-installer")]
                     panel.directoryURL = bottle.url.appendingPathComponent("drive_c")
                     panel.begin { result in
                         programLoading = true