Refactored inherited roles parsing

TheAcharya · Nov 22, 2023 · fd71c4d · fd71c4d
1 parent 22d5a3d
commit fd71c4d
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 27 deletions.
diff --git a/Sources/MarkersExtractor/Export/ExportProfile Images.swift b/Sources/MarkersExtractor/Export/ExportProfile Images.swift
@@ -71,7 +71,8 @@ class AnimatedImagesWriter: NSObject, ImageWriterProtocol {
             }
         }
 
-        assert(progress.fractionCompleted == 1.0)
+        // TODO: NSProgress is wonky, sometimes its not fully 1.0 so asserting here isn't helpful
+        // assert(progress.fractionCompleted == 1.0)
     }
 
     private func write(descriptor: ImageDescriptor) async throws {

diff --git a/Sources/MarkersExtractor/Extractors/FCPXMLMarkerExtractor.swift b/Sources/MarkersExtractor/Extractors/FCPXMLMarkerExtractor.swift
@@ -214,11 +214,11 @@ class FCPXMLMarkerExtractor: NSObject, ProgressReporting {
                 switch role {
                 case let .audio(roleString):
                     markerRoles.isAudioDefault = isRoleDefault
-                    markerRoles.audio = roleString
+                    if !roleString.isEmpty { markerRoles.audio = roleString }
 
                 case let .video(roleString):
                     markerRoles.isVideoDefault = isRoleDefault
-                    markerRoles.video = roleString
+                    if !roleString.isEmpty { markerRoles.video = roleString }
 
                 case .caption(_):
                     // TODO: assign to video role may not be right?

diff --git a/Sources/MarkersExtractor/Import/Marker/MarkerRole.swift b/Sources/MarkersExtractor/Import/Marker/MarkerRole.swift
@@ -70,28 +70,6 @@ public struct MarkerRoles: Equatable, Hashable, Sendable {
         self.isAudioDefault = isAudioDefault
         if collapseSubroles { self.collapseSubroles() }
     }
-
-    // TODO: could remove once refactored into DAWFileKit
-
-    /// Returns FCP's default role(s) for each clip type.
-    /// FCP does not write the role to the XML when it does not have a custom role set and is using
-    /// a default role.
-    ///
-    /// - Note: This does not cover all cases as clip type is not the only identifier
-    ///   that can be used to determine clip role.
-    ///
-    /// - Parameter clipType: XML element name. ie: "title" for XML `<title ...>`
-    /// - Returns: Role name string. Returns `nil` for unhandled/unrecognized clip types.
-    public init?(defaultForClipType clipType: String) {
-        switch clipType {
-        case "asset-clip":
-            self.init(video: "Video", isVideoDefault: true)
-        case "title":
-            self.init(video: "Titles", isVideoDefault: true)
-        default:
-            return nil
-        }
-    }
 }
 
 // MARK: - Methods

diff --git a/Tests/MarkersExtractorTests/MarkerRolesTests.swift b/Tests/MarkersExtractorTests/MarkerRolesTests.swift
@@ -22,8 +22,6 @@ final class MarkerRolesTests: XCTestCase {
     }
 
     func testIsDefault() {
-        XCTAssertEqual(MarkerRoles(defaultForClipType: "title")?.isVideoDefault, true)
-
         XCTAssertEqual(MarkerRoles(video: "Video", isVideoDefault: true).isVideoDefault, true)
         XCTAssertEqual(MarkerRoles(video: "Video", isVideoDefault: false).isVideoDefault, false)