MetaCubeX
/
ClashX.Meta
mirror of https://github.com/MetaCubeX/ClashX.Meta
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

misc: update LoginServiceKit

This commit is contained in:
yicheng 2021-10-04 14:50:51 +08:00
parent 3c57228621
commit 23d5ea81be
No known key found for this signature in database
GPG Key ID: 7CF411A6623B1C0A
1 changed files with 16 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
ClashX/Vendor/LoginServiceKit/LoginServiceKit.swift vendored
View File

@ -5,7 +5,7 @@
// GitHub: https://github.com/clipy // GitHub: https://github.com/clipy
// HP: https://clipy-app.com // HP: https://clipy-app.com
// //
// Copyright © 2015-2019 Clipy Project. // Copyright © 2015-2020 Clipy Project.
// //
// //
@ -58,32 +58,24 @@ public extension LoginServiceKit {
@discardableResult @discardableResult
static func addLoginItems(at path: String = Bundle.main.bundlePath) -> Bool { static func addLoginItems(at path: String = Bundle.main.bundlePath) -> Bool {
guard !isExistLoginItems(at: path) else { return false } guard !isExistLoginItems(at: path) else { return false }
guard let snapshots = loginItemsListSnapshots() else { return false }
guard let sharedFileList = LSSharedFileListCreate(nil, kLSSharedFileListSessionLoginItems.takeRetainedValue(), nil) else { return false }
let loginItemList = sharedFileList.takeRetainedValue()
let url = URL(fileURLWithPath: path) let url = URL(fileURLWithPath: path)
if #available(macOS 11, *) { LSSharedFileListInsertItemURL(snapshots.fileList, snapshots.items.last, nil, nil, url as CFURL, nil, nil)
LSSharedFileListInsertItemURL(loginItemList, nil, nil, nil, url as CFURL, nil, nil)
} else {
LSSharedFileListInsertItemURL(loginItemList, kLSSharedFileListItemBeforeFirst.takeRetainedValue(), nil, nil, url as CFURL, nil, nil)
}
return true return true
} }
@discardableResult @discardableResult
static func removeLoginItems(at path: String = Bundle.main.bundlePath) -> Bool { static func removeLoginItems(at path: String = Bundle.main.bundlePath) -> Bool {
guard isExistLoginItems(at: path) else { return false } guard isExistLoginItems(at: path) else { return false }
guard let snapshots = loginItemsListSnapshots() else { return false }
guard let sharedFileList = LSSharedFileListCreate(nil, kLSSharedFileListSessionLoginItems.takeRetainedValue(), nil) else { return false }
let loginItemList = sharedFileList.takeRetainedValue()
let url = URL(fileURLWithPath: path) let url = URL(fileURLWithPath: path)
let loginItemsListSnapshot: NSArray = LSSharedFileListCopySnapshot(loginItemList, nil).takeRetainedValue() for loginItem in snapshots.items {
guard let loginItems = loginItemsListSnapshot as? [LSSharedFileListItem] else { return false }
for loginItem in loginItems {
guard let resolvedUrl = LSSharedFileListItemCopyResolvedURL(loginItem, 0, nil) else { continue } guard let resolvedUrl = LSSharedFileListItemCopyResolvedURL(loginItem, 0, nil) else { continue }
let itemUrl = resolvedUrl.takeRetainedValue() as URL let itemUrl = resolvedUrl.takeRetainedValue() as URL
guard url.absoluteString == itemUrl.absoluteString else { continue } guard url.absoluteString == itemUrl.absoluteString else { continue }
LSSharedFileListItemRemove(loginItemList, loginItem) LSSharedFileListItemRemove(snapshots.fileList, loginItem)
} }
return true return true
} }
@ -92,13 +84,10 @@ public extension LoginServiceKit {
private extension LoginServiceKit { private extension LoginServiceKit {
static func loginItem(at path: String) -> LSSharedFileListItem? { static func loginItem(at path: String) -> LSSharedFileListItem? {
guard !path.isEmpty else { return nil } guard !path.isEmpty else { return nil }
guard let snapshots = loginItemsListSnapshots() else { return nil }
guard let sharedFileList = LSSharedFileListCreate(nil, kLSSharedFileListSessionLoginItems.takeRetainedValue(), nil) else { return nil }
let loginItemList = sharedFileList.takeRetainedValue()
let url = URL(fileURLWithPath: path) let url = URL(fileURLWithPath: path)
let loginItemsListSnapshot: NSArray = LSSharedFileListCopySnapshot(loginItemList, nil).takeRetainedValue() for loginItem in snapshots.items {
guard let loginItems = loginItemsListSnapshot as? [LSSharedFileListItem] else { return nil }
for loginItem in loginItems {
guard let resolvedUrl = LSSharedFileListItemCopyResolvedURL(loginItem, 0, nil) else { continue } guard let resolvedUrl = LSSharedFileListItemCopyResolvedURL(loginItem, 0, nil) else { continue }
let itemUrl = resolvedUrl.takeRetainedValue() as URL let itemUrl = resolvedUrl.takeRetainedValue() as URL
guard url.absoluteString == itemUrl.absoluteString else { continue } guard url.absoluteString == itemUrl.absoluteString else { continue }
@ -106,4 +95,12 @@ private extension LoginServiceKit {
} }
return nil return nil
} }
static func loginItemsListSnapshots() -> (fileList: LSSharedFileList, items: [LSSharedFileListItem])? {
guard let sharedFileList = LSSharedFileListCreate(nil, kLSSharedFileListSessionLoginItems.takeRetainedValue(), nil) else { return nil }
let fileList = sharedFileList.takeRetainedValue()
let loginItemsListSnapshot: NSArray = LSSharedFileListCopySnapshot(fileList, nil).takeRetainedValue()
let loginItems = loginItemsListSnapshot as? [LSSharedFileListItem]
return (fileList, loginItems ?? [])
}
} }