Skip to content

Commit 4c634f1

Browse files
committed
change log dir to temp/rime.squirrel
1 parent 9e477f0 commit 4c634f1

File tree

2 files changed

+17
-12
lines changed

2 files changed

+17
-12
lines changed

sources/Main.swift

+1
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ struct SquirrelApp {
1818
static let appDir = "/Library/Input Library/Squirrel.app".withCString { dir in
1919
URL(fileURLWithFileSystemRepresentation: dir, isDirectory: false, relativeTo: nil)
2020
}
21+
static let logDir = FileManager.default.temporaryDirectory.appending(component: "rime.squirrel", directoryHint: .isDirectory)
2122

2223
// swiftlint:disable:next cyclomatic_complexity
2324
static func main() {

sources/SquirrelApplicationDelegate.swift

+16-12
Original file line numberDiff line numberDiff line change
@@ -77,8 +77,7 @@ final class SquirrelApplicationDelegate: NSObject, NSApplicationDelegate, SPUSta
7777
}
7878

7979
func openLogFolder() {
80-
let logDir = FileManager.default.temporaryDirectory
81-
NSWorkspace.shared.open(logDir)
80+
NSWorkspace.shared.open(SquirrelApp.logDir)
8281
}
8382

8483
func openRimeFolder() {
@@ -124,15 +123,8 @@ final class SquirrelApplicationDelegate: NSObject, NSApplicationDelegate, SPUSta
124123
}
125124

126125
func setupRime() {
127-
let userDataDir = SquirrelApp.userDir
128-
let fileManager = FileManager.default
129-
if !fileManager.fileExists(atPath: userDataDir.path()) {
130-
do {
131-
try fileManager.createDirectory(at: userDataDir, withIntermediateDirectories: true)
132-
} catch {
133-
print("Error creating user data directory: \(userDataDir.path())")
134-
}
135-
}
126+
createDirIfNotExist(path: SquirrelApp.userDir)
127+
createDirIfNotExist(path: SquirrelApp.logDir)
136128
// swiftlint:disable identifier_name
137129
let notification_handler: @convention(c) (UnsafeMutableRawPointer?, RimeSessionId, UnsafePointer<CChar>?, UnsafePointer<CChar>?) -> Void = notificationHandler
138130
let context_object = Unmanaged.passUnretained(self).toOpaque()
@@ -141,7 +133,8 @@ final class SquirrelApplicationDelegate: NSObject, NSApplicationDelegate, SPUSta
141133

142134
var squirrelTraits = RimeTraits.rimeStructInit()
143135
squirrelTraits.setCString(Bundle.main.sharedSupportPath!, to: \.shared_data_dir)
144-
squirrelTraits.setCString(userDataDir.path(), to: \.user_data_dir)
136+
squirrelTraits.setCString(SquirrelApp.userDir.path(), to: \.user_data_dir)
137+
squirrelTraits.setCString(SquirrelApp.logDir.path(), to: \.log_dir)
145138
squirrelTraits.setCString("Squirrel", to: \.distribution_code_name)
146139
squirrelTraits.setCString("鼠鬚管", to: \.distribution_name)
147140
squirrelTraits.setCString(Bundle.main.object(forInfoDictionaryKey: kCFBundleVersionKey as String) as! String, to: \.distribution_version)
@@ -313,6 +306,17 @@ private extension SquirrelApplicationDelegate {
313306
print("Sync rime on demand.")
314307
self.syncUserData()
315308
}
309+
310+
func createDirIfNotExist(path: URL) {
311+
let fileManager = FileManager.default
312+
if !fileManager.fileExists(atPath: path.path()) {
313+
do {
314+
try fileManager.createDirectory(at: path, withIntermediateDirectories: true)
315+
} catch {
316+
print("Error creating user data directory: \(path.path())")
317+
}
318+
}
319+
}
316320
}
317321

318322
extension NSApplication {

0 commit comments

Comments
 (0)