Notion and Airtable output CSV and JSON, JSON now uses array for Audi…

…o Role (#21)
TheAcharya · Dec 5, 2023 · 901c281 · 901c281
1 parent b7e926c
commit 901c281
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 12 deletions.
diff --git a/Sources/MarkersExtractor/Export/Profile/Airtable/AirtableExportProfile Export.swift b/Sources/MarkersExtractor/Export/Profile/Airtable/AirtableExportProfile Export.swift
@@ -39,19 +39,17 @@ extension AirtableExportProfile {
             preparedMarkers
         )
 
-        // skip exporting JSON because we don't need it for Airlift (3rd-party library)
-        // try jsonWriteManifest(
-        //     jsonPath: payload.jsonPayload.jsonPath,
-        //     noMedia: noMedia,
-        //     preparedMarkers
-        // )
+        try jsonWriteManifest(
+            jsonPath: payload.jsonPayload.jsonPath,
+            noMedia: noMedia,
+            preparedMarkers
+        )
     }
 
     public func resultFileContent(payload: Payload) throws -> ExportResult.ResultDictionary {
         [
-            .csvManifestPath: .url(payload.csvPayload.csvPath)
-            // skip exporting JSON because we don't need it for Airlift (3rd-party library)
-            // .jsonManifestPath: .url(payload.jsonPayload.jsonPath)
+            .csvManifestPath: .url(payload.csvPayload.csvPath),
+            .jsonManifestPath: .url(payload.jsonPayload.jsonPath)
         ]
     }
 
@@ -76,6 +74,7 @@ extension AirtableExportProfile {
         dict[.eventName] = marker.eventName
         dict[.projectName] = marker.projectName
         dict[.libraryName] = marker.libraryName
+        // no iconImage
 
         if !noMedia {
             dict[.imageFileName] = marker.imageFileName
@@ -105,6 +104,7 @@ extension AirtableExportProfile {
         dict[.eventName] = .string(marker.eventName)
         dict[.projectName] = .string(marker.projectName)
         dict[.libraryName] = .string(marker.libraryName)
+        // no iconImage
 
         if !noMedia {
             dict[.imageFileName] = .string(marker.imageFileName)

diff --git a/Sources/MarkersExtractor/Export/Profile/Notion/NotionExportProfile Export.swift b/Sources/MarkersExtractor/Export/Profile/Notion/NotionExportProfile Export.swift
@@ -34,11 +34,24 @@ extension NotionExportProfile {
         payload: Payload,
         noMedia: Bool
     ) throws {
-        try csvWriteManifest(csvPath: payload.csvPath, noMedia: noMedia, preparedMarkers)
+        try csvWriteManifest(
+            csvPath: payload.csvPayload.csvPath,
+            noMedia: noMedia,
+            preparedMarkers
+        )
+
+        try jsonWriteManifest(
+            jsonPath: payload.jsonPayload.jsonPath,
+            noMedia: noMedia,
+            preparedMarkers
+        )
     }
 
     public func resultFileContent(payload: Payload) throws -> ExportResult.ResultDictionary {
-        [.csvManifestPath: .url(payload.csvPath)]
+        [
+            .csvManifestPath: .url(payload.csvPayload.csvPath),
+            .jsonManifestPath: .url(payload.jsonPayload.jsonPath)
+        ]
     }
 
     public func tableManifestFields(

diff --git a/Sources/MarkersExtractor/Export/Profile/Notion/NotionExportProfile.swift b/Sources/MarkersExtractor/Export/Profile/Notion/NotionExportProfile.swift
@@ -9,7 +9,7 @@ import Logging
 
 public class NotionExportProfile: NSObject, ProgressReporting, ExportProfile {
     // ExportProfile
-    public typealias Payload = CSVExportPayload
+    public typealias Payload = CSVJSONExportPayload
     public typealias PreparedMarker = StandardExportMarker
     public static let profile: ExportProfileFormat = .notion
     public static let isMediaCapable: Bool = true