add script class

Author: ashen-23

json2Swift.xcodeproj/project.pbxproj

@@ -13,6 +13,7 @@
 95C6F59A1FB2A00F00667862 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 95C6F5981FB2A00F00667862 /* Main.storyboard */; };
 95C6F5A51FB2A05900667862 /* Parse.py in Resources */ = {isa = PBXBuildFile; fileRef = 95C6F5A31FB2A05900667862 /* Parse.py */; };
 95CFA2881FB2E361003561F2 /* Demo.swift in Sources */ = {isa = PBXBuildFile; fileRef = 95CFA2871FB2E361003561F2 /* Demo.swift */; };
+95CFA28A1FB3ED3F003561F2 /* PyScript.swift in Sources */ = {isa = PBXBuildFile; fileRef = 95CFA2891FB3ED3F003561F2 /* PyScript.swift */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
@@ -25,6 +26,7 @@
 95C6F59C1FB2A00F00667862 /* json2Swift.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = json2Swift.entitlements; sourceTree = "<group>"; };
 95C6F5A31FB2A05900667862 /* Parse.py */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.python; path = Parse.py; sourceTree = "<group>"; };
 95CFA2871FB2E361003561F2 /* Demo.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Demo.swift; sourceTree = "<group>"; };
+95CFA2891FB3ED3F003561F2 /* PyScript.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PyScript.swift; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -60,6 +62,7 @@
 95C6F5A21FB2A01D00667862 /* script */,
 95C6F5921FB2A00F00667862 /* AppDelegate.swift */,
 95C6F5941FB2A00F00667862 /* ViewController.swift */,
+95CFA2891FB3ED3F003561F2 /* PyScript.swift */,
 95C6F5961FB2A00F00667862 /* Assets.xcassets */,
 95C6F5981FB2A00F00667862 /* Main.storyboard */,
 95C6F59B1FB2A00F00667862 /* Info.plist */,
@@ -152,6 +155,7 @@
 95C6F5951FB2A00F00667862 /* ViewController.swift in Sources */,
 95C6F5931FB2A00F00667862 /* AppDelegate.swift in Sources */,
 95CFA2881FB2E361003561F2 /* Demo.swift in Sources */,
+95CFA28A1FB3ED3F003561F2 /* PyScript.swift in Sources */,
 );
 runOnlyForDeploymentPostprocessing = 0;
 };

json2Swift.xcodeproj/project.xcworkspace/xcuserdata/shijian.xcuserdatad/UserInterfaceState.xcuserstate

@@ -0,0 +1,101 @@
+//
+// PyScript.swift
+// json2Swift
+//
+// Created by Shi Jian on 2017/11/9.
+// Copyright © 2017年 HHMedic. All rights reserved.
+//
+
+import Cocoa
+
+public typealias completeBlock = ((_ results: [String], _ errors: String?)->Void)
+
+public class PyScript {
+
+ let buildTask = Process()
+ let outPip = Pipe()
+ let errorPipe = Pipe()
+ /// 完成回调
+ var completed: completeBlock?
+ 
+ /// 是否异步执行回调，只在runAsync下生效
+ var asyncComlete = false
+ 
+ /// 多个返回结果的分隔符
+ public var splitPara: Character?
+
+ public init(scrPath: String, args: [String]? = nil, complete: completeBlock? = nil) {
+ completed = complete
+ 
+ buildTask.launchPath = "/usr/bin/python"
+
+ var allArgs = [String]()
+ allArgs.append(scrPath)
+ if let aArg = args {
+ allArgs.append(contentsOf: aArg)
+ }
+ buildTask.arguments = allArgs
+
+ buildTask.standardInput = Pipe()
+ buildTask.standardOutput = outPip
+ buildTask.standardError = errorPipe
+ 
+// buildTask.terminationHandler = { p in
+// self.taskFinish()
+// }
+ }
+ 
+ /// 同步执行
+ public func runSync() {
+ buildTask.launch()
+ buildTask.waitUntilExit()
+ 
+ // 错误处理
+ if let aError = fetchResult(errorPipe), aError != "" {
+ runComlete(["-1"], aError)
+ return
+ }
+ 
+// let result = fetchResult(outPip)?.split(separator: "\n").map(String.init) ?? [""]
+ runComlete(processResult(), nil)
+ }
+ 
+ /// 异步执行
+ ///
+ /// - Parameter asyncComlete: 回调是否异步主线程执行
+ public func runAsync(asyncComlete: Bool = true) {
+ self.asyncComlete = asyncComlete
+ DispatchQueue.global().async {
+ self.runSync()
+ }
+ }
+ 
+}
+
+extension PyScript {
+ 
+ /// 执行block回调
+ fileprivate func runComlete(_ result: [String], _ error: String?) {
+ if asyncComlete {
+ asyncComlete = false
+ DispatchQueue.main.async {
+ self.completed?(result, error)
+ }
+ } else {
+ completed?(result, error)
+ }
+ }
+ 
+ // 获取返回数据的字符串形式
+ fileprivate func fetchResult(_ pipe: Pipe) -> String? {
+ let data = pipe.fileHandleForReading.readDataToEndOfFile()
+ return String(data: data, encoding: String.Encoding.utf8)
+ }
+ 
+ fileprivate func processResult() -> [String] {
+ let result = fetchResult(outPip) ?? ""
+ guard let splt = splitPara else { return [result] }
+ return result.split(separator: splt).map(String.init)
+ }
+}
+

json2Swift/PyScript.swift

@@ -27,55 +27,42 @@ class ViewController: NSViewController {
  }
 
  @IBAction func doExcute(_ sender: NSButton) {
+ runScript()
+ }
+ 
+ func runScript() {
  guard let aPath = Bundle.main.path(forResource: "Parse", ofType: "py") else { return }
- var args = [aPath]
- // 参数
- args.append(inputView.string)
+ 
+ let script = PyScript(scrPath: aPath, args: fetchArgs()) { [weak self] in
+ self?.scriptFinish(results: $0, error: $1)
+ }
+
+ script.runAsync()
+ }
 
+ // 执行完成的回调
+ func scriptFinish(results: [String], error: String?) {
+ if let aError = error {
+ outputView.string = "解析错误\r\n" + aError
+ return
+ }
+ 
+ outputView.string = results[0]
+ }
+ 
+ func fetchArgs() -> [String] {
+ var args = [inputView.string]
  // mapper
  args.append(mapperCheck.state == .on ? "objectMapper" : "none")
-
+ 
  // name
  let name = nameText.stringValue == "" ? "Result" : nameText.stringValue
  args.append(name)
 
  // prefix
  args.append(prefixText.stringValue)
 
- runPython(args: args)
- }
- 
- func runPython(args: [String]?) {
- 
- let buildTask = Process()
- let outPip = Pipe()
- let errorPipe = Pipe()
- 
- buildTask.launchPath = "/usr/bin/python"
- buildTask.arguments = args
- buildTask.standardInput = Pipe()
- buildTask.standardOutput = outPip
- buildTask.standardError = errorPipe
- buildTask.terminationHandler = { p in
- self.taskFinish()
- }
- buildTask.launch()
- buildTask.waitUntilExit()
- 
- let data = outPip.fileHandleForReading.readDataToEndOfFile()
- let str = String(data: data, encoding: String.Encoding.utf8)
- outputView.string = str ?? "解析错误"
- 
- // 错误处理
- let errorData = errorPipe.fileHandleForReading.readDataToEndOfFile()
- let errorStr = String(data: errorData, encoding: String.Encoding.utf8)
- if let aError = errorStr, aError != "" {
- outputView.string = "解析错误\r\n" + aError
- }
- }
- 
- func taskFinish() {
- print("执行完毕")
+ return args
  }
 
  @IBAction func runDemo(_ sender: NSButton) {
@@ -84,7 +71,7 @@ class ViewController: NSViewController {
  prefixText.stringValue = "SJ_"
 
  DispatchQueue.main.asyncAfter(deadline: DispatchTime.now() + 0.2) {
- self.doExcute(sender)
+ self.runScript()
  }
  }