This repository has been archived by the owner on Feb 13, 2019. It is now read-only.
Add scripting, using Cub #75
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,160 @@ | ||
| // | ||
| // Cub.swift | ||
| // OpenTerm | ||
| // | ||
| // Created by Louis D'hauwe on 03/02/2018. | ||
| // Copyright © 2018 Silver Fox. All rights reserved. | ||
| // | ||
|
|
||
| import Foundation | ||
| import Cub | ||
| import ios_system | ||
| import TabView | ||
|
|
||
| public func cub(argc: Int32, argv: UnsafeMutablePointer<UnsafeMutablePointer<Int8>?>?) -> Int32 { | ||
|
|
||
| let tabViewContainer = UIApplication.shared.keyWindow?.rootViewController as! TabViewContainerViewController<TerminalTabViewController> | ||
|
|
||
| guard let activeVC = tabViewContainer.primaryTabViewController.visibleViewController as? TerminalViewController else { | ||
| return 0 | ||
| } | ||
|
|
||
| activeVC.terminalView.isExecutingScript = true | ||
| let executor = activeVC.terminalView.executor | ||
|
|
||
| guard argc == 2 else { | ||
| fputs("Usage: cub script.cub\n", thread_stderr) | ||
| return 1 | ||
| } | ||
|
|
||
| guard let fileName = argv?[1] else { | ||
| fputs("Usage: cub script.cub\n", thread_stderr) | ||
| return 1 | ||
| } | ||
|
|
||
| let path = String(cString: fileName) | ||
|
|
||
| guard FileManager.default.fileExists(atPath: path) else { | ||
| fputs("Missing file \(path)\n", thread_stderr) | ||
| return 1 | ||
| } | ||
|
|
||
| let url = URL(fileURLWithPath: path) | ||
|
|
||
| guard let data = FileManager.default.contents(atPath: url.path) else { | ||
| fputs("Missing file \(path)\n", thread_stderr) | ||
| return 1 | ||
| } | ||
|
|
||
| guard let source = String.init(data: data, encoding: .utf8) else { | ||
| fputs("Missing file \(path)\n", thread_stderr) | ||
| return 1 | ||
| } | ||
|
|
||
| let runner = Runner(logDebug: true, logTime: false) | ||
|
|
||
| runner.registerExternalFunction(name: "print", argumentNames: ["input"], returns: false) { (arguments, callback) in | ||
|
|
||
| for (name, arg) in arguments { | ||
| fputs("\(arg)\n", thread_stdout) | ||
| } | ||
|
|
||
| callback(nil) | ||
| return | ||
| } | ||
|
|
||
| runner.registerExternalFunction(name: "exec", argumentNames: ["command"], returns: true) { (arguments, callback) in | ||
|
|
||
| var arguments = arguments | ||
|
|
||
| guard let command = arguments.removeValue(forKey: "command") else { | ||
| callback(.number(1)) | ||
| return | ||
| } | ||
|
|
||
| guard case let .string(commandStr) = command else { | ||
| callback(.number(1)) | ||
| return | ||
| } | ||
|
|
||
| print("run command: \(commandStr)") | ||
|
|
||
| // executor.dispatch(commandStr, callback: { (code) in | ||
|
There was a problem hiding this comment. What will you end up doing here for execution? Will you need to add a callback? There was a problem hiding this comment. I've added CubCommandExecutor, which conforms to CommandExecutorDelegate and ParserDelegate. It takes a TerminalView and temporarily sets itself as the delegates. |
||
| // | ||
| // print("did run command: \(commandStr) -> \(code)") | ||
| // | ||
| // DispatchQueue.main.async { | ||
| // | ||
| // callback(.number(Double(code))) | ||
| // } | ||
| // | ||
| // }) | ||
|
|
||
| } | ||
|
|
||
| runner.registerExternalFunction(name: "format", argumentNames: ["input", "arg"], returns: true) { (arguments, callback) in | ||
|
|
||
| var arguments = arguments | ||
|
|
||
| guard let input = arguments.removeValue(forKey: "input") else { | ||
| callback(.string("")) | ||
| return | ||
| } | ||
|
|
||
| guard case let .string(inputStr) = input else { | ||
| callback(.string("")) | ||
| return | ||
| } | ||
|
|
||
| var otherValues = arguments.values | ||
|
|
||
| var varArgs = [CVarArg]() | ||
|
|
||
| for value in otherValues { | ||
|
|
||
| switch value { | ||
| case .bool(let b): | ||
| break | ||
| case .number(let n): | ||
| varArgs.append(n) | ||
| case .string(let str): | ||
| varArgs.append(str) | ||
| case .struct: | ||
| break | ||
| } | ||
|
|
||
| } | ||
|
|
||
| let output = String(format: inputStr, arguments: varArgs) | ||
|
|
||
| callback(.string(output)) | ||
| return | ||
| } | ||
|
|
||
| print("run") | ||
|
|
||
| do { | ||
|
|
||
| runner.executionFinishedCallback = { | ||
|
|
||
| print("executionFinishedCallback") | ||
|
|
||
| DispatchQueue.main.async { | ||
|
|
||
| activeVC.terminalView.isExecutingScript = false | ||
| // activeVC.terminalView.isWaitingForCommand = false | ||
|
There was a problem hiding this comment. PR #82 adds an enum state to the terminal, currently running or idle. Use that instead of adding this boolean. |
||
|
|
||
| // activeVC.terminalView.commandExecutor(executor, didFinishDispatchWithExitCode: 0) | ||
| // activeVC.terminalView.commandE | ||
| } | ||
|
|
||
| } | ||
|
|
||
| try runner.run(source) | ||
|
|
||
| } catch { | ||
| return 1 | ||
| } | ||
|
|
||
| return 0 | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I wouldn't check in the commented out lines in this file, but it's up to you.