Skip to content

feat: Add initial macOS Tahoe support #180

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
kobimx wants to merge 1 commit into from
Closed

feat: Add initial macOS Tahoe support #180

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion Mist/Model/AppIcon.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,9 @@ enum AppIcon: String, CaseIterable, Identifiable {
case ventura = "Ventura"
case sonoma = "Sonoma"
case sequoia = "Sequoia"
case tahoe = "Tahoe"

static let `default`: AppIcon = .sequoia
static let `default`: Self = .tahoe

var id: String {
rawValue
Expand Down
25 changes: 20 additions & 5 deletions Mist/Model/CatalogType.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
//

enum CatalogType: String, CaseIterable, Comparable, Decodable {
case tahoe = "macOS Tahoe"
case sequoia = "macOS Sequoia"
case sonoma = "macOS Sonoma"
case ventura = "macOS Ventura"
Expand All @@ -22,16 +23,18 @@ enum CatalogType: String, CaseIterable, Comparable, Decodable {

private var sortOrder: Int {
switch self {
case .sequoia:
case .tahoe:
0
case .sonoma:
case .sequoia:
1
case .ventura:
case .sonoma:
2
case .monterey:
case .ventura:
3
case .bigSur:
case .monterey:
4
case .bigSur:
5
}
}

Expand All @@ -42,6 +45,18 @@ enum CatalogType: String, CaseIterable, Comparable, Decodable {
// swiftlint:disable:next cyclomatic_complexity function_body_length
func url(for seedType: CatalogSeedType) -> String {
switch self {
case .tahoe:
switch seedType {
case .standard:
"https://swscan.apple.com/content/catalogs/others/index-16-15-14-13-12-10.16-10.15-10.14-10.13-10.12-10.11-10.10-10.9-mountainlion-lion-snowleopard-leopard.merged-1.sucatalog.gz"
case .customer:
// swiftlint:disable:next line_length
"https://swscan.apple.com/content/catalogs/others/index-16customerseed-16-15-14-13-12-10.16-10.15-10.14-10.13-10.12-10.11-10.10-10.9-mountainlion-lion-snowleopard-leopard.merged-1.sucatalog.gz"
case .developer:
"https://swscan.apple.com/content/catalogs/others/index-16seed-16-15-14-13-12-10.16-10.15-10.14-10.13-10.12-10.11-10.10-10.9-mountainlion-lion-snowleopard-leopard.merged-1.sucatalog.gz"
case .public:
"https://swscan.apple.com/content/catalogs/others/index-16beta-16-15-14-13-12-10.16-10.15-10.14-10.13-10.12-10.11-10.10-10.9-mountainlion-lion-snowleopard-leopard.merged-1.sucatalog.gz"
}
case .sequoia:
switch seedType {
case .standard:
Expand Down
4 changes: 3 additions & 1 deletion Mist/Model/Firmware.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,9 @@ struct Firmware: Decodable, Hashable, Identifiable {
var name: String {
var name: String = ""

if version.range(of: "^15", options: .regularExpression) != nil {
if version.range(of: "^16", options: .regularExpression) != nil {
name = "macOS Tahoe"
} else if version.range(of: "^15", options: .regularExpression) != nil {
name = "macOS Sequoia"
} else if version.range(of: "^14", options: .regularExpression) != nil {
name = "macOS Sonoma"
Expand Down
4 changes: 3 additions & 1 deletion Mist/Model/Installer.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -655,7 +655,9 @@ struct Installer: Decodable, Hashable, Identifiable {
var name: String {
var name: String = ""

if version.range(of: "^15", options: .regularExpression) != nil {
if version.range(of: "^16", options: .regularExpression) != nil {
name = "macOS Tahoe"
} else if version.range(of: "^15", options: .regularExpression) != nil {
name = "macOS Sequoia"
} else if version.range(of: "^14", options: .regularExpression) != nil {
name = "macOS Sonoma"
Expand Down
1 change: 1 addition & 0 deletions Mist/Views/Settings/SettingsApplicationsView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import SwiftUI

struct SettingsApplicationsView: View {
private static let imageNames: [String] = [
"Application - macOS Tahoe",
"Application - macOS Sequoia",
"Application - macOS Sonoma",
"Application - macOS Ventura",
Expand Down