Skip to content
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

Jump to bottom

perf: Remove useless filter + Sort in background #671

Merged
merged 6 commits into from
Apr 3, 2023
Merged

perf: Remove useless filter + Sort in background #671

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
ac812d8
refactor(ThreadListViewModel): Guard folder
PhilippeWeidmann Mar 30, 2023
9aba7de
feat(ThreadListViewModel): Filter using realm
PhilippeWeidmann Mar 30, 2023
7c33109
perf(ThreadListViewModel): Sort in the background
PhilippeWeidmann Mar 30, 2023
13e376d
perf: Index thread date
PhilippeWeidmann Mar 30, 2023
21bd72a
refactor: Stop using computed properties for DateSection
PhilippeWeidmann Mar 30, 2023
735be3b
fix(ThreadListViewModel): Correct thread access
PhilippeWeidmann Apr 3, 2023
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
117 changes: 71 additions & 46 deletions Mail/Views/Thread List/ThreadListViewModel.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,38 +45,40 @@ class DateSection: Identifiable {
return .init(start: date.startOfMonth, end: date.endOfMonth)
}
}
}

var id: DateInterval { referenceDate.dateInterval }

var title: String {
switch referenceDate {
case .today:
return MailResourcesStrings.Localizable.threadListSectionToday
case .yesterday:
return MailResourcesStrings.Localizable.messageDetailsYesterday
case .thisWeek:
return MailResourcesStrings.Localizable.threadListSectionThisWeek
case .lastWeek:
return MailResourcesStrings.Localizable.threadListSectionLastWeek
case .thisMonth:
return MailResourcesStrings.Localizable.threadListSectionThisMonth
case .older(let date):
var formatStyle = Date.FormatStyle.dateTime.month(.wide)
if !Calendar.current.isDate(date, equalTo: .now, toGranularity: .year) {
formatStyle = formatStyle.year()
public var title: String {
switch self {
case .today:
return MailResourcesStrings.Localizable.threadListSectionToday
case .yesterday:
return MailResourcesStrings.Localizable.messageDetailsYesterday
case .thisWeek:
return MailResourcesStrings.Localizable.threadListSectionThisWeek
case .lastWeek:
return MailResourcesStrings.Localizable.threadListSectionLastWeek
case .thisMonth:
return MailResourcesStrings.Localizable.threadListSectionThisMonth
case .older(let date):
var formatStyle = Date.FormatStyle.dateTime.month(.wide)
if !Calendar.current.isDate(date, equalTo: .now, toGranularity: .year) {
formatStyle = formatStyle.year()
}
return date.formatted(formatStyle).capitalized
}
return date.formatted(formatStyle).capitalized
}
}

let id: DateInterval
let title: String
var threads = [Thread]()

private let referenceDate: ReferenceDate

init(thread: Thread) {
let sections: [ReferenceDate] = [.today, .yesterday, .thisWeek, .lastWeek, .thisMonth]
referenceDate = sections.first { $0.dateInterval.contains(thread.date) } ?? .older(thread.date)
id = referenceDate.dateInterval
title = referenceDate.title
}

func threadBelongsToSection(thread: Thread) -> Bool {
Expand Down Expand Up @@ -123,6 +125,7 @@ class DateSection: Identifiable {

private var observationThreadToken: NotificationToken?
private var observationLastUpdateToken: NotificationToken?
private let observeQueue = DispatchQueue(label: "com.infomaniak.thread-results", qos: .userInteractive)

@Published var filter = Filter.all {
didSet {
Expand Down Expand Up @@ -205,57 +208,79 @@ class DateSection: Identifiable {
func observeChanges(animateInitialThreadChanges: Bool = false) {
observationThreadToken?.invalidate()
observationLastUpdateToken?.invalidate()
if let folder = folder.thaw() {
let threadResults = folder.threads.sorted(by: \.date, ascending: false)
observationThreadToken = threadResults.observe(on: .main) { [weak self] changes in
switch changes {
case .initial(let results):
guard let folder = folder.thaw() else {
sections = []
return
}

let threadResults: Results<Thread>
if let predicate = filter.predicate {
threadResults = folder.threads.filter(predicate + " OR uid == %@", selectedThread?.uid ?? "")
.sorted(by: \.date, ascending: false)
} else {
threadResults = folder.threads.sorted(by: \.date, ascending: false)
}

observationThreadToken = threadResults.observe(on: observeQueue) { [weak self] changes in
switch changes {
case .initial(let results):
let filteredThreads = Array(results.freezeIfNeeded())
guard let newSections = self?.sortThreadsIntoSections(threads: filteredThreads) else { return }

DispatchQueue.main.sync {
self?.filteredThreads = filteredThreads
withAnimation(animateInitialThreadChanges ? .default : nil) {
self?.sortThreadsIntoSections(threads: Array(results.freezeIfNeeded()))
self?.sections = newSections
}
case .update(let results, _, _, _):
}
case .update(let results, _, _, _):
let filteredThreads = Array(results.freezeIfNeeded())
guard let newSections = self?.sortThreadsIntoSections(threads: filteredThreads) else { return }

DispatchQueue.main.sync {
self?.filteredThreads = filteredThreads
if self?.filter != .all && results.count == 1 && self?.filter.accepts(thread: results[0]) != true {
self?.filter = .all
}
withAnimation {
self?.sortThreadsIntoSections(threads: Array(results.freezeIfNeeded()))
self?.sections = newSections
}
case .error:
break
}
case .error:
break
}
observationLastUpdateToken = folder.observe(keyPaths: [\Folder.lastUpdate], on: .main) { [weak self] changes in
switch changes {
case .change(let folder, _):
withAnimation {
self?.lastUpdate = folder.lastUpdate
}
default:
break
}
observationLastUpdateToken = folder.observe(keyPaths: [\Folder.lastUpdate], on: .main) { [weak self] changes in
switch changes {
case .change(let folder, _):
withAnimation {
self?.lastUpdate = folder.lastUpdate
}
default:
break
}
} else {
sections = []
}
}

func sortThreadsIntoSections(threads: [Thread]) {
private func sortThreadsIntoSections(threads: [Thread]) -> [DateSection]? {
var newSections = [DateSection]()

var currentSection: DateSection?
filteredThreads = threads.filter { $0.id == selectedThread?.id || filter.accepts(thread: $0) }
if filteredThreads.isEmpty && filterUnreadOn {
filterUnreadOn.toggle()
if threads.isEmpty && filterUnreadOn {
DispatchQueue.main.sync {
filterUnreadOn.toggle()
}
return nil
} else {
for thread in filteredThreads {
for thread in threads {
if currentSection?.threadBelongsToSection(thread: thread) != true {
currentSection = DateSection(thread: thread)
newSections.append(currentSection!)
}
currentSection?.threads.append(thread)
}

sections = newSections
return newSections
}
}

Expand Down
19 changes: 17 additions & 2 deletions MailCore/Models/Thread.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ public class Thread: Object, Decodable, Identifiable {
@Persisted public var cc: List<Recipient>
@Persisted public var bcc: List<Recipient>
@Persisted public var subject: String?
@Persisted public var date: Date
@Persisted(indexed: true) public var date: Date
@Persisted public var hasAttachments: Bool
@Persisted public var hasSwissTransferAttachments: Bool
@Persisted public var hasDrafts: Bool
Expand Down Expand Up @@ -89,7 +89,7 @@ public class Thread: Object, Decodable, Identifiable {
return fromArray[0].formattedName
default:
let fromCount = min(fromArray.count, Constants.threadCellMaxRecipients)
return fromArray[0..<fromCount].map(\.formattedShortName).joined(separator: ", ")
return fromArray[0 ..< fromCount].map(\.formattedShortName).joined(separator: ", ")
}
}

Expand Down Expand Up @@ -252,6 +252,21 @@ public class Thread: Object, Decodable, Identifiable {
public enum Filter: String {
case all, seen, unseen, starred, unstarred

public var predicate: String? {
switch self {
case .all:
return nil
case .seen:
return "unseenMessages == 0"
case .unseen:
return "unseenMessages > 0"
case .starred:
return "flagged == TRUE"
case .unstarred:
return "flagged == FALSE"
}
}

public func accepts(thread: Thread) -> Bool {
switch self {
case .all:
Expand Down