Target macOS 13

sindresorhus · sindresorhus · commit a7b0936bf27c · 2023-08-23T18:06:07.000+02:00
diff --git a/.swiftlint.yml b/.swiftlint.yml
@@ -119,6 +119,7 @@ only_rules:
   - static_operator
   - strong_iboutlet
   - superfluous_disable_command
+  - superfluous_else
   - switch_case_alignment
   - switch_case_on_newline
   - syntactic_sugar
@@ -165,7 +166,6 @@ identifier_name:
   min_length:
     warning: 2
     error: 2
-  validates_start_with_lowercase: false
   allowed_symbols:
     - '_'
   excluded:
@@ -180,7 +180,7 @@ identifier_name:
     - 'y2'
     - 'z2'
 deployment_target:
-  macOS_deployment_target: '12'
+  macOS_deployment_target: '13'
 custom_rules:
   no_nsrect:
     regex: '\bNSRect\b'
diff --git a/Gifski.xcodeproj/project.pbxproj b/Gifski.xcodeproj/project.pbxproj
@@ -638,7 +638,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				MACOSX_DEPLOYMENT_TARGET = 12.4;
+				MACOSX_DEPLOYMENT_TARGET = 13.3;
 				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 				MTL_FAST_MATH = YES;
 				ONLY_ACTIVE_ARCH = YES;
@@ -695,7 +695,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				MACOSX_DEPLOYMENT_TARGET = 12.4;
+				MACOSX_DEPLOYMENT_TARGET = 13.3;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				MTL_FAST_MATH = YES;
 				SDKROOT = macosx;
@@ -833,7 +833,7 @@
 			repositoryURL = "https://github.com/firebase/firebase-ios-sdk";
 			requirement = {
 				kind = upToNextMajorVersion;
-				minimumVersion = 10.9.0;
+				minimumVersion = 10.14.0;
 			};
 		};
 /* End XCRemoteSwiftPackageReference section */
diff --git a/Gifski/App.swift b/Gifski/App.swift
@@ -5,11 +5,12 @@ import FirebaseCrashlytics
 import DockProgress
 
 /**
-TODO when targeting macOS 13:
+TODO when targeting macOS 14:
 - Rewrite everything to use async/await, AsyncSequence, and actors.
 - Rewrite `CheckerboardView` to use `SwiftUI.Canvas`.
 - Make `final class Gifski` an actor.
 - Use `@MainActor`
+- Add  button in the editor to preview the final GIF.
 */
 
 @main
@@ -113,6 +114,10 @@ final class AppDelegate: NSObject, NSApplicationDelegate {
 		return .terminateNow
 	}
 
+	func applicationWillTerminate(_ notification: Notification) {
+		UNUserNotificationCenter.current().removeAllDeliveredNotifications()
+	}
+
 	func application(_ application: NSApplication, willPresentError error: Error) -> Error {
 		Crashlytics.recordNonFatalError(error: error)
 		return error
diff --git a/Gifski/Base.lproj/MainMenu.xib b/Gifski/Base.lproj/MainMenu.xib
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="21507" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="21701" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
     <dependencies>
-        <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="21507"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="21701"/>
     </dependencies>
     <objects>
         <customObject id="-2" userLabel="File's Owner" customClass="NSApplication">
diff --git a/Gifski/CheckerboardView.swift b/Gifski/CheckerboardView.swift
@@ -20,7 +20,7 @@ final class CheckerboardView: NSView {
 		super.draw(dirtyRect)
 
 		NSColor.Checkerboard.first.setFill()
-		dirtyRect.fill()
+		bounds.fill()
 
 		NSColor.Checkerboard.second.setFill()
 
diff --git a/Gifski/Constants.swift b/Gifski/Constants.swift
@@ -8,7 +8,6 @@ enum Constants {
 }
 
 extension NSColor {
-	static let themeColor = NSColor.controlAccentColor
 	static let progressCircleColor = NSColor(named: "ProgressCircleColor")!
 
 	enum Checkerboard {
diff --git a/Gifski/ConversionCompletedViewController.swift b/Gifski/ConversionCompletedViewController.swift
@@ -65,10 +65,10 @@ final class ConversionCompletedViewController: NSViewController {
 				)
 			}
 
-			wrapperView.fadeIn(duration: 0.5, delay: 0.15, completion: nil)
+			wrapperView.fadeIn(duration: .seconds(0.5), delay: .seconds(0.15), completion: nil)
 		}
 
-		delay(seconds: 1) { [weak self] in
+		delay(.seconds(1)) { [weak self] in
 			guard let self else {
 				return
 			}
@@ -153,7 +153,7 @@ final class ConversionCompletedViewController: NSViewController {
 			)
 		}
 
-		delay(seconds: 1) { [weak self] in
+		delay(.seconds(1)) { [weak self] in
 			guard let self else {
 				return
 			}
diff --git a/Gifski/ConversionViewController.swift b/Gifski/ConversionViewController.swift
@@ -140,7 +140,7 @@ final class ConversionViewController: NSViewController {
 		isRunning = false
 		DockProgress.resetProgress()
 
-		circularProgress.fadeOut(delay: 0.5) {
+		circularProgress.fadeOut(delay: .seconds(0.5)) {
 			completion?()
 		}
 	}
diff --git a/Gifski/EditVideoViewController.swift b/Gifski/EditVideoViewController.swift
@@ -331,6 +331,13 @@ final class EditVideoViewController: NSViewController {
 			estimatedFileSizeModel.updateEstimate()
 		}
 
+		Defaults.publisher(.outputSpeed)
+			.receive(on: DispatchQueue.main)
+			.sink { [weak self] _ in
+				self?.estimatedFileSizeModel.updateEstimate()
+			}
+			.store(in: &cancellables)
+
 		// We round it so that `29.970` becomes `30` for practical reasons.
 		let frameRate = videoMetadata.frameRate.rounded()
 
diff --git a/Gifski/EstimatedFileSize.swift b/Gifski/EstimatedFileSize.swift
@@ -6,7 +6,7 @@ final class EstimatedFileSizeModel: ObservableObject {
 	@Published var error: Error?
 
 	// This is outside the scope of "file estimate", but it was easier to add this here than doing a separate SwiftUI view. This should be refactored out into a separate view when all of Gifski is SwiftUI.
-	@Published var duration: TimeInterval = 0
+	@Published var duration = Duration.zero
 
 	var estimatedFileSizeNaive: String {
 		Int(getNaiveEstimate()).formatted(.byteCount(style: .file))
@@ -72,7 +72,7 @@ final class EstimatedFileSizeModel: ObservableObject {
 	}
 
 	func updateEstimate() {
-		Debouncer.debounce(delay: 0.5, action: _estimateFileSize)
+		Debouncer.debounce(delay: .seconds(0.5), action: _estimateFileSize)
 		duration = getConversionSettings().gifDuration
 	}
 }
@@ -112,15 +112,8 @@ struct EstimatedFileSizeView: View {
 			.overlay {
 				if model.error == nil {
 					HStack {
-						// TODO: Use the below instead when targeting macOS 13.
-						/*
-						Duration.seconds(duration)
-							.formatted(
-								.time(pattern: .minuteSecond(padMinuteToLength: 2, fractionalSecondsLength: 2))
-								.locale(locale)
-							)
-						*/
-						Text(DateComponentsFormatter.localizedStringPositionalWithFractionalSeconds(model.duration))
+						let formattedDuration = model.duration.formatted(.time(pattern: .minuteSecond(padMinuteToLength: 2, fractionalSecondsLength: 2)))
+						Text(formattedDuration)
 							.monospacedDigit()
 							.padding(.horizontal, 6)
 							.padding(.vertical, 3)
diff --git a/Gifski/GIFGenerator.swift b/Gifski/GIFGenerator.swift
@@ -125,7 +125,7 @@ final class GIFGenerator {
 
 			let frameResult = processFrame(
 				for: imageResult,
-				at: startTime,
+				at: .seconds(startTime),
 				frameRate: fps,
 				conversion: conversion,
 				isEstimation: isEstimation,
@@ -292,7 +292,7 @@ final class GIFGenerator {
 	*/
 	private func processFrame(
 		for result: Result<AVAssetImageGenerator.CompletionHandlerResult, Swift.Error>,
-		at startTime: TimeInterval,
+		at startTime: Duration,
 		frameRate: Int,
 		conversion: Conversion,
 		isEstimation: Bool,
@@ -319,7 +319,7 @@ final class GIFGenerator {
 			// TODO: This is just a workaround. Look into the cause of this.
 			// https://github.com/sindresorhus/Gifski/pull/262
 			// Skip incorrect out-of-range frames.
-			if result.actualTime.seconds < startTime {
+			if result.actualTime.seconds < startTime.toTimeInterval {
 				return .success(true)
 			}
 
@@ -329,7 +329,7 @@ final class GIFGenerator {
 
 				try gifski?.addFrame(
 					result.image,
-					presentationTimestamp: max(0, result.actualTime.seconds - startTime)
+					presentationTimestamp: max(0, result.actualTime.seconds - startTime.toTimeInterval)
 				)
 
 				if conversion.bounce, !result.isFinished {
@@ -411,12 +411,12 @@ extension GIFGenerator {
 		var loop: Gifski.Loop
 		var bounce: Bool
 
-		var gifDuration: TimeInterval {
+		var gifDuration: Duration {
 			guard let duration = (timeRange ?? asset.firstVideoTrack?.timeRange.range)?.length else {
-				return 0
+				return .zero
 			}
 
-			return bounce ? (duration * 2) : duration
+			return .seconds(bounce ? (duration * 2) : duration)
 		}
 	}
 }
diff --git a/Gifski/TimeRemainingEstimator.swift b/Gifski/TimeRemainingEstimator.swift
@@ -7,17 +7,17 @@ final class TimeRemainingEstimator {
 	/**
 	The delay before revealing the estimated time remaining, allowing the estimation to stabilize.
 	*/
-	let bufferDuration: TimeInterval = 3
+	let bufferDuration = Duration.seconds(3)
 
 	/**
 	Don't show the estimate at all if the total time estimate (after it stabilizes) is less than this amount.
 	*/
-	let skipThreshold: TimeInterval = 10
+	let skipThreshold = Duration.seconds(10)
 
 	/**
 	Begin fade out when remaining time reaches this amount.
 	*/
-	let fadeOutThreshold: TimeInterval = 1
+	let fadeOutThreshold = Duration.seconds(1)
 
 	weak var progress: Progress? {
 		didSet {
@@ -82,22 +82,22 @@ final class TimeRemainingEstimator {
 		case .buffering:
 			if finishedBuffering {
 				return shouldShowEstimation ? .running : .done
-			} else {
-				return .buffering
 			}
+
+			return .buffering
 		case .running:
-			return secondsRemaining < fadeOutThreshold ? .done : .running
+			return remaining < fadeOutThreshold ? .done : .running
 		case .done:
 			return .done
 		}
 	}
 
-	private var finishedBuffering: Bool { secondsElapsed > bufferDuration }
-	private var shouldShowEstimation: Bool { secondsRemaining > skipThreshold }
-	private var secondsElapsed: TimeInterval { Date().timeIntervalSince(startTime) }
+	private var finishedBuffering: Bool { elapsed > bufferDuration }
+	private var shouldShowEstimation: Bool { remaining > skipThreshold }
+	private var elapsed: Duration { .seconds(Date.now.timeIntervalSince(startTime)) }
 
-	private var secondsRemaining: TimeInterval {
-		(secondsElapsed / percentComplete) * (1 - percentComplete)
+	private var remaining: Duration {
+		(elapsed / percentComplete) * (1 - percentComplete)
 	}
 
 	private let label: Label
@@ -110,7 +110,7 @@ final class TimeRemainingEstimator {
 	}
 
 	private var formattedTimeRemaining: String? {
-		let seconds = secondsRemaining.clamped(to: 1...)
+		let seconds = remaining.toTimeInterval.clamped(to: 1...)
 		elapsedTimeFormatter.allowedUnits = seconds < 60 ? .second : [.hour, .minute]
 		return elapsedTimeFormatter.string(from: seconds)
 	}
diff --git a/Gifski/Utilities.swift b/Gifski/Utilities.swift
diff --git a/Gifski/VideoDropView.swift b/Gifski/VideoDropView.swift
diff --git a/readme.md b/readme.md

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,6 @@ enum Constants {`
`8`	`8`	`}`
`9`	`9`
`10`	`10`	`extension NSColor {`
`11`		`- static let themeColor = NSColor.controlAccentColor`
`12`	`11`	`static let progressCircleColor = NSColor(named: "ProgressCircleColor")!`
`13`	`12`
`14`	`13`	`enum Checkerboard {`
Original file line number	Diff line number	Diff line change
`@@ -65,10 +65,10 @@ final class ConversionCompletedViewController: NSViewController {`
`65`	`65`	`)`
`66`	`66`	`}`
`67`	`67`
`68`		`- wrapperView.fadeIn(duration: 0.5, delay: 0.15, completion: nil)`
	`68`	`+ wrapperView.fadeIn(duration: .seconds(0.5), delay: .seconds(0.15), completion: nil)`
`69`	`69`	`}`
`70`	`70`
`71`		`- delay(seconds: 1) { [weak self] in`
	`71`	`+ delay(.seconds(1)) { [weak self] in`
`72`	`72`	`guard let self else {`
`73`	`73`	`return`
`74`	`74`	`}`
`@@ -153,7 +153,7 @@ final class ConversionCompletedViewController: NSViewController {`
`153`	`153`	`)`
`154`	`154`	`}`
`155`	`155`
`156`		`- delay(seconds: 1) { [weak self] in`
	`156`	`+ delay(.seconds(1)) { [weak self] in`
`157`	`157`	`guard let self else {`
`158`	`158`	`return`
`159`	`159`	`}`
Original file line number	Diff line number	Diff line change
`@@ -140,7 +140,7 @@ final class ConversionViewController: NSViewController {`
`140`	`140`	`isRunning = false`
`141`	`141`	`DockProgress.resetProgress()`
`142`	`142`
`143`		`- circularProgress.fadeOut(delay: 0.5) {`
	`143`	`+ circularProgress.fadeOut(delay: .seconds(0.5)) {`
`144`	`144`	`completion?()`
`145`	`145`	`}`
`146`	`146`	`}`