Fix formatting and remove redundant code

Signed-off-by: Ethan Dye <[email protected]>

Sources/macSubtitleOCR/MKV/EBML/EBML.swift

@@ -9,7 +9,6 @@
 import Foundation
 
 enum EBML {
-    static let ebml: UInt32 = 0x1A45_DFA3
     static let block: UInt32 = 0xA1
     static let blockGroup: UInt32 = 0xA0
     static let chapters: UInt32 = 0x1043_A770

Sources/macSubtitleOCR/MKV/MKVFileHandler.swift

@@ -1,7 +1,15 @@
+//
+// MKVFileHandler.swift
+// macSubtitleOCR
+//
+// Created by Ethan Dye on 9/20/24.
+// Copyright © 2024 Ethan Dye. All rights reserved.
+//
+
 import Foundation
 import os
 
-class MKVFileHandler: MKVFileHandling {
+class MKVFileHandler {
     var fileHandle: FileHandle
     var eof: UInt64
     var timestampScale: Double = 1000000.0 // Default value if not specified in a given MKV file
@@ -11,8 +19,8 @@ class MKVFileHandler: MKVFileHandling {
         guard FileManager.default.fileExists(atPath: filePath) else {
             throw macSubtitleOCRError.fileReadError
         }
-        self.fileHandle = try FileHandle(forReadingFrom: URL(fileURLWithPath: filePath))
-        self.eof = fileHandle.seekToEndOfFile()
+        fileHandle = try FileHandle(forReadingFrom: URL(fileURLWithPath: filePath))
+        eof = fileHandle.seekToEndOfFile()
         fileHandle.seek(toFileOffset: 0)
     }
 

Sources/macSubtitleOCR/MKV/MKVSubtitleExtractor.swift

@@ -1,7 +1,15 @@
+//
+// MKVSubtitleExtractor.swift
+// macSubtitleOCR
+//
+// Created by Ethan Dye on 9/20/24.
+// Copyright © 2024 Ethan Dye. All rights reserved.
+//
+
 import Foundation
 import os
 
-class MKVSubtitleExtractor: MKVTrackParser, MKVSubtitleExtracting {
+class MKVSubtitleExtractor: MKVTrackParser {
     func getSubtitleTrackData(trackNumber: Int, outPath: String) throws -> String? {
         let tmpSup = URL(fileURLWithPath: outPath).deletingPathExtension().appendingPathExtension("sup").lastPathComponent
         let manager = FileManager.default

Sources/macSubtitleOCR/MKV/MKVTrackParser.swift

@@ -1,7 +1,15 @@
+//
+// MKVTrackParser.swift
+// macSubtitleOCR
+//
+// Created by Ethan Dye on 9/20/24.
+// Copyright © 2024 Ethan Dye. All rights reserved.
+//
+
 import Foundation
 import os
 
-class MKVTrackParser: MKVFileHandler, MKVTrackParsing {
+class MKVTrackParser: MKVFileHandler {
     var tracks: [MKVTrack] = []
     private var stderr = StandardErrorOutputStream()
 
@@ -79,6 +87,7 @@ class MKVTrackParser: MKVFileHandler, MKVTrackParsing {
         // Step 1: Locate the Segment element
         guard let segmentSize = locateSegment() else { return nil }
         let segmentEndOffset = fileHandle.offsetInFile + segmentSize
+        // swiftformat:disable:next redundantSelf
         logger.debug("Found Segment, Size: \(segmentSize), End Offset: \(segmentEndOffset), EOF: \(self.eof)")
 
         var trackData = [Data](repeating: Data(), count: trackNumber.count)
@@ -110,6 +119,7 @@ class MKVTrackParser: MKVFileHandler, MKVTrackParsing {
 
     private func parseBlocks(within clusterEndOffset: UInt64, trackNumber: [Int], clusterTimestamp: Int64, trackData: inout [Data]) {
         while fileHandle.offsetInFile < clusterEndOffset {
+            // swiftformat:disable:next redundantSelf
             logger.debug("Looking for Block at Offset: \(self.fileHandle.offsetInFile)/\(clusterEndOffset)")
             guard case (var blockSize?, let blockType?) = findElement(withID: EBML.simpleBlock, EBML.blockGroup) else { break }
 

Sources/macSubtitleOCR/PGS/PGSSubtitle.swift

@@ -2,7 +2,7 @@
 // PGSSubtitle.swift
 // macSubtitleOCR
 //
-// Created by Ethan Dye on 9/16/24.
+// Created by Ethan Dye on 9/19/24.
 // Copyright © 2024 Ethan Dye. All rights reserved.
 //
 

Sources/macSubtitleOCR/PGS/Parsers/ODS.swift

@@ -2,7 +2,7 @@
 // ODS.swift
 // macSubtitleOCR
 //
-// Created by Ethan Dye on 9/12/24.
+// Created by Ethan Dye on 9/19/24.
 // Copyright © 2024 Ethan Dye. All rights reserved.
 //
 

Sources/macSubtitleOCR/SRT/SRT.swift

@@ -2,7 +2,7 @@
 // SRT.swift
 // macSubtitleOCR
 //
-// Created by Ethan Dye on 9/2/24.
+// Created by Ethan Dye on 9/19/24.
 // Copyright © 2024 Ethan Dye. All rights reserved.
 //
 

Sources/macSubtitleOCR/SRT/SRTSubtitle.swift

@@ -2,7 +2,7 @@
 // SRTSubtitle.swift
 // macSubtitleOCR
 //
-// Created by Ethan Dye on 9/16/24.
+// Created by Ethan Dye on 9/19/24.
 // Copyright © 2024 Ethan Dye. All rights reserved.
 //
 

Sources/macSubtitleOCR/macSubtitleOCR.swift

@@ -18,7 +18,7 @@ struct macSubtitleOCR: ParsableCommand {
     // MARK: - Properties
 
     @Argument(help: "Input file containing the subtitle stream (.sup or .mkv)")
-    var sup: String
+    var input: String
 
     @Argument(help: "Directory to output the completed .srt files to")
     var srtDirectory: String
@@ -49,7 +49,7 @@ struct macSubtitleOCR: ParsableCommand {
         let manager = FileManager.default
 
         // Setup options
-        let inFile = sup
+        let inFile = input
         let revision = setOCRRevision()
         let recognitionLevel = setOCRMode()
         let languages = language.split(separator: ",").map { String($0) }
@@ -60,13 +60,13 @@ struct macSubtitleOCR: ParsableCommand {
         var srtStreams: [Int: SRT] = [:]
         var intermediateFiles: [Int: String] = [:]
 
-        if sup.hasSuffix(".mkv") {
-            let mkvStream = try MKVSubtitleExtractor(filePath: sup)
+        if input.hasSuffix(".mkv") {
+            let mkvStream = try MKVSubtitleExtractor(filePath: input)
             try mkvStream.parseTracks(codec: "S_HDMV/PGS")
             for track in mkvStream.tracks {
                 subIndex = 1 // reset counter for each track
                 logger.debug("Found subtitle track: \(track.trackNumber), Codec: \(track.codecId)")
-                intermediateFiles[track.trackNumber] = try mkvStream.getSubtitleTrackData(trackNumber: track.trackNumber, outPath: sup)!
+                intermediateFiles[track.trackNumber] = try mkvStream.getSubtitleTrackData(trackNumber: track.trackNumber, outPath: input)!
 
                 // Open the PGS data stream
                 let PGS = try PGS(URL(fileURLWithPath: intermediateFiles[track.trackNumber]!))
@@ -78,7 +78,7 @@ struct macSubtitleOCR: ParsableCommand {
             }
         } else {
             // Open the PGS data stream
-            let PGS = try PGS(URL(fileURLWithPath: sup))
+            let PGS = try PGS(URL(fileURLWithPath: input))
             let srtStream = SRT()
             srtStreams[0] = srtStream
 
@@ -108,8 +108,8 @@ struct macSubtitleOCR: ParsableCommand {
             if saveSup, inFile.hasSuffix(".mkv") {
                 let fileName = "\(trackNumber)_" + URL(fileURLWithPath: inFile).deletingPathExtension().appendingPathExtension("sup").lastPathComponent
                 try manager.moveItem(
-                at: URL(fileURLWithPath: intermediateFiles[trackNumber]!),
-                to: URL(fileURLWithPath: inFile).deletingLastPathComponent().appendingPathComponent(fileName))
+                    at: URL(fileURLWithPath: intermediateFiles[trackNumber]!),
+                    to: URL(fileURLWithPath: inFile).deletingLastPathComponent().appendingPathComponent(fileName))
             } else {
                 try manager.removeItem(at: URL(fileURLWithPath: intermediateFiles[trackNumber]!))
             }
@@ -146,7 +146,7 @@ struct macSubtitleOCR: ParsableCommand {
         }
     }
 
-    private func processSubtitles(PGS: PGS, srtStream: SRT, trackNumber: Int, subIndex: Int, jsonStream: inout [Any], logger: Logger, manager: FileManager, recognitionLevel: VNRequestTextRecognitionLevel, languages: [String], revision: Int) throws {
+    private func processSubtitles(PGS: PGS, srtStream: SRT, trackNumber _: Int, subIndex: Int, jsonStream: inout [Any], logger: Logger, manager: FileManager, recognitionLevel: VNRequestTextRecognitionLevel, languages: [String], revision: Int) throws {
         var subIndex = subIndex
         var inJson = jsonStream
         for subtitle in PGS.getSubtitles() {

Tests/macSubtitleOCRTests/macSubtitleOCRTests.swift

@@ -2,7 +2,7 @@
 // macSubtitleOCRTests.swift
 // macSubtitleOCR
 //
-// Created by Ethan Dye on 9/18/24.
+// Created by Ethan Dye on 9/19/24.
 // Copyright © 2024 Ethan Dye. All rights reserved.
 //