1
1
mirror of https://github.com/qvacua/vimr.git synced 2024-11-24 11:37:32 +03:00

Reactor slightly

This commit is contained in:
Tae Won Ha 2020-01-18 13:46:41 +01:00
parent dbec80fcf8
commit 1e5c0365b2
No known key found for this signature in database
GPG Key ID: E40743465B5B8B44

View File

@ -23,26 +23,49 @@ class OpenQuicklyWindow: NSObject,
case close
}
@objc dynamic var unsortedScoredUrls = [ScoredUrl]()
@objc dynamic private(set) var unsortedScoredUrls = [ScoredUrl]()
required init(source: Observable<StateType>, emitter: ActionEmitter, state: StateType) {
self.emit = emitter.typedEmit()
self.windowController = NSWindowController(windowNibName: NSNib.Name("OpenQuicklyWindow"))
self.searchStream = self.searchField.rx
.text.orEmpty
.throttle(.milliseconds(2 * 500), latest: true, scheduler: MainScheduler.instance)
.distinctUntilChanged()
super.init()
self.window.delegate = self
self.addViews()
source
.observeOn(MainScheduler.instance)
.subscribe(onNext: { state in
.subscribe(onNext: { [weak self] state in self?.subscription(state) })
.disposed(by: self.disposeBag)
}
// Call this only when quitting
func cleanUp() { self.fileServicesPerRootUrl.removeAll() }
private let emit: (Action) -> Void
private let disposeBag = DisposeBag()
private(set) var cwd = FileUtils.userHomeUrl
private var cwdPathCompsCount = 0
private var scanToken = Token()
private var fileServicesPerRootUrl: [URL: FileService] = [:]
private let scoredUrlsController = NSArrayController()
private let windowController: NSWindowController
private let searchField = NSTextField(forAutoLayout: ())
private let progressIndicator = NSProgressIndicator(forAutoLayout: ())
private let cwdControl = NSPathControl(forAutoLayout: ())
private let fileView = NSTableView.standardTableView()
private let log = OSLog(subsystem: Defs.loggerSubsystem,
category: Defs.LoggerCategory.uiComponents)
private var rootUrls: Set<URL> { Set(self.fileServicesPerRootUrl.map { url, _ in url }) }
private var window: NSWindow { self.windowController.window! }
private func subscription(_ state: StateType) {
self.updateRootUrls(state: state)
guard state.openQuickly.open else {
@ -59,45 +82,17 @@ class OpenQuicklyWindow: NSObject,
self.cwdPathCompsCount = self.cwd.pathComponents.count
self.cwdControl.url = self.cwd
self.searchStream
self.searchField.rx
.text.orEmpty
.throttle(.milliseconds(1 * 500), latest: true, scheduler: MainScheduler.instance)
.distinctUntilChanged()
.observeOn(MainScheduler.instance)
.subscribe(onNext: { [weak self] pattern in self?.scanAndScore(pattern) })
.disposed(by: self.disposeBag)
self.windowController.showWindow(self)
})
.disposed(by: self.disposeBag)
}
// Call this only when quitting
func cleanUp() { self.fileServicesPerRootUrl.removeAll() }
private let emit: (Action) -> Void
private let disposeBag = DisposeBag()
private(set) var cwd = FileUtils.userHomeUrl
private var cwdPathCompsCount = 0
private var scanToken = Token()
private var fileServicesPerRootUrl: [URL: FileService] = [:]
private var rootUrls: Set<URL> { Set(self.fileServicesPerRootUrl.map { url, _ in url }) }
private let scoredUrlsController = NSArrayController()
private let windowController: NSWindowController
private let searchField = NSTextField(forAutoLayout: ())
private let progressIndicator = NSProgressIndicator(forAutoLayout: ())
private let cwdControl = NSPathControl(forAutoLayout: ())
private let fileView = NSTableView.standardTableView()
private let searchStream: Observable<String>
private let log = OSLog(subsystem: Defs.loggerSubsystem,
category: Defs.LoggerCategory.uiComponents)
private var window: NSWindow { self.windowController.window! }
private func scanAndScore(_ pattern: String) {
guard let fileService = self.fileServicesPerRootUrl[self.cwd] else { return }
fileService.stopScanScore()
@ -218,7 +213,6 @@ extension OpenQuicklyWindow {
return OpenQuicklyFileViewRow()
}
@objc(tableView:viewForTableColumn:row:)
func tableView(_ tableView: NSTableView, viewFor _: NSTableColumn?, row: Int) -> NSView? {
let cachedCell = (
tableView.makeView(
@ -245,9 +239,7 @@ extension OpenQuicklyWindow {
let truncatedPathComps = pathComps[self.cwdPathCompsCount..<pathComps.count]
let name = truncatedPathComps.last!
if truncatedPathComps.dropLast().isEmpty {
return NSMutableAttributedString(string: name)
}
if truncatedPathComps.dropLast().isEmpty { return NSMutableAttributedString(string: name) }
let rowText: NSMutableAttributedString
let pathInfo = truncatedPathComps.dropLast().reversed().joined(separator: " / ")
@ -263,13 +255,13 @@ extension OpenQuicklyWindow {
// MARK: - NSTextFieldDelegate
extension OpenQuicklyWindow {
@objc(control:textView:doCommandBySelector:)
func control(
_ control: NSControl,
textView: NSTextView,
doCommandBy commandSelector: Selector
) -> Bool {
switch commandSelector {
case NSSelectorFromString("cancelOperation:"):
self.window.performClose(self)
return true
@ -290,6 +282,7 @@ extension OpenQuicklyWindow {
default:
return false
}
}
@ -327,7 +320,5 @@ extension OpenQuicklyWindow {
self.searchField.stringValue = ""
}
func windowDidResignKey(_: Notification) {
self.window.performClose(self)
}
func windowDidResignKey(_: Notification) { self.window.performClose(self) }
}