Skip to content

Separate enabled and disabled plug-ins for ejection #95

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mszhangopopop wants to merge 1 commit into
base: main
Choose a base branch
from
+15 −3
Open

Separate enabled and disabled plug-ins for ejection #95

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 15 additions & 3 deletions TrollFools/EjectListView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,6 @@ struct EjectListView: View {
.textInputAutocapitalization(.never)
.autocorrectionDisabled(true)
} else {
// Fallback on earlier versions
ejectListView
.onReceive(searchViewModel.$searchKeyword) {
ejectList.filter.searchKeyword = $0
Expand Down Expand Up @@ -332,7 +331,14 @@ struct EjectListView: View {

do {
let plugInsToRemove = offsets.map { ejectList.filteredPlugIns[$0] }
let plugInURLsToRemove = plugInsToRemove.map { $0.url }

let enabledURLsToRemove = plugInsToRemove
.filter { $0.isEnabled }
.map { $0.url }

let disabledURLsToRemove = plugInsToRemove
.filter { !$0.isEnabled }
.map { $0.url }

let injector = try InjectorV3(ejectList.app.url)
logFileURL = injector.latestLogFileURL
Expand All @@ -349,7 +355,13 @@ struct EjectListView: View {
injector.preferMainExecutable = preferMainExecutable
injector.injectStrategy = injectStrategy

try injector.eject(plugInURLsToRemove, shouldDesist: true)
if !enabledURLsToRemove.isEmpty {
try injector.eject(enabledURLsToRemove, shouldDesist: true)
}

if !disabledURLsToRemove.isEmpty {
injector.desist(disabledURLsToRemove)
}

ejectList.app.reload()
ejectList.reload()
Expand Down
Loading