Skip to content

feat: add exit flag to allow for exiting after selection is made #38

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
0xch4z wants to merge 1 commit into
base: main
Choose a base branch
from
Open

feat: add exit flag to allow for exiting after selection is made #38

Show file tree
Hide file tree
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
14 changes: 11 additions & 3 deletions src/AppListProvider.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,12 @@ class AppListProvider: ListProvider {
var appDirDict = [String: Bool]()

var appList = [URL]()

let exitFlag: Bool

init() {
init(exitFlag: Bool) {
self.exitFlag = exitFlag

let applicationDir = NSSearchPathForDirectoriesInDomains(
.applicationDirectory, .localDomainMask, true)[0]

Expand All @@ -41,7 +45,7 @@ class AppListProvider: ListProvider {
appDirDict["/System/Library/CoreServices/"] = false

initFileWatch(Array(appDirDict.keys))
updateAppList()
updateAppList()
}

func initFileWatch(_ dirs: [String]) {
Expand Down Expand Up @@ -93,8 +97,12 @@ class AppListProvider: ListProvider {
NSLog("Cannot do action on item \(item.name)")
return
}
DispatchQueue.main.async {
DispatchQueue.main.async { [weak self] in
NSWorkspace.shared.launchApplication(app.path)

if self?.exitFlag ?? false {
NSApplication.shared.terminate(self)
}
}
}
}
3 changes: 3 additions & 0 deletions src/CommandArguments.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,7 @@ import ArgumentParser
struct DmenuMac: ParsableArguments {
@Option(name: .shortAndLong, help: "Show a prompt instead of the search input.")
var prompt: String?

@Flag(name: .shortAndLong, help: "Exit the process after an item is selected.")
var exit: Bool = false
}
17 changes: 8 additions & 9 deletions src/SearchViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ class SearchViewController: NSViewController, NSTextFieldDelegate,
var hotkey: DDHotKey?
var listProvider: ListProvider?
var promptValue = ""
var exitFlag = false

struct Shortcut {
let keycode: UInt16
Expand All @@ -55,16 +56,16 @@ class SearchViewController: NSViewController, NSTextFieldDelegate,
object: nil
)

let options = DmenuMac.parseOrExit()
if options.prompt != nil {
promptValue = options.prompt!
}

let stdinStr = ReadStdin.read()
if stdinStr.count > 0 {
listProvider = PipeListProvider(str: stdinStr)
} else {
listProvider = AppListProvider()
}

let options = DmenuMac.parseOrExit()
if options.prompt != nil {
promptValue = options.prompt!
listProvider = AppListProvider(exitFlag: options.exit ?? false)
}

clearFields()
Expand Down Expand Up @@ -207,9 +208,7 @@ Ensure you are using a unique, valid shortcut.

func closeApp() {
clearFields()
if promptValue == "" {
Copy link
Copy Markdown
Author

@0xch4z 0xch4z Jan 7, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This change isn't necessary, just saw this could be simplified as PipeListProvider.doAction terminates the app before this code is reached -- promptValue == "" will always evaluate to true.

NSApplication.shared.hide(nil)
}
NSApplication.shared.hide(nil)
}

@IBAction func openSettings(_ sender: AnyObject) {
Expand Down