Simplify get simulator command + reduce launch time #31
Conversation
| @@ -8,7 +8,7 @@ class TagsController { | |||
| if let launchPath = Constants.FilePaths.Bash.tags { | |||
| let outputStream = CommandsCore.CommandTextOutputStream() | |||
| outputStream.textHandler = {text in | |||
| tags.append(contentsOf: text.components(separatedBy: "\n")) | |||
| tags.append(contentsOf: text.components(separatedBy: "\n").filter { !$0.isEmpty }) | |||
There was a problem hiding this comment.
@q231950 Not sure why it is needed. Sometimes we get a lot of empty strings after actual result.
There was a problem hiding this comment.
I guess somewhere in the script an empty line is generated.
|
PR is ready to be reviewed ;) @BasThomas @q231950 |
|
Uh-oh: it seems to be crashing locally:
|
| if let launchPath = Constants.FilePaths.Bash.startDevice { | ||
| let outputStream = CommandsCore.CommandTextOutputStream() | ||
| outputStream.textHandler = { text in | ||
| if !text.isEmpty { |
There was a problem hiding this comment.
maybe make this guard !text.isEmpty else { return } to prevent some indentation?
| arguments = [phoneUDID] | ||
| } | ||
| DispatchQueue.global(qos: .background).async { | ||
| self.commands.executeCommand(at: launchPath, arguments: arguments, outputStream: outputStream) |
There was a problem hiding this comment.
Why is this run on a background thread (but eg. https://github.com/JoeSSS/calabash-launcher/pull/31/files#diff-8622fb2ab735c45bc8f54aee4b135938R223 isn't?)
There was a problem hiding this comment.
There are some methods like running tests or this one that takes a lot of time to continue. If I do it in the main thread, it will freeze the whole APP, but we actually can use the APP while these commands are executing in background
| @IBOutlet var get_device: NSButtonCell! | ||
| @IBOutlet var simulatorRadioButton: NSButton! | ||
| @IBOutlet var physicalDeviceRadioButton: NSButton! | ||
| @IBOutlet var getDeviceButton: NSButtonCell! |
| let applicationStateHandler = ApplicationStateHandler() | ||
| let tagsController = TagsController() | ||
| let fileManager = FileManager.default | ||
| var devices: [String] = [""] |
There was a problem hiding this comment.
Maybe either remove the : [String] or make the initial array empty ([])
| killProcessesProcess.launch() | ||
| killProcessesProcess.waitUntilExit() | ||
| } | ||
| commands.executeCommand(at: Constants.FilePaths.Bash.killProcess ?? "", arguments: [""]) |
| if let launchPath = Constants.FilePaths.Bash.sendToIRB { | ||
| let outputStream = CommandsCore.CommandTextOutputStream() | ||
| outputStream.textHandler = { text in | ||
| if !text.isEmpty { |
There was a problem hiding this comment.
guard !text.isEmpty else { return }
| } | ||
| } | ||
| } | ||
| let arguments = [self.textField.stringValue] |
There was a problem hiding this comment.
Let's declare this inside the handler.
| } | ||
| } | ||
| commands.executeCommand(at: launchPath, arguments: [""], outputStream: outputStream) |
| strongSelf.generalIRBSessionTask.launch() | ||
| strongSelf.generalIRBSessionTask.waitUntilExit() | ||
| } | ||
| commands.executeCommand(at: Constants.FilePaths.Bash.quitIRBSession ?? "", arguments: [""]) |
| @@ -584,14 +427,16 @@ class TasksViewController: NSViewController { | |||
| self.textViewPrinter.printToTextView(text) | |||
| } | |||
| } | |||
| let commands = CommandsCore.CommandExecutor() | |||
There was a problem hiding this comment.
Unrelated, let's create a ticket for this: we should remove the runScript from the VC.
Bonus track: Kill all processes by moving everything to CommandsCore