Skip to content

Sort menu items #7

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Sort menu items #7

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
20 changes: 18 additions & 2 deletions CCMenu/Source/Menu Bar Extra/MenuBarExtraMenu.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,24 @@ struct MenuBarExtraMenu: View {
case .sortedAlphabetically:
return filtered.sorted(by: { $0.name.lowercased() < $1.name.lowercased() })
case .sortedByBuildTime:
return filtered.sorted(by: { $0.status.lastBuild?.timestamp ?? Date.distantPast >
$1.status.lastBuild?.timestamp ?? Date.distantPast})
return filtered.sorted(by: {p1, p2 in
let r1 = p1.status.lastBuild?.result
let r2 = p2.status.lastBuild?.result
if (r1 != r2) {
if (r1 == nil) {
return false
}
else if (r2 == nil) {
return true
}
let resultOrder = [
BuildResult.failure, BuildResult.success,
BuildResult.unknown, BuildResult.other
]
return resultOrder.firstIndex(of: r1!)! < resultOrder.firstIndex(of: r2!)!
}
return p1.status.lastBuild?.timestamp ?? Date.distantFuture > p2.status.lastBuild?.timestamp ?? Date.distantFuture
})
}
}

Expand Down