Minor tweaks

Author: sindresorhus

Gifski.xcodeproj/project.pbxproj

@@ -69,7 +69,7 @@
 			isa = PBXContainerItemProxy;
 			containerPortal = 5F6ABD7D278BA5A20040DDF0 /* gifski.xcodeproj */;
 			proxyType = 1;
-			remoteGlobalIDString = CA6080A63FCEFE2C55B82F1B;
+			remoteGlobalIDString = CA60A67DACCD4143D7A47BBE;
 			remoteInfo = "gifski-staticlib";
 		};
 		E359A4CB28B2A9A2007435A8 /* PBXContainerItemProxy */ = {
@@ -808,7 +808,7 @@
 			repositoryURL = "https://github.com/sindresorhus/Defaults";
 			requirement = {
 				kind = upToNextMajorVersion;
-				minimumVersion = 7.0.0;
+				minimumVersion = 7.1.0;
 			};
 		};
 		E3339E982395768F00303839 /* XCRemoteSwiftPackageReference "CircularProgress" */ = {

Gifski/Constants.swift

@@ -1,5 +1,4 @@
 import Cocoa
-import Defaults
 
 enum Constants {
 	static let defaultWindowSize = CGSize(width: 360, height: 240)

Gifski/ConversionCompletedViewController.swift

@@ -2,7 +2,6 @@ import Cocoa
 import Quartz
 import UserNotifications
 import StoreKit
-import Defaults
 
 final class ConversionCompletedViewController: NSViewController {
 	@IBOutlet private var draggableFileWrapper: NSView!

Gifski/ConversionViewController.swift

@@ -1,7 +1,6 @@
 import AppKit
 import CircularProgress
 import DockProgress
-import Defaults
 
 final class ConversionViewController: NSViewController {
 	private static let circularProgressSize = 160.0

Gifski/EditVideoViewController.swift

@@ -1,7 +1,5 @@
 import SwiftUI
-import Combine
 import AVKit
-import Defaults
 
 struct SpeedView: View {
 	@Default(.outputSpeed) private var outputSpeed

Gifski/TimeRemainingEstimator.swift

@@ -1,5 +1,4 @@
 import Foundation
-import Combine
 
 final class TimeRemainingEstimator {
 	private var progressCancellable: AnyCancellable?

Gifski/Tooltip.swift

@@ -1,5 +1,4 @@
 import AppKit
-import Defaults
 
 final class Tooltip: NSPopover {
 	private let identifier: String

Gifski/TrimmingAVPlayerViewController.swift

@@ -1,4 +1,3 @@
-import Combine
 import AVKit
 
 /**

Gifski/Utilities.swift

@@ -6,6 +6,10 @@ import StoreKit.SKStoreReviewController
 import Accelerate.vImage
 import Defaults
 
+typealias Defaults = _Defaults
+typealias Default = _Default
+typealias AnyCancellable = Combine.AnyCancellable
+
 
 /**
 Convenience function for initializing an object and modifying its properties
@@ -750,7 +754,7 @@ extension AVAssetTrack {
 		// swiftlint:disable:next force_cast
 		let formatDescription = rawDescription as! CMFormatDescription
 
-		return CMFormatDescriptionGetMediaSubType(formatDescription).fourCharCodeToString()
+		return CMFormatDescriptionGetMediaSubType(formatDescription).fourCharCodeToString().nilIfEmpty
 	}
 
 	// TODO: When I switch to the async `.load()` method to retrieve video properties, this property is moot.
@@ -1265,7 +1269,7 @@ extension AVAsset {
 			Audio codec: \(describing: audioCodec)
 			Duration: \(describing: durationFormatter.stringSafe(from: duration.seconds))
 			Dimension: \(describing: dimensions?.formatted)
-			Frame rate: \(describing: frameRate?.rounded(toDecimalPlaces: 2).formatted)
+			Frame rate: \(describing: frameRate?.rounded(toDecimalPlaces: 2).formatted())
 			File size: \(fileSizeFormatted)
 			Is readable: \(isReadable)
 			Is playable: \(isPlayable)
@@ -1284,7 +1288,7 @@ extension AVAsset {
 				Duration: \(describing: durationFormatter.stringSafe(from: track.timeRange.duration.seconds))
 				Dimensions: \(describing: track.dimensions?.formatted)
 				Natural size: \(describing: track.naturalSize)
-				Frame rate: \(describing: track.frameRate?.rounded(toDecimalPlaces: 2).formatted)
+				Frame rate: \(describing: track.frameRate?.rounded(toDecimalPlaces: 2).formatted())
 				Is playable: \(track.isPlayable)
 				Is decodable: \(track.isDecodable)
 				----
@@ -3920,7 +3924,6 @@ extension NSAttributedString {
 	}
 
 	static func += (lhs: inout NSAttributedString, rhs: NSAttributedString) {
-		// swiftlint:disable:next shorthand_operator
 		lhs = lhs + rhs
 	}
 
@@ -4446,7 +4449,6 @@ extension CMTime {
 	}
 
 	static func *= (lhs: inout Self, rhs: Double) {
-		// swiftlint:disable:next shorthand_operator
 		lhs = lhs * rhs
 	}
 
@@ -4455,7 +4457,6 @@ extension CMTime {
 	}
 
 	static func /= (lhs: inout Self, rhs: Double) {
-		// swiftlint:disable:next shorthand_operator
 		lhs = lhs / rhs
 	}
 }
@@ -4687,3 +4688,11 @@ extension ClosedRange {
 		bound1 <= bound2 ? bound1...bound2 : bound2...bound1
 	}
 }
+
+
+extension Collection {
+	/**
+	Works on strings too, since they're just collections.
+	*/
+	var nilIfEmpty: Self? { isEmpty ? nil : self }
+}

Gifski/VideoValidator.swift

@@ -94,6 +94,8 @@ struct VideoValidator {
 			return .failure
 		}
 
+		let cannotReadVideoExplanation = "This could happen if the video is corrupt or the codec profile level is not supported. macOS unfortunately doesn't provide Gifski a reason for why the video could not be decoded. Try re-exporting using a different configuration or try converting the video to HEVC (MP4) with the free HandBrake app."
+
 		// We already specify the UTIs we support, so this can only happen on invalid video files or unsupported codecs.
 		guard asset.isVideoDecodable else {
 			if
@@ -103,7 +105,7 @@ struct VideoValidator {
 				NSAlert.showModalAndReportToCrashlytics(
 					for: window,
 					title: "The video could not be decoded even though its codec “\(codec)” is supported.",
-					message: "This could happen if the video is corrupt or the codec profile level is not supported. macOS unfortunately doesn't provide Gifski a reason for why the video could not be decoded. Try re-exporting using a different configuration or try converting the video to HEVC (MP4) with the free HandBrake app.",
+					message: cannotReadVideoExplanation,
 					showDebugInfo: false,
 					debugInfo: asset.debugInfo
 				)
@@ -132,10 +134,21 @@ struct VideoValidator {
 				return .failure
 			}
 
-			NSAlert.showModalAndReportToCrashlytics(
+			NSAlert.showModal(
 				for: window,
 				title: "The video codec “\(codecTitle)” is not supported.",
-				message: "Re-export or convert the video to a supported format. For the best possible quality, export to ProRes 4444 XQ (supports alpha). Alternatively, use the free HandBrake app to convert the video to HEVC (MP4).",
+				message: "Re-export or convert the video to a supported format. For the best possible quality, export to ProRes 4444 XQ (supports alpha). Alternatively, use the free HandBrake app to convert the video to HEVC (MP4)."
+			)
+
+			return .failure
+		}
+
+		// AVFoundation reports some videos as `.isReadable == true` even though they are not. We detect this through missing codec info. See "Fixture 211". (macOS 13.1)
+		guard firstVideoTrack.codecTitle != nil else {
+			NSAlert.showModalAndReportToCrashlytics(
+				for: window,
+				title: "The video file is not supported.",
+				message: cannotReadVideoExplanation,
 				showDebugInfo: false,
 				debugInfo: asset.debugInfo
 			)