qvacua/vimr
1
1
Fork 0
mirror of https://github.com/qvacua/vimr.git synced 2024-11-28 11:35:35 +03:00
Code Issues Projects Releases Wiki Activity

Use sorted list

Browse Source
This commit is contained in:
Tae Won Ha 2020-01-18 08:56:18 +01:00
parent 4d9b924648
commit 0194d80319
No known key found for this signature in database
GPG Key ID: E40743465B5B8B44
1 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
VimR/VimR/OpenQuicklyWindow.swift
View File

@ -23,7 +23,7 @@ class OpenQuicklyWindow: NSObject,
case close case close
} }
@objc dynamic var fileItems = [ScoredUrl]() @objc dynamic var unsortedScoredUrls = [ScoredUrl]()
required init(source: Observable<StateType>, emitter: ActionEmitter, state: StateType) { required init(source: Observable<StateType>, emitter: ActionEmitter, state: StateType) {
self.emit = emitter.typedEmit() self.emit = emitter.typedEmit()
@ -87,7 +87,7 @@ class OpenQuicklyWindow: NSObject,
private var fileServicesPerRootUrl: [URL: FileService] = [:] private var fileServicesPerRootUrl: [URL: FileService] = [:]
private var rootUrls: Set<URL> { Set(self.fileServicesPerRootUrl.map { url, _ in url }) } private var rootUrls: Set<URL> { Set(self.fileServicesPerRootUrl.map { url, _ in url }) }
private let fileViewItemsController = NSArrayController() private let scoredUrlsController = NSArrayController()
private let windowController: NSWindowController private let windowController: NSWindowController
@ -109,19 +109,19 @@ class OpenQuicklyWindow: NSObject,
fileService.stopScanScore() fileService.stopScanScore()
guard pattern.count >= 2 else { guard pattern.count >= 2 else {
self.fileItems.removeAll() self.unsortedScoredUrls.removeAll()
return return
} }
self.scanToken = Token() self.scanToken = Token()
let localToken = self.scanToken let localToken = self.scanToken
self.fileItems.removeAll() self.unsortedScoredUrls.removeAll()
fileService.scanScore(for: pattern) { scoredUrls in fileService.scanScore(for: pattern) { scoredUrls in
DispatchQueue.main.async { DispatchQueue.main.async {
guard localToken == self.scanToken else { return } guard localToken == self.scanToken else { return }
self.fileItems.append(contentsOf: scoredUrls) self.unsortedScoredUrls.append(contentsOf: scoredUrls)
self.countField.stringValue = "\(self.fileItems.count) Items" self.countField.stringValue = "\(self.unsortedScoredUrls.count) Items"
} }
} }
} }
@ -161,13 +161,13 @@ class OpenQuicklyWindow: NSObject,
let fileView = self.fileView let fileView = self.fileView
fileView.intercellSpacing = CGSize(width: 4, height: 4) fileView.intercellSpacing = CGSize(width: 4, height: 4)
let c = self.fileViewItemsController let c = self.scoredUrlsController
c.avoidsEmptySelection = false c.avoidsEmptySelection = false
c.preservesSelection = true c.preservesSelection = true
c.objectClass = ScoredUrl.self c.objectClass = ScoredUrl.self
c.sortDescriptors = [NSSortDescriptor(key: "score", ascending: false)] c.sortDescriptors = [NSSortDescriptor(key: "score", ascending: false)]
c.automaticallyRearrangesObjects = true c.automaticallyRearrangesObjects = true
c.bind(.contentArray, to: self, withKeyPath: "fileItems") c.bind(.contentArray, to: self, withKeyPath: "unsortedScoredUrls")
fileView.bind(.content, to: c, withKeyPath: "arrangedObjects") fileView.bind(.content, to: c, withKeyPath: "arrangedObjects")
fileView.bind(.selectionIndexes, to: c, withKeyPath: "selectionIndexes") fileView.bind(.selectionIndexes, to: c, withKeyPath: "selectionIndexes")
@ -240,7 +240,12 @@ extension OpenQuicklyWindow {
)?.reset() )?.reset()
let cell = cachedCell ?? ImageAndTextTableCell(withIdentifier: "file-view-row") let cell = cachedCell ?? ImageAndTextTableCell(withIdentifier: "file-view-row")
let url = self.fileItems[row].url guard let sortedUrls = self.scoredUrlsController.arrangedObjects as? Array<ScoredUrl> else {
self.log.error("Could not convert arranged objects to [ScoredUrl].")
return nil
}
let url = sortedUrls[row].url
cell.attributedText = self.rowText(for: url as URL) cell.attributedText = self.rowText(for: url as URL)
cell.image = FileUtils.icon(forUrl: url) cell.image = FileUtils.icon(forUrl: url)
@ -283,7 +288,7 @@ extension OpenQuicklyWindow {
case NSSelectorFromString("insertNewline:"): case NSSelectorFromString("insertNewline:"):
// TODO open the url // TODO open the url
self.emit(.open(self.fileItems[self.fileView.selectedRow].url)) self.emit(.open(self.unsortedScoredUrls[self.fileView.selectedRow].url))
self.window.performClose(self) self.window.performClose(self)
return true return true
@ -330,7 +335,7 @@ extension OpenQuicklyWindow {
func windowWillClose(_: Notification) { func windowWillClose(_: Notification) {
self.endProgress() self.endProgress()
self.fileItems.removeAll() self.unsortedScoredUrls.removeAll()
self.searchField.stringValue = "" self.searchField.stringValue = ""
self.countField.stringValue = "0 items" self.countField.stringValue = "0 items"