qvacua/vimr
1
1
Fork 0
mirror of https://github.com/qvacua/vimr.git synced 2024-12-29 00:34:26 +03:00
Code Issues Projects Releases Wiki Activity

Rename

Browse Source
This commit is contained in:
Tae Won Ha 2020-01-18 17:47:26 +01:00
parent 306c13bf14
commit 0cd8a00c00
No known key found for this signature in database
GPG Key ID: E40743465B5B8B44
3 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
VimR/VimR.xcodeproj/project.pbxproj
View File

@ -423,8 +423,8 @@
4BF70EDA23D1B591009E51E9 /* FuzzySearch.xcdatamodel in Sources */ = {isa = PBXBuildFile; fileRef = 4BF70ED823D1B591009E51E9 /* FuzzySearch.xcdatamodel */; };
4BF70EE123D1B5B3009E51E9 /* FileScanBaton.m in Sources */ = {isa = PBXBuildFile; fileRef = 4BF70EDF23D1B5B3009E51E9 /* FileScanBaton.m */; };
4BF70EE223D1B5B3009E51E9 /* FileScanBaton.m in Sources */ = {isa = PBXBuildFile; fileRef = 4BF70EDF23D1B5B3009E51E9 /* FileScanBaton.m */; };
4BF70EE523D1B5EC009E51E9 /* FileService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4BF70EE323D1B5EC009E51E9 /* FileService.swift */; };
4BF70EE623D1B5EC009E51E9 /* FileService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4BF70EE323D1B5EC009E51E9 /* FileService.swift */; };
4BF70EE523D1B5EC009E51E9 /* FuzzySearchService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4BF70EE323D1B5EC009E51E9 /* FuzzySearchService.swift */; };
4BF70EE623D1B5EC009E51E9 /* FuzzySearchService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4BF70EE323D1B5EC009E51E9 /* FuzzySearchService.swift */; };
4BF70EE723D1B5EC009E51E9 /* FuzzySearchFileMonitor.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4BF70EE423D1B5EC009E51E9 /* FuzzySearchFileMonitor.swift */; };
4BF70EE823D1B5EC009E51E9 /* FuzzySearchFileMonitor.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4BF70EE423D1B5EC009E51E9 /* FuzzySearchFileMonitor.swift */; };
4BF70EEA23D1B5FF009E51E9 /* CoreDataStack.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4BF70EE923D1B5FF009E51E9 /* CoreDataStack.swift */; };
@ -716,7 +716,7 @@
4BF70ED823D1B591009E51E9 /* FuzzySearch.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = FuzzySearch.xcdatamodel; sourceTree = "<group>"; };
4BF70EDF23D1B5B3009E51E9 /* FileScanBaton.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FileScanBaton.m; sourceTree = "<group>"; };
4BF70EE023D1B5B3009E51E9 /* FileScanBaton.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FileScanBaton.h; sourceTree = "<group>"; };
4BF70EE323D1B5EC009E51E9 /* FileService.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FileService.swift; sourceTree = "<group>"; };
4BF70EE323D1B5EC009E51E9 /* FuzzySearchService.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FuzzySearchService.swift; sourceTree = "<group>"; };
4BF70EE423D1B5EC009E51E9 /* FuzzySearchFileMonitor.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FuzzySearchFileMonitor.swift; sourceTree = "<group>"; };
4BF70EE923D1B5FF009E51E9 /* CoreDataStack.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CoreDataStack.swift; sourceTree = "<group>"; };
4BF70EEC23D1B618009E51E9 /* ConditionVariable.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ConditionVariable.swift; sourceTree = "<group>"; };
@ -1194,7 +1194,7 @@
4BF70EFE23D36C8C009E51E9 /* FileItem+CoreDataClass.h */,
4BF70EE923D1B5FF009E51E9 /* CoreDataStack.swift */,
4BF70EE423D1B5EC009E51E9 /* FuzzySearchFileMonitor.swift */,
4BF70EE323D1B5EC009E51E9 /* FileService.swift */,
4BF70EE323D1B5EC009E51E9 /* FuzzySearchService.swift */,
4BF70ED823D1B591009E51E9 /* FuzzySearch.xcdatamodel */,
4BF70ED423D1B54F009E51E9 /* ScoredUrl.h */,
4BF70ED523D1B54F009E51E9 /* ScoredUrl.m */,
@ -1616,7 +1616,7 @@
4B2636F4223A487B00021586 /* ShortcutsPref.swift in Sources */,
4B2636F5223A487B00021586 /* ShortcutsTableSubviews.swift in Sources */,
4B2636F6223A487B00021586 /* DefaultShortcuts.swift in Sources */,
4BF70EE623D1B5EC009E51E9 /* FileService.swift in Sources */,
4BF70EE623D1B5EC009E51E9 /* FuzzySearchService.swift in Sources */,
4B2636F7223A487B00021586 /* ShortcutItem.swift in Sources */,
4B2636F8223A487B00021586 /* RpcEvents.swift in Sources */,
4B2636F9223A487B00021586 /* RpcAppearanceEpic.swift in Sources */,
@ -1718,7 +1718,7 @@
1929BB85B2D30E548A32663D /* ShortcutsPref.swift in Sources */,
1929BA269EBD68251410A08E /* ShortcutsTableSubviews.swift in Sources */,
1929B2D56C4652E251C23AD4 /* DefaultShortcuts.swift in Sources */,
4BF70EE523D1B5EC009E51E9 /* FileService.swift in Sources */,
4BF70EE523D1B5EC009E51E9 /* FuzzySearchService.swift in Sources */,
1929B0C7150100A84FBDB8BF /* ShortcutItem.swift in Sources */,
1929B250DB3FB395A700FE8C /* RpcEvents.swift in Sources */,
1929BF3253594E5B1908C6CE /* RpcAppearanceEpic.swift in Sources */,

2
VimR/VimR/FileService.swift → VimR/VimR/FuzzySearchService.swift
View File

@ -7,7 +7,7 @@ import Foundation
import CoreData
import os
class FileService {
class FuzzySearchService {
typealias ScoredUrlsCallback = ([ScoredUrl]) -> Void

26
VimR/VimR/OpenQuicklyWindow.swift
View File

@ -27,11 +27,11 @@ class OpenQuicklyWindow: NSObject,
@objc dynamic private(set) var unsortedScoredUrls = [ScoredUrl]()
// Call this only when quitting
func cleanUp() { self.fileServicesPerRootUrl.removeAll() }
func cleanUp() { self.searchServicePerRootUrl.removeAll() }
@objc func useVcsAction(_: Any?) {
self.scanToken = Token()
self.currentFileService?.stopScanScore()
self.currentSearchService?.stopScanScore()
self.endProgress()
self.unsortedScoredUrls.removeAll()
@ -67,8 +67,8 @@ class OpenQuicklyWindow: NSObject,
private var usesVcsIgnores = true
private var scanToken = Token()
private var fileServicesPerRootUrl: [URL: FileService] = [:]
private var currentFileService: FileService?
private var searchServicePerRootUrl: [URL: FuzzySearchService] = [:]
private var currentSearchService: FuzzySearchService?
private let scoredUrlsController = NSArrayController()
private let windowController: NSWindowController
@ -109,7 +109,7 @@ class OpenQuicklyWindow: NSObject,
self.useVcsIgnoresCheckBox.boolState = curWinState.usesVcsIgnores
self.scanToken = Token()
self.currentFileService?.usesVcsIgnores = self.usesVcsIgnores
self.currentSearchService?.usesVcsIgnores = self.usesVcsIgnores
self.unsortedScoredUrls.removeAll()
let pattern = self.searchField.stringValue
@ -134,7 +134,7 @@ class OpenQuicklyWindow: NSObject,
self.useVcsIgnoresCheckBox.boolState = curWinState.usesVcsIgnores
let cwd = curWinState.cwd
self.currentFileService = self.fileServicesPerRootUrl[cwd]
self.currentSearchService = self.searchServicePerRootUrl[cwd]
self.cwdPathCompsCount = cwd.pathComponents.count
self.cwdControl.url = cwd
@ -148,7 +148,7 @@ class OpenQuicklyWindow: NSObject,
private func reset() {
self.scanToken = Token()
self.currentFileService?.stopScanScore()
self.currentSearchService?.stopScanScore()
self.endProgress()
self.unsortedScoredUrls.removeAll()
@ -157,7 +157,7 @@ class OpenQuicklyWindow: NSObject,
}
private func scanAndScore(_ pattern: String) {
self.currentFileService?.stopScanScore()
self.currentSearchService?.stopScanScore()
guard pattern.count >= 2 else {
self.unsortedScoredUrls.removeAll()
@ -168,7 +168,7 @@ class OpenQuicklyWindow: NSObject,
let localToken = self.scanToken
self.unsortedScoredUrls.removeAll()
self.currentFileService?.scanScore(
self.currentSearchService?.scanScore(
for: pattern,
beginCallback: { self.startProgress() },
endCallback: { self.endProgress() }
@ -186,24 +186,24 @@ class OpenQuicklyWindow: NSObject,
private func updateRootUrls(state: AppState) {
let urlsToMonitor = Set(state.mainWindows.map { $1.cwd })
let currentUrls = Set(self.fileServicesPerRootUrl.map { url, _ in url })
let currentUrls = Set(self.searchServicePerRootUrl.map { url, _ in url })
let newUrls = urlsToMonitor.subtracting(currentUrls)
let obsoleteUrls = currentUrls.subtracting(urlsToMonitor)
newUrls.forEach { url in
self.log.info("Adding \(url) and its service.")
guard let service = try? FileService(root: url) else {
guard let service = try? FuzzySearchService(root: url) else {
self.log.error("Could not create FileService for \(url)")
return
}
self.fileServicesPerRootUrl[url] = service
self.searchServicePerRootUrl[url] = service
}
obsoleteUrls.forEach { url in
self.log.info("Removing \(url) and its service.")
self.fileServicesPerRootUrl.removeValue(forKey: url)
self.searchServicePerRootUrl.removeValue(forKey: url)
}
}