Use dev.mcap.mcap UTI only

jtbandes · jtbandes · commit 850a26344594 · 2022-11-02T12:46:32.000-07:00
diff --git a/MCAPSpotlightImporter/Config.xcconfig b/MCAPSpotlightImporter/Config.xcconfig
@@ -1,2 +1,2 @@
-CURRENT_PROJECT_VERSION = 2
-MARKETING_VERSION = 1.0.1
+CURRENT_PROJECT_VERSION = 3
+MARKETING_VERSION = 1.0.2
diff --git a/MCAPSpotlightImporter/Info.plist b/MCAPSpotlightImporter/Info.plist
@@ -9,7 +9,6 @@
 			<string>MDImporter</string>
 			<key>LSItemContentTypes</key>
 			<array>
-				<string>dev.foxglove.mcap</string>
 				<string>dev.mcap.mcap</string>
 			</array>
 		</dict>
diff --git a/MCAPSpotlightImporter/importMCAPAttributes.swift b/MCAPSpotlightImporter/importMCAPAttributes.swift
@@ -15,7 +15,6 @@ enum SchemaAttributes: String {
 
 extension UTType {
   static let mcap = UTType(importedAs: "dev.mcap.mcap", conformingTo: .data)
-  static let foxgloveMCAP = UTType(importedAs: "dev.foxglove.mcap", conformingTo: .data)
 }
 
 extension FileHandle: IRandomAccessReadable {
@@ -34,7 +33,7 @@ extension FileHandle: IRandomAccessReadable {
 }
 
 func importMCAPAttributes(_ attributes: inout [AnyHashable: Any], forFileAt url: URL, contentTypeUTI: String) -> Bool {
-  guard contentTypeUTI == UTType.mcap.identifier || contentTypeUTI == UTType.foxgloveMCAP.identifier else {
+  guard contentTypeUTI == UTType.mcap.identifier else {
     log.info("skipping importAttributes for url=\(url) contentTypeUTI=\(contentTypeUTI)")
     return false
   }
diff --git a/MCAPSpotlightImporter/schema.xml b/MCAPSpotlightImporter/schema.xml
@@ -10,20 +10,6 @@
     <attribute name="dev_foxglove_studio_mcap_metadata" multivalued="true" type="CFString"/>
   </attributes>
   <types>
-    <type name="dev.foxglove.mcap">
-      <allattrs>
-        dev_foxglove_studio_mcap_topics
-        dev_foxglove_studio_mcap_schemas
-        dev_foxglove_studio_mcap_attachments
-        dev_foxglove_studio_mcap_metadata
-      </allattrs>
-      <displayattrs>
-        dev_foxglove_studio_mcap_topics
-        dev_foxglove_studio_mcap_schemas
-        dev_foxglove_studio_mcap_attachments
-        dev_foxglove_studio_mcap_metadata
-      </displayattrs>
-    </type>
     <type name="dev.mcap.mcap">
       <allattrs>
         dev_foxglove_studio_mcap_topics

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,6 @@ enum SchemaAttributes: String {`
`15`	`15`
`16`	`16`	`extension UTType {`
`17`	`17`	`static let mcap = UTType(importedAs: "dev.mcap.mcap", conformingTo: .data)`
`18`		`- static let foxgloveMCAP = UTType(importedAs: "dev.foxglove.mcap", conformingTo: .data)`
`19`	`18`	`}`
`20`	`19`
`21`	`20`	`extension FileHandle: IRandomAccessReadable {`
`@@ -34,7 +33,7 @@ extension FileHandle: IRandomAccessReadable {`
`34`	`33`	`}`
`35`	`34`
`36`	`35`	`func importMCAPAttributes(_ attributes: inout [AnyHashable: Any], forFileAt url: URL, contentTypeUTI: String) -> Bool {`
`37`		`- guard contentTypeUTI == UTType.mcap.identifier \|\| contentTypeUTI == UTType.foxgloveMCAP.identifier else {`
	`36`	`+ guard contentTypeUTI == UTType.mcap.identifier else {`
`38`	`37`	`log.info("skipping importAttributes for url=\(url) contentTypeUTI=\(contentTypeUTI)")`
`39`	`38`	`return false`
`40`	`39`	`}`