FLAC metadata retrieval will no longer crash program on failure

jcm93 · Nov 29, 2017 · 56164df · 56164df
1 parent 6d23d60
commit 56164df
Show file tree

Hide file tree

Showing 7 changed files with 169 additions and 176 deletions.
diff --git a/...eproj/project.xcworkspace/xcuserdata/johnmoody.xcuserdatad/UserInterfaceState.xcuserstate b/...eproj/project.xcworkspace/xcuserdata/johnmoody.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/jmc.xcodeproj/xcuserdata/johnmoody.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist b/jmc.xcodeproj/xcuserdata/johnmoody.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
@@ -20,7 +20,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "jmc/Delegate:Main Window Controller/MainWindowController.swift"
-            timestampString = "533607510.239328"
+            timestampString = "533609174.849465"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "335"

diff --git a/jmc/Backend/Audio/FlacDecoder.swift b/jmc/Backend/Audio/FlacDecoder.swift
@@ -13,9 +13,9 @@ class FlacDecoder: NSObject, FileBufferer {
 
     var decoder: FLAC__StreamDecoder?
     var blockBuffer = [[Float32]]()
-    var sampleRate: UInt32?
-    var channels: UInt32?
-    var bitsPerSample: UInt32?
+    var sampleRate: UInt32!
+    var channels: UInt32!
+    var bitsPerSample: UInt32!
     var totalFrames: UInt32 = 0
     var file: URL
     var currentBufferSampleIndex: UInt32?

diff --git a/jmc/Backend/Database:Filesystem Management/DatabaseManager.swift b/jmc/Backend/Database:Filesystem Management/DatabaseManager.swift
@@ -556,17 +556,17 @@ class DatabaseManager: NSObject {
 
         if url.pathExtension.lowercased() == "flac" {
 
-            let flacReader = FlacDecoder(file: url, audioModule: nil)
-            flacReader!.initForMetadata()
-
-            metadataDictionary[kSampleRateKey]  = flacReader?.sampleRate
-            let duration_seconds                = Double(flacReader!.totalFrames) / Double(flacReader!.sampleRate!)
+            guard let flacReader = FlacDecoder(file: url, audioModule: nil) else { return nil }
+            flacReader.initForMetadata()
+            guard flacReader.sampleRate != nil && flacReader.bitsPerSample != nil && flacReader.channels != nil else { return nil }
+            metadataDictionary[kSampleRateKey]  = flacReader.sampleRate
+            let duration_seconds                = Double(flacReader.totalFrames) / Double(flacReader.sampleRate!)
             let bitRate                         = ((Double(metadataDictionary[kSizeKey] as! Int) * 8) / 1000) / duration_seconds
             metadataDictionary[kBitRateKey]     = bitRate
             metadataDictionary[kTimeKey]        = duration_seconds * 1000
 
             //format-sensitive metadata
-            for item in flacReader!.metadataDictionary {
+            for item in flacReader.metadataDictionary {
                 switch item.key.lowercased() {
                 case "artist":
                     metadataDictionary[kArtistKey]          = item.value

diff --git a/jmc/Main Interface Components/Main Table View/LibraryTableViewController.xib b/jmc/Main Interface Components/Main Table View/LibraryTableViewController.xib
diff --git a/jmc/Main Interface Components/Main Table View/LibraryTableViewControllerCellBased.xib b/jmc/Main Interface Components/Main Table View/LibraryTableViewControllerCellBased.xib
diff --git a/jmc/Other Windows/EqualizerWindowController.xib b/jmc/Other Windows/EqualizerWindowController.xib