From 32899e6a34e93412e40714574daef7520fe29905 Mon Sep 17 00:00:00 2001 From: leedongmyung Date: Wed, 20 Nov 2024 14:37:51 +0900 Subject: [PATCH 1/7] =?UTF-8?q?test=20build=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/oto/core/defined_data.dart | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/oto/core/defined_data.dart b/lib/oto/core/defined_data.dart index 403fdc1..3a5fa14 100644 --- a/lib/oto/core/defined_data.dart +++ b/lib/oto/core/defined_data.dart @@ -43,8 +43,8 @@ commands: scm: Git name: OTO relativeAssetPath: assets/data - return-version: "" - return-hash: "" + setVersion: "<@property.version>" + setHash: "<@property.hash>" #- command: BuildDart # param: From b6ac3666360aa9aa4c8a9f327f81f7a5e2f34c96 Mon Sep 17 00:00:00 2001 From: leedongmyung Date: Wed, 20 Nov 2024 14:38:17 +0900 Subject: [PATCH 2/7] =?UTF-8?q?pipeline2=20=EB=B9=8C=EB=93=9C=20=EB=94=94?= =?UTF-8?q?=EB=B2=84=EA=B7=B8=20=EC=98=B5=EC=85=98=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .vscode/launch.json | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.vscode/launch.json b/.vscode/launch.json index 9a398da..e1fa066 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -46,6 +46,13 @@ "program": "./bin/main.dart", "args": ["exe", "-f", "./assets/pipeline-test.yaml"] }, + { + "name": "exe pipeline2", + "request": "launch", + "type": "dart", + "program": "./bin/main.dart", + "args": ["exe", "-f", "./assets/pipeline-test2.yaml"] + }, { "name": "exe slack", "request": "launch", From 88af0e5a8555ee4805dc729cc90c8da5c36b0040 Mon Sep 17 00:00:00 2001 From: leedongmyung Date: Tue, 26 Nov 2024 09:02:14 +0900 Subject: [PATCH 3/7] =?UTF-8?q?=EA=B9=83=20=EC=B4=88=EA=B8=B0=ED=99=94=20?= =?UTF-8?q?=EC=BB=A4=EB=A9=98=EB=93=9C=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/oto/commands/command.dart | 9 ++++++++- lib/oto/commands/git/git.dart | 16 ++++++++++++++++ lib/oto/data/command_data.dart | 15 +++++++++++++++ lib/oto/data/command_data.g.dart | 19 +++++++++++++++++++ 4 files changed, 58 insertions(+), 1 deletion(-) diff --git a/lib/oto/commands/command.dart b/lib/oto/commands/command.dart index fb2771d..51c06fa 100644 --- a/lib/oto/commands/command.dart +++ b/lib/oto/commands/command.dart @@ -80,6 +80,7 @@ enum CommandType { GitCheckout, GitRev, GitCount, + GitReset, GitHub, GitHubPullRequestCreate, GitHubPullRequestList, @@ -137,6 +138,7 @@ abstract class Command { CommandType.GitCheckout: () => GitCheckout(), CommandType.GitRev: () => GitRev(), CommandType.GitCount: () => GitCount(), + CommandType.GitReset: () => GitReset(), CommandType.GitHub: () => GitHub(), CommandType.GitHubPullRequestCreate: () => GitHubPullRequestCreate(), CommandType.GitHubPullRequestList: () => GitHubPullRequestList(), @@ -360,7 +362,12 @@ abstract class Command { } Map getParam(DataCommand command) { - var map = Command.replaceAllTagsMap(command.param); + Map map; + if(command.param == null) { + map = {}; + } else { + map = Command.replaceAllTagsMap(command.param); + } map['workspace'] = _workspace = getWorkspace(map['workspace']); return map; } diff --git a/lib/oto/commands/git/git.dart b/lib/oto/commands/git/git.dart index 1d8148b..7acaac7 100644 --- a/lib/oto/commands/git/git.dart +++ b/lib/oto/commands/git/git.dart @@ -110,3 +110,19 @@ class GitRev extends Command { return await completeProcess(process, command); } } + +//git 초기화 +class GitReset extends Command { + @override + Future execute(DataCommand command) async { + var data = DataGitReset.fromJson(getParam(command)); + + var shell = StringBuffer(getCDPath(workspace)); + var force = data.force! ? 'f' : ''; + shell.write(' && git reset --hard'); + shell.write(' && git clean -${force}d'); + var process = await ProcessExecutor.start(shell, printStderr: false); + + return await completeProcess(process, command); + } +} diff --git a/lib/oto/data/command_data.dart b/lib/oto/data/command_data.dart index acc7b37..a49d3f0 100644 --- a/lib/oto/data/command_data.dart +++ b/lib/oto/data/command_data.dart @@ -1,5 +1,7 @@ // ignore_for_file: non_constant_identifier_names, avoid_init_to_null +import 'dart:ffi'; + import 'package:dart_framework/utils/slack/slack_sender.dart'; import 'package:json_annotation/json_annotation.dart'; import 'package:dart_framework/core/app_data_manager.dart'; @@ -619,6 +621,19 @@ class DataGitRev extends DataParam { Map toJson() => _$DataGitRevToJson(this); } +//GitReset +@JsonSerializable() +class DataGitReset extends DataParam { + DataGitReset(); + + late bool? force = true; + + factory DataGitReset.fromJson(Map json) => + _$DataGitResetFromJson(json); + @override + Map toJson() => _$DataGitResetToJson(this); +} + //GitHub @JsonSerializable() class DataGitHub extends DataParam { diff --git a/lib/oto/data/command_data.g.dart b/lib/oto/data/command_data.g.dart index 8be6f47..500b5c3 100644 --- a/lib/oto/data/command_data.g.dart +++ b/lib/oto/data/command_data.g.dart @@ -72,6 +72,7 @@ const _$CommandTypeEnumMap = { CommandType.GitCheckout: 'GitCheckout', CommandType.GitRev: 'GitRev', CommandType.GitCount: 'GitCount', + CommandType.GitReset: 'GitReset', CommandType.GitHub: 'GitHub', CommandType.GitHubPullRequestCreate: 'GitHubPullRequestCreate', CommandType.GitHubPullRequestList: 'GitHubPullRequestList', @@ -996,6 +997,24 @@ Map _$DataGitRevToJson(DataGitRev instance) => 'setValue': instance.setValue, }; +DataGitReset _$DataGitResetFromJson(Map json) => DataGitReset() + ..workspace = json['workspace'] as String? + ..passExitCodes = (json['passExitCodes'] as List?) + ?.map((e) => (e as num).toInt()) + .toList() + ..setResult = json['setResult'] as String? + ..setExitCode = json['setExitCode'] as String? + ..force = json['force'] as bool?; + +Map _$DataGitResetToJson(DataGitReset instance) => + { + 'workspace': instance.workspace, + 'passExitCodes': instance.passExitCodes, + 'setResult': instance.setResult, + 'setExitCode': instance.setExitCode, + 'force': instance.force, + }; + DataGitHub _$DataGitHubFromJson(Map json) => DataGitHub() ..workspace = json['workspace'] as String? ..passExitCodes = (json['passExitCodes'] as List?) From 73000ea619308a18340d82026221b71e8e010593 Mon Sep 17 00:00:00 2001 From: leedongmyung Date: Thu, 28 Nov 2024 18:59:42 +0900 Subject: [PATCH 4/7] =?UTF-8?q?=ED=8C=8C=EC=9D=BC=20ignore=20=ED=8C=A8?= =?UTF-8?q?=ED=84=B4=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .vscode/launch.json | 7 ++++++ lib/oto/commands/command.dart | 17 ++++++-------- lib/oto/commands/file/file.dart | 39 ++++++++++++++++++++++++++++++-- lib/oto/data/command_data.dart | 16 +++++++++++++ lib/oto/data/command_data.g.dart | 25 ++++++++++++++++++++ pubspec.yaml | 2 +- 6 files changed, 93 insertions(+), 13 deletions(-) diff --git a/.vscode/launch.json b/.vscode/launch.json index e1fa066..292a4c5 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -53,6 +53,13 @@ "program": "./bin/main.dart", "args": ["exe", "-f", "./assets/pipeline-test2.yaml"] }, + { + "name": "exe aos build", + "request": "launch", + "type": "dart", + "program": "./bin/main.dart", + "args": ["exe", "-f", "/Users/toki/works/lgup-mcs-aos/app/buildScript/build-lt.yaml"] + }, { "name": "exe slack", "request": "launch", diff --git a/lib/oto/commands/command.dart b/lib/oto/commands/command.dart index 51c06fa..db771f3 100644 --- a/lib/oto/commands/command.dart +++ b/lib/oto/commands/command.dart @@ -66,6 +66,7 @@ enum CommandType { FileDiffCheck, FileRead, FileWrite, + Files, DirectoryCreate, Slack, SlackBuild, @@ -124,6 +125,7 @@ abstract class Command { CommandType.FileDiffCheck: () => FileDiffCheck(), CommandType.FileRead: () => FileRead(), CommandType.FileWrite: () => FileWrite(), + CommandType.Files: () => Files(), CommandType.DirectoryCreate: () => DirectoryCreate(), CommandType.Slack: () => Slack(), CommandType.SlackBuild: () => SlackBuild(), @@ -363,7 +365,7 @@ abstract class Command { Map getParam(DataCommand command) { Map map; - if(command.param == null) { + if (command.param == null) { map = {}; } else { map = Command.replaceAllTagsMap(command.param); @@ -378,11 +380,9 @@ abstract class Command { Future executeHandle(DataCommand command, ExeHandleData handleData) async { exeHandle = handleData; - try - { + try { return await execute(command); - } - on Exception { + } on Exception { return await exeHandle!.pipelineFail!.execute(); } } @@ -434,8 +434,7 @@ abstract class Command { await setProperty(data.setResult!, resultMessage); } } - if(exeHandle == null) - { + if (exeHandle == null) { if (passExitCodesMerge.contains(exitCode)) { return simpleFuture; } else { @@ -445,9 +444,7 @@ abstract class Command { data.message = errorMessage; throw Exception(data); } - } - else - { + } else { if (passExitCodesMerge.contains(exitCode)) { return await exeHandle!.pipelineSuccess!.execute(); } else { diff --git a/lib/oto/commands/file/file.dart b/lib/oto/commands/file/file.dart index 0a7c307..ad44019 100644 --- a/lib/oto/commands/file/file.dart +++ b/lib/oto/commands/file/file.dart @@ -11,7 +11,7 @@ class FileRead extends Command { var data = DataFileRead.fromJson(getParam(command)); var file = File(data.path); var content = ''; - if(file.existsSync()) { + if (file.existsSync()) { content = file.readAsStringSync(); } else { throw Exception('File not exist - ${data.path}'); @@ -26,9 +26,44 @@ class FileWrite extends Command { Future execute(DataCommand command) async { var data = DataFileWrite.fromJson(getParam(command)); var file = File(data.path); - if(file.existsSync()) file.deleteSync(); + if (file.existsSync()) file.deleteSync(); await file.writeAsString(data.content); return complete(0, command); } } + +class Files extends Command { + @override + Future execute(DataCommand command) async { + var data = DataFiles.fromJson(getParam(command)); + var target = Directory(data.path); + var list = []; + var recursive = data.recursive ?? false; + var regExs = data.ignoreRegExs ?? []; + + if (target.existsSync()) { + var files = target.listSync(recursive: recursive); + for (var file in files) { + var path = file.path; + var matched = false; + for (var regEx in regExs) { + var pattern = RegExp(regEx); + if (pattern.hasMatch(path)) { + matched = true; + break; + } + } + if (!matched) { + if (FileSystemEntity.typeSync(path) == FileSystemEntityType.file) { + list.add(path); + print('====================$path'); + } + } + } + } + + await setProperty(data.setFiles, list); + return complete(0, command); + } +} diff --git a/lib/oto/data/command_data.dart b/lib/oto/data/command_data.dart index a49d3f0..b315b7a 100644 --- a/lib/oto/data/command_data.dart +++ b/lib/oto/data/command_data.dart @@ -434,6 +434,22 @@ class DataFileWrite extends DataParam { Map toJson() => _$DataFileWriteToJson(this); } +//Files +@JsonSerializable() +class DataFiles extends DataParam { + DataFiles(); + + late String path; + late bool? recursive = false; + late List? ignoreRegExs = []; + late String setFiles; + + factory DataFiles.fromJson(Map json) => + _$DataFilesFromJson(json); + @override + Map toJson() => _$DataFilesToJson(this); +} + //Directory Create @JsonSerializable() class DataDirectoryCreate extends DataParam { diff --git a/lib/oto/data/command_data.g.dart b/lib/oto/data/command_data.g.dart index 500b5c3..728d624 100644 --- a/lib/oto/data/command_data.g.dart +++ b/lib/oto/data/command_data.g.dart @@ -58,6 +58,7 @@ const _$CommandTypeEnumMap = { CommandType.FileDiffCheck: 'FileDiffCheck', CommandType.FileRead: 'FileRead', CommandType.FileWrite: 'FileWrite', + CommandType.Files: 'Files', CommandType.DirectoryCreate: 'DirectoryCreate', CommandType.Slack: 'Slack', CommandType.SlackBuild: 'SlackBuild', @@ -708,6 +709,30 @@ Map _$DataFileWriteToJson(DataFileWrite instance) => 'content': instance.content, }; +DataFiles _$DataFilesFromJson(Map json) => DataFiles() + ..workspace = json['workspace'] as String? + ..passExitCodes = (json['passExitCodes'] as List?) + ?.map((e) => (e as num).toInt()) + .toList() + ..setResult = json['setResult'] as String? + ..setExitCode = json['setExitCode'] as String? + ..path = json['path'] as String + ..recursive = json['recursive'] as bool? + ..ignoreRegExs = + (json['ignoreRegExs'] as List?)?.map((e) => e as String).toList() + ..setFiles = json['setFiles'] as String; + +Map _$DataFilesToJson(DataFiles instance) => { + 'workspace': instance.workspace, + 'passExitCodes': instance.passExitCodes, + 'setResult': instance.setResult, + 'setExitCode': instance.setExitCode, + 'path': instance.path, + 'recursive': instance.recursive, + 'ignoreRegExs': instance.ignoreRegExs, + 'setFiles': instance.setFiles, + }; + DataDirectoryCreate _$DataDirectoryCreateFromJson(Map json) => DataDirectoryCreate() ..workspace = json['workspace'] as String? diff --git a/pubspec.yaml b/pubspec.yaml index b8bb106..4da8a55 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -21,7 +21,7 @@ dependencies: file_hasher: ^0.1.0+0 dev_dependencies: - lints: ^4.0.0 + lints: ^5.0.0 test: ^1.24.9 build_runner: ^2.1.4 json_serializable: ^6.0.1 From 936b1dc379c4735a20b82924a8c8155529663d0b Mon Sep 17 00:00:00 2001 From: leedongmyung Date: Fri, 29 Nov 2024 15:58:14 +0900 Subject: [PATCH 5/7] =?UTF-8?q?git=20stash=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/oto/commands/command.dart | 27 +++- lib/oto/commands/file/file.dart | 5 +- lib/oto/commands/git/git.dart | 51 ++++++++ lib/oto/commands/util/string_util.dart | 4 +- lib/oto/data/command_data.dart | 29 +++++ lib/oto/data/command_data.g.dart | 164 ++++++++++++++++++++++++- 6 files changed, 269 insertions(+), 11 deletions(-) diff --git a/lib/oto/commands/command.dart b/lib/oto/commands/command.dart index db771f3..09ef54f 100644 --- a/lib/oto/commands/command.dart +++ b/lib/oto/commands/command.dart @@ -82,6 +82,8 @@ enum CommandType { GitRev, GitCount, GitReset, + GitStashPush, + GitStashApply, GitHub, GitHubPullRequestCreate, GitHubPullRequestList, @@ -141,6 +143,8 @@ abstract class Command { CommandType.GitRev: () => GitRev(), CommandType.GitCount: () => GitCount(), CommandType.GitReset: () => GitReset(), + CommandType.GitStashPush: () => GitStashPush(), + CommandType.GitStashApply: () => GitStashApply(), CommandType.GitHub: () => GitHub(), CommandType.GitHubPullRequestCreate: () => GitHubPullRequestCreate(), CommandType.GitHubPullRequestList: () => GitHubPullRequestList(), @@ -222,15 +226,28 @@ abstract class Command { return newList; } - static Future setPropertyValue(String tag, dynamic value) async { + static Future setPropertyValue(String tag, dynamic value, {bool? showPrint}) async { var match = regSetEx.firstMatch(tag); tag = match!.group(2)!; if (tag.startsWith('property')) { var key = tag.replaceFirst('property.', ''); Application.instance.property[key] = value; // await CLI.println('[Return] $key : $value', color: Color.yellowStrong); - print('[Return] $key : $value'); - } + if(showPrint ?? true) { + if(value is List) { + print('[Return] $key :\n'); + var index = 0; + var length = value.length.toString().length; + for(var item in value) { + var indexStr = index.toString().padLeft(length); + print('$indexStr - $item'); + index++; + } + } else { + print('[Return] $key : $value'); + } + } + } return simpleFuture; } @@ -359,8 +376,8 @@ abstract class Command { return Command.replaceSingleTagValue(raw); } - Future setProperty(String tag, dynamic value) async { - await Command.setPropertyValue(tag, value); + Future setProperty(String tag, dynamic value, {bool? showPrint}) async { + await Command.setPropertyValue(tag, value, showPrint: showPrint); } Map getParam(DataCommand command) { diff --git a/lib/oto/commands/file/file.dart b/lib/oto/commands/file/file.dart index ad44019..a96ba8c 100644 --- a/lib/oto/commands/file/file.dart +++ b/lib/oto/commands/file/file.dart @@ -16,7 +16,7 @@ class FileRead extends Command { } else { throw Exception('File not exist - ${data.path}'); } - setProperty(data.setContent, content); + setProperty(data.setContent, content, showPrint: data.showPrint); return complete(0, command); } } @@ -57,13 +57,12 @@ class Files extends Command { if (!matched) { if (FileSystemEntity.typeSync(path) == FileSystemEntityType.file) { list.add(path); - print('====================$path'); } } } } - await setProperty(data.setFiles, list); + await setProperty(data.setFiles, list, showPrint: data.showPrint); return complete(0, command); } } diff --git a/lib/oto/commands/git/git.dart b/lib/oto/commands/git/git.dart index 7acaac7..8ac401f 100644 --- a/lib/oto/commands/git/git.dart +++ b/lib/oto/commands/git/git.dart @@ -126,3 +126,54 @@ class GitReset extends Command { return await completeProcess(process, command); } } + +//git stash push +class GitStashPush extends Command { + @override + Future execute(DataCommand command) async { + var data = DataGitStashPush.fromJson(getParam(command)); + + var shell = StringBuffer(getCDPath(workspace)); + var includeUntracked = data.includeUntracked == null ? " -u" : (data.includeUntracked! ? " -u" : ""); + var message = data.message == null ? "" : " -m '${data.message}'"; + shell.write(' && git stash push$includeUntracked$message'); + var process = await ProcessExecutor.start(shell, printStderr: false); + + return await completeProcess(process, command); + } +} + +//git stash apply +class GitStashApply extends Command { + @override + Future execute(DataCommand command) async { + var data = DataGitStashApply.fromJson(getParam(command)); + + var shell = StringBuffer(getCDPath(workspace)); + var apply = data.delete == null ? " pop" : (data.delete! ? " pop" : " apply"); + if(data.message == null) { + shell.write(' && git stash$apply'); + } else { + shell.write(' && git stash list'); + var result = await ProcessExecutor.run(shell); + print(result.stdout); + shell = StringBuffer(getCDPath(workspace)); + if(result.exitCode == 0) { + var arr = result.stdout.toString().split('\n'); + for(var line in arr) { + var lineArr = line.split(': On '); + if(lineArr.length > 1) { + var id = lineArr[0]; + var content = lineArr[1]; + if(content.contains(data.message!)) { + shell.write(' && git stash$apply $id'); + break; + } + } + } + } + } + var process = await ProcessExecutor.start(shell, printStderr: false); + return await completeProcess(process, command); + } +} diff --git a/lib/oto/commands/util/string_util.dart b/lib/oto/commands/util/string_util.dart index a11a520..556cc4e 100644 --- a/lib/oto/commands/util/string_util.dart +++ b/lib/oto/commands/util/string_util.dart @@ -13,7 +13,7 @@ class StringSub extends Command { int startIndex = data.startIndex == null ? 0 : data.startIndex!; int lastIndex = data.lastIndex == null ? text.length - startIndex : data.lastIndex!; text = text.substring(startIndex, lastIndex); - await setProperty(data.setValue, text); + await setProperty(data.setValue, text, showPrint: data.showPrint); } on Exception { rethrow; @@ -33,7 +33,7 @@ class StringReplace extends Command { try { text = text.replaceAll(data.from, data.to); - await setProperty(data.setValue, text); + await setProperty(data.setValue, text, showPrint: data.showPrint); } on Exception { rethrow; diff --git a/lib/oto/data/command_data.dart b/lib/oto/data/command_data.dart index b315b7a..b257df8 100644 --- a/lib/oto/data/command_data.dart +++ b/lib/oto/data/command_data.dart @@ -50,6 +50,7 @@ class DataParam { late List? passExitCodes; late String? setResult; late String? setExitCode; + late bool? showPrint = true; factory DataParam.fromJson(Map json) => _$DataParamFromJson(json); @@ -650,6 +651,34 @@ class DataGitReset extends DataParam { Map toJson() => _$DataGitResetToJson(this); } +//GitStashPush +@JsonSerializable() +class DataGitStashPush extends DataParam { + DataGitStashPush(); + + late bool? includeUntracked = true; + late String? message; + + factory DataGitStashPush.fromJson(Map json) => + _$DataGitStashPushFromJson(json); + @override + Map toJson() => _$DataGitStashPushToJson(this); +} + +//GitStashApply +@JsonSerializable() +class DataGitStashApply extends DataParam { + DataGitStashApply(); + + late String? message; + late bool? delete = true; + + factory DataGitStashApply.fromJson(Map json) => + _$DataGitStashApplyFromJson(json); + @override + Map toJson() => _$DataGitStashApplyToJson(this); +} + //GitHub @JsonSerializable() class DataGitHub extends DataParam { diff --git a/lib/oto/data/command_data.g.dart b/lib/oto/data/command_data.g.dart index 728d624..10198d1 100644 --- a/lib/oto/data/command_data.g.dart +++ b/lib/oto/data/command_data.g.dart @@ -74,6 +74,8 @@ const _$CommandTypeEnumMap = { CommandType.GitRev: 'GitRev', CommandType.GitCount: 'GitCount', CommandType.GitReset: 'GitReset', + CommandType.GitStashPush: 'GitStashPush', + CommandType.GitStashApply: 'GitStashApply', CommandType.GitHub: 'GitHub', CommandType.GitHubPullRequestCreate: 'GitHubPullRequestCreate', CommandType.GitHubPullRequestList: 'GitHubPullRequestList', @@ -97,13 +99,15 @@ DataParam _$DataParamFromJson(Map json) => DataParam() ?.map((e) => (e as num).toInt()) .toList() ..setResult = json['setResult'] as String? - ..setExitCode = json['setExitCode'] as String?; + ..setExitCode = json['setExitCode'] as String? + ..showPrint = json['showPrint'] as bool?; Map _$DataParamToJson(DataParam instance) => { 'workspace': instance.workspace, 'passExitCodes': instance.passExitCodes, 'setResult': instance.setResult, 'setExitCode': instance.setExitCode, + 'showPrint': instance.showPrint, }; DataSimpleCommand _$DataSimpleCommandFromJson(Map json) => @@ -114,6 +118,7 @@ DataSimpleCommand _$DataSimpleCommandFromJson(Map json) => .toList() ..setResult = json['setResult'] as String? ..setExitCode = json['setExitCode'] as String? + ..showPrint = json['showPrint'] as bool? ..message = json['message'] as String; Map _$DataSimpleCommandToJson(DataSimpleCommand instance) => @@ -122,6 +127,7 @@ Map _$DataSimpleCommandToJson(DataSimpleCommand instance) => 'passExitCodes': instance.passExitCodes, 'setResult': instance.setResult, 'setExitCode': instance.setExitCode, + 'showPrint': instance.showPrint, 'message': instance.message, }; @@ -132,6 +138,7 @@ DataPrint _$DataPrintFromJson(Map json) => DataPrint() .toList() ..setResult = json['setResult'] as String? ..setExitCode = json['setExitCode'] as String? + ..showPrint = json['showPrint'] as bool? ..message = json['message'] as String; Map _$DataPrintToJson(DataPrint instance) => { @@ -139,6 +146,7 @@ Map _$DataPrintToJson(DataPrint instance) => { 'passExitCodes': instance.passExitCodes, 'setResult': instance.setResult, 'setExitCode': instance.setExitCode, + 'showPrint': instance.showPrint, 'message': instance.message, }; @@ -149,6 +157,7 @@ DataSetValue _$DataSetValueFromJson(Map json) => DataSetValue() .toList() ..setResult = json['setResult'] as String? ..setExitCode = json['setExitCode'] as String? + ..showPrint = json['showPrint'] as bool? ..values_int = json['values-int'] as Map? ..values_float = json['values-float'] as Map? ..values_string = json['values-string'] as Map? @@ -160,6 +169,7 @@ Map _$DataSetValueToJson(DataSetValue instance) => 'passExitCodes': instance.passExitCodes, 'setResult': instance.setResult, 'setExitCode': instance.setExitCode, + 'showPrint': instance.showPrint, 'values-int': instance.values_int, 'values-float': instance.values_float, 'values-string': instance.values_string, @@ -174,6 +184,7 @@ DataAppDataCreator _$DataAppDataCreatorFromJson(Map json) => .toList() ..setResult = json['setResult'] as String? ..setExitCode = json['setExitCode'] as String? + ..showPrint = json['showPrint'] as bool? ..scm = $enumDecode(_$SCMTypeEnumMap, json['scm']) ..relativeAssetPath = json['relativeAssetPath'] as String ..setVersion = json['setVersion'] as String @@ -188,6 +199,7 @@ Map _$DataAppDataCreatorToJson(DataAppDataCreator instance) => 'passExitCodes': instance.passExitCodes, 'setResult': instance.setResult, 'setExitCode': instance.setExitCode, + 'showPrint': instance.showPrint, 'scm': _$SCMTypeEnumMap[instance.scm]!, 'relativeAssetPath': instance.relativeAssetPath, 'setVersion': instance.setVersion, @@ -210,6 +222,7 @@ DataBuildMSBuild _$DataBuildMSBuildFromJson(Map json) => .toList() ..setResult = json['setResult'] as String? ..setExitCode = json['setExitCode'] as String? + ..showPrint = json['showPrint'] as bool? ..projectFile = json['projectFile'] as String ..type = $enumDecode(_$MSBuildTypeEnumMap, json['type']) ..config = $enumDecode(_$MSBuildConfigEnumMap, json['config']); @@ -220,6 +233,7 @@ Map _$DataBuildMSBuildToJson(DataBuildMSBuild instance) => 'passExitCodes': instance.passExitCodes, 'setResult': instance.setResult, 'setExitCode': instance.setExitCode, + 'showPrint': instance.showPrint, 'projectFile': instance.projectFile, 'type': _$MSBuildTypeEnumMap[instance.type]!, 'config': _$MSBuildConfigEnumMap[instance.config]!, @@ -244,6 +258,7 @@ DataBuildDart _$DataBuildDartFromJson(Map json) => .toList() ..setResult = json['setResult'] as String? ..setExitCode = json['setExitCode'] as String? + ..showPrint = json['showPrint'] as bool? ..executeBuildRunner = json['executeBuildRunner'] as bool?; Map _$DataBuildDartToJson(DataBuildDart instance) => @@ -252,6 +267,7 @@ Map _$DataBuildDartToJson(DataBuildDart instance) => 'passExitCodes': instance.passExitCodes, 'setResult': instance.setResult, 'setExitCode': instance.setExitCode, + 'showPrint': instance.showPrint, 'executeBuildRunner': instance.executeBuildRunner, }; @@ -263,6 +279,7 @@ DataBuildFlutter _$DataBuildFlutterFromJson(Map json) => .toList() ..setResult = json['setResult'] as String? ..setExitCode = json['setExitCode'] as String? + ..showPrint = json['showPrint'] as bool? ..executeBuildRunner = json['executeBuildRunner'] as bool? ..macPassword = json['macPassword'] as String? ..platform = json['platform'] as String @@ -274,6 +291,7 @@ Map _$DataBuildFlutterToJson(DataBuildFlutter instance) => 'passExitCodes': instance.passExitCodes, 'setResult': instance.setResult, 'setExitCode': instance.setExitCode, + 'showPrint': instance.showPrint, 'executeBuildRunner': instance.executeBuildRunner, 'macPassword': instance.macPassword, 'platform': instance.platform, @@ -289,6 +307,7 @@ DataBuildDartCompile _$DataBuildDartCompileFromJson( .toList() ..setResult = json['setResult'] as String? ..setExitCode = json['setExitCode'] as String? + ..showPrint = json['showPrint'] as bool? ..executeBuildRunner = json['executeBuildRunner'] as bool? ..targetDartFile = json['targetDartFile'] as String? ..buildFileName = json['buildFileName'] as String?; @@ -300,6 +319,7 @@ Map _$DataBuildDartCompileToJson( 'passExitCodes': instance.passExitCodes, 'setResult': instance.setResult, 'setExitCode': instance.setExitCode, + 'showPrint': instance.showPrint, 'executeBuildRunner': instance.executeBuildRunner, 'targetDartFile': instance.targetDartFile, 'buildFileName': instance.buildFileName, @@ -313,6 +333,7 @@ DataBuildDotNet _$DataBuildDotNetFromJson(Map json) => .toList() ..setResult = json['setResult'] as String? ..setExitCode = json['setExitCode'] as String? + ..showPrint = json['showPrint'] as bool? ..projectFile = json['projectFile'] as String; Map _$DataBuildDotNetToJson(DataBuildDotNet instance) => @@ -321,6 +342,7 @@ Map _$DataBuildDotNetToJson(DataBuildDotNet instance) => 'passExitCodes': instance.passExitCodes, 'setResult': instance.setResult, 'setExitCode': instance.setExitCode, + 'showPrint': instance.showPrint, 'projectFile': instance.projectFile, }; @@ -331,6 +353,7 @@ DataBuildiOS _$DataBuildiOSFromJson(Map json) => DataBuildiOS() .toList() ..setResult = json['setResult'] as String? ..setExitCode = json['setExitCode'] as String? + ..showPrint = json['showPrint'] as bool? ..scheme = json['scheme'] as String ..os = $enumDecodeNullable(_$BuildPlatformEnumMap, json['os']) ..macPassword = json['macPassword'] as String? @@ -349,6 +372,7 @@ Map _$DataBuildiOSToJson(DataBuildiOS instance) => 'passExitCodes': instance.passExitCodes, 'setResult': instance.setResult, 'setExitCode': instance.setExitCode, + 'showPrint': instance.showPrint, 'scheme': instance.scheme, 'os': _$BuildPlatformEnumMap[instance.os], 'macPassword': instance.macPassword, @@ -377,6 +401,7 @@ DataCodeSign _$DataCodeSignFromJson(Map json) => DataCodeSign() .toList() ..setResult = json['setResult'] as String? ..setExitCode = json['setExitCode'] as String? + ..showPrint = json['showPrint'] as bool? ..appPath = json['appPath'] as String ..certificationName = json['certificationName'] as String ..entitlementPath = json['entitlementPath'] as String?; @@ -387,6 +412,7 @@ Map _$DataCodeSignToJson(DataCodeSign instance) => 'passExitCodes': instance.passExitCodes, 'setResult': instance.setResult, 'setExitCode': instance.setExitCode, + 'showPrint': instance.showPrint, 'appPath': instance.appPath, 'certificationName': instance.certificationName, 'entitlementPath': instance.entitlementPath, @@ -400,6 +426,7 @@ DataCodeSignVerify _$DataCodeSignVerifyFromJson(Map json) => .toList() ..setResult = json['setResult'] as String? ..setExitCode = json['setExitCode'] as String? + ..showPrint = json['showPrint'] as bool? ..appPath = json['appPath'] as String; Map _$DataCodeSignVerifyToJson(DataCodeSignVerify instance) => @@ -408,6 +435,7 @@ Map _$DataCodeSignVerifyToJson(DataCodeSignVerify instance) => 'passExitCodes': instance.passExitCodes, 'setResult': instance.setResult, 'setExitCode': instance.setExitCode, + 'showPrint': instance.showPrint, 'appPath': instance.appPath, }; @@ -419,6 +447,7 @@ DataProductBuild _$DataProductBuildFromJson(Map json) => .toList() ..setResult = json['setResult'] as String? ..setExitCode = json['setExitCode'] as String? + ..showPrint = json['showPrint'] as bool? ..appPath = json['appPath'] as String ..identifier = json['identifier'] as String ..scripts = json['scripts'] as String? @@ -432,6 +461,7 @@ Map _$DataProductBuildToJson(DataProductBuild instance) => 'passExitCodes': instance.passExitCodes, 'setResult': instance.setResult, 'setExitCode': instance.setExitCode, + 'showPrint': instance.showPrint, 'appPath': instance.appPath, 'identifier': instance.identifier, 'scripts': instance.scripts, @@ -447,6 +477,7 @@ DataNotarize _$DataNotarizeFromJson(Map json) => DataNotarize() .toList() ..setResult = json['setResult'] as String? ..setExitCode = json['setExitCode'] as String? + ..showPrint = json['showPrint'] as bool? ..macPassword = json['macPassword'] as String ..bundleName = json['bundleName'] as String ..teamId = json['teamId'] as String @@ -460,6 +491,7 @@ Map _$DataNotarizeToJson(DataNotarize instance) => 'passExitCodes': instance.passExitCodes, 'setResult': instance.setResult, 'setExitCode': instance.setExitCode, + 'showPrint': instance.showPrint, 'macPassword': instance.macPassword, 'bundleName': instance.bundleName, 'teamId': instance.teamId, @@ -476,6 +508,7 @@ DataArchiveiOS _$DataArchiveiOSFromJson(Map json) => .toList() ..setResult = json['setResult'] as String? ..setExitCode = json['setExitCode'] as String? + ..showPrint = json['showPrint'] as bool? ..xcworkspaceFilePath = json['xcworkspaceFilePath'] as String ..scheme = json['scheme'] as String ..archivePath = json['archivePath'] as String @@ -487,6 +520,7 @@ Map _$DataArchiveiOSToJson(DataArchiveiOS instance) => 'passExitCodes': instance.passExitCodes, 'setResult': instance.setResult, 'setExitCode': instance.setExitCode, + 'showPrint': instance.showPrint, 'xcworkspaceFilePath': instance.xcworkspaceFilePath, 'scheme': instance.scheme, 'archivePath': instance.archivePath, @@ -501,6 +535,7 @@ DataExportiOS _$DataExportiOSFromJson(Map json) => .toList() ..setResult = json['setResult'] as String? ..setExitCode = json['setExitCode'] as String? + ..showPrint = json['showPrint'] as bool? ..archivePath = json['archivePath'] as String ..exportOptionPlistPath = json['exportOptionPlistPath'] as String ..exportPath = json['exportPath'] as String; @@ -511,6 +546,7 @@ Map _$DataExportiOSToJson(DataExportiOS instance) => 'passExitCodes': instance.passExitCodes, 'setResult': instance.setResult, 'setExitCode': instance.setExitCode, + 'showPrint': instance.showPrint, 'archivePath': instance.archivePath, 'exportOptionPlistPath': instance.exportOptionPlistPath, 'exportPath': instance.exportPath, @@ -524,6 +560,7 @@ DataPublishiOS _$DataPublishiOSFromJson(Map json) => .toList() ..setResult = json['setResult'] as String? ..setExitCode = json['setExitCode'] as String? + ..showPrint = json['showPrint'] as bool? ..bundleID = json['bundleID'] as String ..version = json['version'] as String ..appName = json['appName'] as String @@ -539,6 +576,7 @@ Map _$DataPublishiOSToJson(DataPublishiOS instance) => 'passExitCodes': instance.passExitCodes, 'setResult': instance.setResult, 'setExitCode': instance.setExitCode, + 'showPrint': instance.showPrint, 'bundleID': instance.bundleID, 'version': instance.version, 'appName': instance.appName, @@ -556,6 +594,7 @@ DataUploader _$DataUploaderFromJson(Map json) => DataUploader() .toList() ..setResult = json['setResult'] as String? ..setExitCode = json['setExitCode'] as String? + ..showPrint = json['showPrint'] as bool? ..sftp = json['sftp'] as bool ..port = (json['port'] as num).toInt() ..host = json['host'] as String @@ -569,6 +608,7 @@ Map _$DataUploaderToJson(DataUploader instance) => 'passExitCodes': instance.passExitCodes, 'setResult': instance.setResult, 'setExitCode': instance.setExitCode, + 'showPrint': instance.showPrint, 'sftp': instance.sftp, 'port': instance.port, 'host': instance.host, @@ -584,6 +624,7 @@ DataCopy _$DataCopyFromJson(Map json) => DataCopy() .toList() ..setResult = json['setResult'] as String? ..setExitCode = json['setExitCode'] as String? + ..showPrint = json['showPrint'] as bool? ..ignorePattern = (json['ignorePattern'] as List?) ?.map((e) => e as String) .toList() @@ -596,6 +637,7 @@ Map _$DataCopyToJson(DataCopy instance) => { 'passExitCodes': instance.passExitCodes, 'setResult': instance.setResult, 'setExitCode': instance.setExitCode, + 'showPrint': instance.showPrint, 'ignorePattern': instance.ignorePattern, 'isMove': instance.isMove, 'isOverwrite': instance.isOverwrite, @@ -609,6 +651,7 @@ DataDelete _$DataDeleteFromJson(Map json) => DataDelete() .toList() ..setResult = json['setResult'] as String? ..setExitCode = json['setExitCode'] as String? + ..showPrint = json['showPrint'] as bool? ..ignorePattern = (json['ignorePattern'] as List?) ?.map((e) => e as String) .toList() @@ -620,6 +663,7 @@ Map _$DataDeleteToJson(DataDelete instance) => 'passExitCodes': instance.passExitCodes, 'setResult': instance.setResult, 'setExitCode': instance.setExitCode, + 'showPrint': instance.showPrint, 'ignorePattern': instance.ignorePattern, 'list': instance.list, }; @@ -631,6 +675,7 @@ DataRename _$DataRenameFromJson(Map json) => DataRename() .toList() ..setResult = json['setResult'] as String? ..setExitCode = json['setExitCode'] as String? + ..showPrint = json['showPrint'] as bool? ..ignorePattern = (json['ignorePattern'] as List?) ?.map((e) => e as String) .toList() @@ -642,6 +687,7 @@ Map _$DataRenameToJson(DataRename instance) => 'passExitCodes': instance.passExitCodes, 'setResult': instance.setResult, 'setExitCode': instance.setExitCode, + 'showPrint': instance.showPrint, 'ignorePattern': instance.ignorePattern, 'renameMap': instance.renameMap, }; @@ -654,6 +700,7 @@ DataFileDiffCheck _$DataFileDiffCheckFromJson(Map json) => .toList() ..setResult = json['setResult'] as String? ..setExitCode = json['setExitCode'] as String? + ..showPrint = json['showPrint'] as bool? ..paths = (json['paths'] as List).map((e) => e as String).toList() ..setDiff = json['setDiff'] as String; @@ -664,6 +711,7 @@ Map _$DataFileDiffCheckToJson(DataFileDiffCheck instance) => 'passExitCodes': instance.passExitCodes, 'setResult': instance.setResult, 'setExitCode': instance.setExitCode, + 'showPrint': instance.showPrint, 'paths': instance.paths, 'setDiff': instance.setDiff, }; @@ -675,6 +723,7 @@ DataFileRead _$DataFileReadFromJson(Map json) => DataFileRead() .toList() ..setResult = json['setResult'] as String? ..setExitCode = json['setExitCode'] as String? + ..showPrint = json['showPrint'] as bool? ..path = json['path'] as String ..setContent = json['setContent'] as String; @@ -684,6 +733,7 @@ Map _$DataFileReadToJson(DataFileRead instance) => 'passExitCodes': instance.passExitCodes, 'setResult': instance.setResult, 'setExitCode': instance.setExitCode, + 'showPrint': instance.showPrint, 'path': instance.path, 'setContent': instance.setContent, }; @@ -696,6 +746,7 @@ DataFileWrite _$DataFileWriteFromJson(Map json) => .toList() ..setResult = json['setResult'] as String? ..setExitCode = json['setExitCode'] as String? + ..showPrint = json['showPrint'] as bool? ..path = json['path'] as String ..content = json['content'] as String; @@ -705,6 +756,7 @@ Map _$DataFileWriteToJson(DataFileWrite instance) => 'passExitCodes': instance.passExitCodes, 'setResult': instance.setResult, 'setExitCode': instance.setExitCode, + 'showPrint': instance.showPrint, 'path': instance.path, 'content': instance.content, }; @@ -716,6 +768,7 @@ DataFiles _$DataFilesFromJson(Map json) => DataFiles() .toList() ..setResult = json['setResult'] as String? ..setExitCode = json['setExitCode'] as String? + ..showPrint = json['showPrint'] as bool? ..path = json['path'] as String ..recursive = json['recursive'] as bool? ..ignoreRegExs = @@ -727,6 +780,7 @@ Map _$DataFilesToJson(DataFiles instance) => { 'passExitCodes': instance.passExitCodes, 'setResult': instance.setResult, 'setExitCode': instance.setExitCode, + 'showPrint': instance.showPrint, 'path': instance.path, 'recursive': instance.recursive, 'ignoreRegExs': instance.ignoreRegExs, @@ -741,6 +795,7 @@ DataDirectoryCreate _$DataDirectoryCreateFromJson(Map json) => .toList() ..setResult = json['setResult'] as String? ..setExitCode = json['setExitCode'] as String? + ..showPrint = json['showPrint'] as bool? ..path = json['path'] as String; Map _$DataDirectoryCreateToJson( @@ -750,6 +805,7 @@ Map _$DataDirectoryCreateToJson( 'passExitCodes': instance.passExitCodes, 'setResult': instance.setResult, 'setExitCode': instance.setExitCode, + 'showPrint': instance.showPrint, 'path': instance.path, }; @@ -761,6 +817,7 @@ DataSlackSender _$DataSlackSenderFromJson(Map json) => .toList() ..setResult = json['setResult'] as String? ..setExitCode = json['setExitCode'] as String? + ..showPrint = json['showPrint'] as bool? ..token = json['token'] as String ..property = json['property'] ..message = json['message'] as Map?; @@ -771,6 +828,7 @@ Map _$DataSlackSenderToJson(DataSlackSender instance) => 'passExitCodes': instance.passExitCodes, 'setResult': instance.setResult, 'setExitCode': instance.setExitCode, + 'showPrint': instance.showPrint, 'token': instance.token, 'property': instance.property, 'message': instance.message, @@ -784,6 +842,7 @@ DataSlackBuild _$DataSlackBuildFromJson(Map json) => .toList() ..setResult = json['setResult'] as String? ..setExitCode = json['setExitCode'] as String? + ..showPrint = json['showPrint'] as bool? ..token = json['token'] as String ..property = json['property'] ..message = json['message'] as Map? @@ -799,6 +858,7 @@ Map _$DataSlackBuildToJson(DataSlackBuild instance) => 'passExitCodes': instance.passExitCodes, 'setResult': instance.setResult, 'setExitCode': instance.setExitCode, + 'showPrint': instance.showPrint, 'token': instance.token, 'property': instance.property, 'message': instance.message, @@ -824,6 +884,7 @@ DataJira _$DataJiraFromJson(Map json) => DataJira() .toList() ..setResult = json['setResult'] as String? ..setExitCode = json['setExitCode'] as String? + ..showPrint = json['showPrint'] as bool? ..id = json['id'] as String ..token = json['token'] as String ..domain = json['domain'] as String @@ -840,6 +901,7 @@ Map _$DataJiraToJson(DataJira instance) => { 'passExitCodes': instance.passExitCodes, 'setResult': instance.setResult, 'setExitCode': instance.setExitCode, + 'showPrint': instance.showPrint, 'id': instance.id, 'token': instance.token, 'domain': instance.domain, @@ -857,6 +919,7 @@ DataJiraUser _$DataJiraUserFromJson(Map json) => DataJiraUser() .toList() ..setResult = json['setResult'] as String? ..setExitCode = json['setExitCode'] as String? + ..showPrint = json['showPrint'] as bool? ..mail = json['mail'] as String? ..slackID = json['slackID'] as String?; @@ -866,6 +929,7 @@ Map _$DataJiraUserToJson(DataJiraUser instance) => 'passExitCodes': instance.passExitCodes, 'setResult': instance.setResult, 'setExitCode': instance.setExitCode, + 'showPrint': instance.showPrint, 'mail': instance.mail, 'slackID': instance.slackID, }; @@ -877,6 +941,7 @@ DataZip _$DataZipFromJson(Map json) => DataZip() .toList() ..setResult = json['setResult'] as String? ..setExitCode = json['setExitCode'] as String? + ..showPrint = json['showPrint'] as bool? ..zipFile = json['zipFile'] as String ..zipList = (json['zipList'] as List).map((e) => e as String).toList(); @@ -886,6 +951,7 @@ Map _$DataZipToJson(DataZip instance) => { 'passExitCodes': instance.passExitCodes, 'setResult': instance.setResult, 'setExitCode': instance.setExitCode, + 'showPrint': instance.showPrint, 'zipFile': instance.zipFile, 'zipList': instance.zipList, }; @@ -897,6 +963,7 @@ DataShell _$DataShellFromJson(Map json) => DataShell() .toList() ..setResult = json['setResult'] as String? ..setExitCode = json['setExitCode'] as String? + ..showPrint = json['showPrint'] as bool? ..commands = (json['commands'] as List).map((e) => e as String).toList(); @@ -905,6 +972,7 @@ Map _$DataShellToJson(DataShell instance) => { 'passExitCodes': instance.passExitCodes, 'setResult': instance.setResult, 'setExitCode': instance.setExitCode, + 'showPrint': instance.showPrint, 'commands': instance.commands, }; @@ -916,6 +984,7 @@ DataShellFile _$DataShellFileFromJson(Map json) => .toList() ..setResult = json['setResult'] as String? ..setExitCode = json['setExitCode'] as String? + ..showPrint = json['showPrint'] as bool? ..path = json['path'] as String; Map _$DataShellFileToJson(DataShellFile instance) => @@ -924,6 +993,7 @@ Map _$DataShellFileToJson(DataShellFile instance) => 'passExitCodes': instance.passExitCodes, 'setResult': instance.setResult, 'setExitCode': instance.setExitCode, + 'showPrint': instance.showPrint, 'path': instance.path, }; @@ -934,6 +1004,7 @@ DataGit _$DataGitFromJson(Map json) => DataGit() .toList() ..setResult = json['setResult'] as String? ..setExitCode = json['setExitCode'] as String? + ..showPrint = json['showPrint'] as bool? ..commands = (json['commands'] as List).map((e) => e as String).toList(); @@ -942,6 +1013,7 @@ Map _$DataGitToJson(DataGit instance) => { 'passExitCodes': instance.passExitCodes, 'setResult': instance.setResult, 'setExitCode': instance.setExitCode, + 'showPrint': instance.showPrint, 'commands': instance.commands, }; @@ -952,6 +1024,7 @@ DataGitPush _$DataGitPushFromJson(Map json) => DataGitPush() .toList() ..setResult = json['setResult'] as String? ..setExitCode = json['setExitCode'] as String? + ..showPrint = json['showPrint'] as bool? ..branch = json['branch'] as String?; Map _$DataGitPushToJson(DataGitPush instance) => @@ -960,6 +1033,7 @@ Map _$DataGitPushToJson(DataGitPush instance) => 'passExitCodes': instance.passExitCodes, 'setResult': instance.setResult, 'setExitCode': instance.setExitCode, + 'showPrint': instance.showPrint, 'branch': instance.branch, }; @@ -971,6 +1045,7 @@ DataGitCheckout _$DataGitCheckoutFromJson(Map json) => .toList() ..setResult = json['setResult'] as String? ..setExitCode = json['setExitCode'] as String? + ..showPrint = json['showPrint'] as bool? ..branch = json['branch'] as String ..executePull = json['executePull'] as bool?; @@ -980,6 +1055,7 @@ Map _$DataGitCheckoutToJson(DataGitCheckout instance) => 'passExitCodes': instance.passExitCodes, 'setResult': instance.setResult, 'setExitCode': instance.setExitCode, + 'showPrint': instance.showPrint, 'branch': instance.branch, 'executePull': instance.executePull, }; @@ -991,6 +1067,7 @@ DataGitCount _$DataGitCountFromJson(Map json) => DataGitCount() .toList() ..setResult = json['setResult'] as String? ..setExitCode = json['setExitCode'] as String? + ..showPrint = json['showPrint'] as bool? ..setValue = json['setValue'] as String; Map _$DataGitCountToJson(DataGitCount instance) => @@ -999,6 +1076,7 @@ Map _$DataGitCountToJson(DataGitCount instance) => 'passExitCodes': instance.passExitCodes, 'setResult': instance.setResult, 'setExitCode': instance.setExitCode, + 'showPrint': instance.showPrint, 'setValue': instance.setValue, }; @@ -1009,6 +1087,7 @@ DataGitRev _$DataGitRevFromJson(Map json) => DataGitRev() .toList() ..setResult = json['setResult'] as String? ..setExitCode = json['setExitCode'] as String? + ..showPrint = json['showPrint'] as bool? ..branch = json['branch'] as String? ..setValue = json['setValue'] as String; @@ -1018,6 +1097,7 @@ Map _$DataGitRevToJson(DataGitRev instance) => 'passExitCodes': instance.passExitCodes, 'setResult': instance.setResult, 'setExitCode': instance.setExitCode, + 'showPrint': instance.showPrint, 'branch': instance.branch, 'setValue': instance.setValue, }; @@ -1029,6 +1109,7 @@ DataGitReset _$DataGitResetFromJson(Map json) => DataGitReset() .toList() ..setResult = json['setResult'] as String? ..setExitCode = json['setExitCode'] as String? + ..showPrint = json['showPrint'] as bool? ..force = json['force'] as bool?; Map _$DataGitResetToJson(DataGitReset instance) => @@ -1037,9 +1118,56 @@ Map _$DataGitResetToJson(DataGitReset instance) => 'passExitCodes': instance.passExitCodes, 'setResult': instance.setResult, 'setExitCode': instance.setExitCode, + 'showPrint': instance.showPrint, 'force': instance.force, }; +DataGitStashPush _$DataGitStashPushFromJson(Map json) => + DataGitStashPush() + ..workspace = json['workspace'] as String? + ..passExitCodes = (json['passExitCodes'] as List?) + ?.map((e) => (e as num).toInt()) + .toList() + ..setResult = json['setResult'] as String? + ..setExitCode = json['setExitCode'] as String? + ..showPrint = json['showPrint'] as bool? + ..includeUntracked = json['includeUntracked'] as bool? + ..message = json['message'] as String?; + +Map _$DataGitStashPushToJson(DataGitStashPush instance) => + { + 'workspace': instance.workspace, + 'passExitCodes': instance.passExitCodes, + 'setResult': instance.setResult, + 'setExitCode': instance.setExitCode, + 'showPrint': instance.showPrint, + 'includeUntracked': instance.includeUntracked, + 'message': instance.message, + }; + +DataGitStashApply _$DataGitStashApplyFromJson(Map json) => + DataGitStashApply() + ..workspace = json['workspace'] as String? + ..passExitCodes = (json['passExitCodes'] as List?) + ?.map((e) => (e as num).toInt()) + .toList() + ..setResult = json['setResult'] as String? + ..setExitCode = json['setExitCode'] as String? + ..showPrint = json['showPrint'] as bool? + ..message = json['message'] as String? + ..delete = json['delete'] as bool?; + +Map _$DataGitStashApplyToJson(DataGitStashApply instance) => + { + 'workspace': instance.workspace, + 'passExitCodes': instance.passExitCodes, + 'setResult': instance.setResult, + 'setExitCode': instance.setExitCode, + 'showPrint': instance.showPrint, + 'message': instance.message, + 'delete': instance.delete, + }; + DataGitHub _$DataGitHubFromJson(Map json) => DataGitHub() ..workspace = json['workspace'] as String? ..passExitCodes = (json['passExitCodes'] as List?) @@ -1047,6 +1175,7 @@ DataGitHub _$DataGitHubFromJson(Map json) => DataGitHub() .toList() ..setResult = json['setResult'] as String? ..setExitCode = json['setExitCode'] as String? + ..showPrint = json['showPrint'] as bool? ..commands = (json['commands'] as List).map((e) => e as String).toList(); @@ -1056,6 +1185,7 @@ Map _$DataGitHubToJson(DataGitHub instance) => 'passExitCodes': instance.passExitCodes, 'setResult': instance.setResult, 'setExitCode': instance.setExitCode, + 'showPrint': instance.showPrint, 'commands': instance.commands, }; @@ -1068,6 +1198,7 @@ DataGitHubPullRequestCreate _$DataGitHubPullRequestCreateFromJson( .toList() ..setResult = json['setResult'] as String? ..setExitCode = json['setExitCode'] as String? + ..showPrint = json['showPrint'] as bool? ..title = json['title'] as String ..body = json['body'] as String ..branch = json['branch'] as String @@ -1081,6 +1212,7 @@ Map _$DataGitHubPullRequestCreateToJson( 'passExitCodes': instance.passExitCodes, 'setResult': instance.setResult, 'setExitCode': instance.setExitCode, + 'showPrint': instance.showPrint, 'title': instance.title, 'body': instance.body, 'branch': instance.branch, @@ -1097,6 +1229,7 @@ DataGitHubPullRequestList _$DataGitHubPullRequestListFromJson( .toList() ..setResult = json['setResult'] as String? ..setExitCode = json['setExitCode'] as String? + ..showPrint = json['showPrint'] as bool? ..keys = (json['keys'] as List).map((e) => e as String).toList() ..targetKey = json['targetKey'] as String ..targetValue = json['targetValue'] as String @@ -1109,6 +1242,7 @@ Map _$DataGitHubPullRequestListToJson( 'passExitCodes': instance.passExitCodes, 'setResult': instance.setResult, 'setExitCode': instance.setExitCode, + 'showPrint': instance.showPrint, 'keys': instance.keys, 'targetKey': instance.targetKey, 'targetValue': instance.targetValue, @@ -1124,6 +1258,7 @@ DataGitHubPullRequestClose _$DataGitHubPullRequestCloseFromJson( .toList() ..setResult = json['setResult'] as String? ..setExitCode = json['setExitCode'] as String? + ..showPrint = json['showPrint'] as bool? ..number = json['number'] as String; Map _$DataGitHubPullRequestCloseToJson( @@ -1133,6 +1268,7 @@ Map _$DataGitHubPullRequestCloseToJson( 'passExitCodes': instance.passExitCodes, 'setResult': instance.setResult, 'setExitCode': instance.setExitCode, + 'showPrint': instance.showPrint, 'number': instance.number, }; @@ -1143,6 +1279,7 @@ DataProtobuf _$DataProtobufFromJson(Map json) => DataProtobuf() .toList() ..setResult = json['setResult'] as String? ..setExitCode = json['setExitCode'] as String? + ..showPrint = json['showPrint'] as bool? ..commands = (json['commands'] as List).map((e) => e as String).toList(); @@ -1152,6 +1289,7 @@ Map _$DataProtobufToJson(DataProtobuf instance) => 'passExitCodes': instance.passExitCodes, 'setResult': instance.setResult, 'setExitCode': instance.setExitCode, + 'showPrint': instance.showPrint, 'commands': instance.commands, }; @@ -1163,6 +1301,7 @@ DataJsonReader _$DataJsonReaderFromJson(Map json) => .toList() ..setResult = json['setResult'] as String? ..setExitCode = json['setExitCode'] as String? + ..showPrint = json['showPrint'] as bool? ..json = json['json'] ..pair = (json['pair'] as List) .map((e) => DataPair.fromJson(e as Map)) @@ -1174,6 +1313,7 @@ Map _$DataJsonReaderToJson(DataJsonReader instance) => 'passExitCodes': instance.passExitCodes, 'setResult': instance.setResult, 'setExitCode': instance.setExitCode, + 'showPrint': instance.showPrint, 'json': instance.json, 'pair': instance.pair, }; @@ -1186,6 +1326,7 @@ DataJsonReaderFile _$DataJsonReaderFileFromJson(Map json) => .toList() ..setResult = json['setResult'] as String? ..setExitCode = json['setExitCode'] as String? + ..showPrint = json['showPrint'] as bool? ..path = json['path'] as String ..pair = (json['pair'] as List) .map((e) => DataPair.fromJson(e as Map)) @@ -1197,6 +1338,7 @@ Map _$DataJsonReaderFileToJson(DataJsonReaderFile instance) => 'passExitCodes': instance.passExitCodes, 'setResult': instance.setResult, 'setExitCode': instance.setExitCode, + 'showPrint': instance.showPrint, 'path': instance.path, 'pair': instance.pair, }; @@ -1228,6 +1370,7 @@ DataAwsCli _$DataAwsCliFromJson(Map json) => DataAwsCli() .toList() ..setResult = json['setResult'] as String? ..setExitCode = json['setExitCode'] as String? + ..showPrint = json['showPrint'] as bool? ..subCommand = json['sub-command'] as String ..args = (json['args'] as List).map((e) => e as String).toList(); @@ -1237,6 +1380,7 @@ Map _$DataAwsCliToJson(DataAwsCli instance) => 'passExitCodes': instance.passExitCodes, 'setResult': instance.setResult, 'setExitCode': instance.setExitCode, + 'showPrint': instance.showPrint, 'sub-command': instance.subCommand, 'args': instance.args, }; @@ -1248,6 +1392,7 @@ DataDocker _$DataDockerFromJson(Map json) => DataDocker() .toList() ..setResult = json['setResult'] as String? ..setExitCode = json['setExitCode'] as String? + ..showPrint = json['showPrint'] as bool? ..command = json['command'] as String ..args = (json['args'] as List).map((e) => e as String).toList(); @@ -1257,6 +1402,7 @@ Map _$DataDockerToJson(DataDocker instance) => 'passExitCodes': instance.passExitCodes, 'setResult': instance.setResult, 'setExitCode': instance.setExitCode, + 'showPrint': instance.showPrint, 'command': instance.command, 'args': instance.args, }; @@ -1268,6 +1414,7 @@ DataGradle _$DataGradleFromJson(Map json) => DataGradle() .toList() ..setResult = json['setResult'] as String? ..setExitCode = json['setExitCode'] as String? + ..showPrint = json['showPrint'] as bool? ..args = (json['args'] as List).map((e) => e as String).toList(); Map _$DataGradleToJson(DataGradle instance) => @@ -1276,6 +1423,7 @@ Map _$DataGradleToJson(DataGradle instance) => 'passExitCodes': instance.passExitCodes, 'setResult': instance.setResult, 'setExitCode': instance.setExitCode, + 'showPrint': instance.showPrint, 'args': instance.args, }; @@ -1287,6 +1435,7 @@ DataStringSub _$DataStringSubFromJson(Map json) => .toList() ..setResult = json['setResult'] as String? ..setExitCode = json['setExitCode'] as String? + ..showPrint = json['showPrint'] as bool? ..startIndex = (json['startIndex'] as num?)?.toInt() ..lastIndex = (json['lastIndex'] as num?)?.toInt() ..text = json['text'] as String @@ -1298,6 +1447,7 @@ Map _$DataStringSubToJson(DataStringSub instance) => 'passExitCodes': instance.passExitCodes, 'setResult': instance.setResult, 'setExitCode': instance.setExitCode, + 'showPrint': instance.showPrint, 'startIndex': instance.startIndex, 'lastIndex': instance.lastIndex, 'text': instance.text, @@ -1312,6 +1462,7 @@ DataStringReplace _$DataStringReplaceFromJson(Map json) => .toList() ..setResult = json['setResult'] as String? ..setExitCode = json['setExitCode'] as String? + ..showPrint = json['showPrint'] as bool? ..text = json['text'] as String ..setValue = json['setValue'] as String ..from = json['from'] as String @@ -1323,6 +1474,7 @@ Map _$DataStringReplaceToJson(DataStringReplace instance) => 'passExitCodes': instance.passExitCodes, 'setResult': instance.setResult, 'setExitCode': instance.setExitCode, + 'showPrint': instance.showPrint, 'text': instance.text, 'setValue': instance.setValue, 'from': instance.from, @@ -1336,6 +1488,7 @@ DataWebBase _$DataWebBaseFromJson(Map json) => DataWebBase() .toList() ..setResult = json['setResult'] as String? ..setExitCode = json['setExitCode'] as String? + ..showPrint = json['showPrint'] as bool? ..url = json['url'] as String ..method = json['method'] as String? ..headers = (json['headers'] as Map?)?.map( @@ -1353,6 +1506,7 @@ Map _$DataWebBaseToJson(DataWebBase instance) => 'passExitCodes': instance.passExitCodes, 'setResult': instance.setResult, 'setExitCode': instance.setExitCode, + 'showPrint': instance.showPrint, 'url': instance.url, 'method': instance.method, 'headers': instance.headers, @@ -1368,6 +1522,7 @@ DataWebFile _$DataWebFileFromJson(Map json) => DataWebFile() .toList() ..setResult = json['setResult'] as String? ..setExitCode = json['setExitCode'] as String? + ..showPrint = json['showPrint'] as bool? ..url = json['url'] as String ..method = json['method'] as String? ..headers = (json['headers'] as Map?)?.map( @@ -1388,6 +1543,7 @@ Map _$DataWebFileToJson(DataWebFile instance) => 'passExitCodes': instance.passExitCodes, 'setResult': instance.setResult, 'setExitCode': instance.setExitCode, + 'showPrint': instance.showPrint, 'url': instance.url, 'method': instance.method, 'headers': instance.headers, @@ -1407,6 +1563,7 @@ DataProcessPortUse _$DataProcessPortUseFromJson(Map json) => .toList() ..setResult = json['setResult'] as String? ..setExitCode = json['setExitCode'] as String? + ..showPrint = json['showPrint'] as bool? ..port = json['port'] as String ..setPid = json['setPid'] as String; @@ -1416,6 +1573,7 @@ Map _$DataProcessPortUseToJson(DataProcessPortUse instance) => 'passExitCodes': instance.passExitCodes, 'setResult': instance.setResult, 'setExitCode': instance.setExitCode, + 'showPrint': instance.showPrint, 'port': instance.port, 'setPid': instance.setPid, }; @@ -1428,6 +1586,7 @@ DataProcessRun _$DataProcessRunFromJson(Map json) => .toList() ..setResult = json['setResult'] as String? ..setExitCode = json['setExitCode'] as String? + ..showPrint = json['showPrint'] as bool? ..executable = json['executable'] as String ..param = json['param'] as String?; @@ -1437,6 +1596,7 @@ Map _$DataProcessRunToJson(DataProcessRun instance) => 'passExitCodes': instance.passExitCodes, 'setResult': instance.setResult, 'setExitCode': instance.setExitCode, + 'showPrint': instance.showPrint, 'executable': instance.executable, 'param': instance.param, }; @@ -1449,6 +1609,7 @@ DataProcessKill _$DataProcessKillFromJson(Map json) => .toList() ..setResult = json['setResult'] as String? ..setExitCode = json['setExitCode'] as String? + ..showPrint = json['showPrint'] as bool? ..pid = json['pid'] as String; Map _$DataProcessKillToJson(DataProcessKill instance) => @@ -1457,5 +1618,6 @@ Map _$DataProcessKillToJson(DataProcessKill instance) => 'passExitCodes': instance.passExitCodes, 'setResult': instance.setResult, 'setExitCode': instance.setExitCode, + 'showPrint': instance.showPrint, 'pid': instance.pid, }; From d232c4e23ac9862d6c85222f599ac84e2448c9ed Mon Sep 17 00:00:00 2001 From: leedongmyung Date: Fri, 29 Nov 2024 20:59:15 +0900 Subject: [PATCH 6/7] =?UTF-8?q?git=20stash=20pop=20=EC=88=98=ED=96=89?= =?UTF-8?q?=EC=8B=9C=20=ED=95=A0=20=EB=82=B4=EC=9A=A9=20=EC=97=86=EC=9D=84?= =?UTF-8?q?=EB=95=8C=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/oto/commands/git/git.dart | 61 +++++++++++++++++++---------------- 1 file changed, 34 insertions(+), 27 deletions(-) diff --git a/lib/oto/commands/git/git.dart b/lib/oto/commands/git/git.dart index 8ac401f..8c2d3a3 100644 --- a/lib/oto/commands/git/git.dart +++ b/lib/oto/commands/git/git.dart @@ -24,19 +24,17 @@ class GitPush extends Command { @override Future execute(DataCommand command) async { var data = DataGitPush.fromJson(getParam(command)); - + var shell = StringBuffer(getCDPath(workspace)); - if(data.branch == null) - { + if (data.branch == null) { shell.write(' && git push'); - } - else - { + } else { shell.write(' && git push origin ${data.branch!}'); } var process = await ProcessExecutor.start(shell); - return await completeProcess(process, command, passExitCodes: [1 /*Everything up-to-date*/]); + return await completeProcess(process, command, + passExitCodes: [1 /*Everything up-to-date*/]); } } @@ -53,26 +51,23 @@ class GitCheckout extends Git { var process = await ProcessExecutor.start(shell); var exitCode = await process.process.exitCode; - var ignores = [128/*Already exists*/]; - if(ignores.contains(exitCode)) - { + var ignores = [128 /*Already exists*/]; + if (ignores.contains(exitCode)) { exitCode = 0; } - if(exitCode == 0) - { + if (exitCode == 0) { shell = StringBuffer(getCDPath(workspace)); shell.write(' && git checkout $branch'); - - if(data.executePull == null ? true : data.executePull!) - { + + if (data.executePull == null ? true : data.executePull!) { shell.write(' && git pull origin $branch'); } process = await ProcessExecutor.start(shell); exitCode = await process.process.exitCode; } - + return await completeProcess(process, command); } } @@ -122,7 +117,7 @@ class GitReset extends Command { shell.write(' && git reset --hard'); shell.write(' && git clean -${force}d'); var process = await ProcessExecutor.start(shell, printStderr: false); - + return await completeProcess(process, command); } } @@ -134,11 +129,13 @@ class GitStashPush extends Command { var data = DataGitStashPush.fromJson(getParam(command)); var shell = StringBuffer(getCDPath(workspace)); - var includeUntracked = data.includeUntracked == null ? " -u" : (data.includeUntracked! ? " -u" : ""); + var includeUntracked = data.includeUntracked == null + ? " -u" + : (data.includeUntracked! ? " -u" : ""); var message = data.message == null ? "" : " -m '${data.message}'"; shell.write(' && git stash push$includeUntracked$message'); var process = await ProcessExecutor.start(shell, printStderr: false); - + return await completeProcess(process, command); } } @@ -149,31 +146,41 @@ class GitStashApply extends Command { Future execute(DataCommand command) async { var data = DataGitStashApply.fromJson(getParam(command)); + ProcessData process; var shell = StringBuffer(getCDPath(workspace)); - var apply = data.delete == null ? " pop" : (data.delete! ? " pop" : " apply"); - if(data.message == null) { + var apply = + data.delete == null ? " pop" : (data.delete! ? " pop" : " apply"); + if (data.message == null) { shell.write(' && git stash$apply'); + process = await ProcessExecutor.start(shell, printStderr: false); } else { shell.write(' && git stash list'); var result = await ProcessExecutor.run(shell); + var exist = false; print(result.stdout); shell = StringBuffer(getCDPath(workspace)); - if(result.exitCode == 0) { + if (result.exitCode == 0) { var arr = result.stdout.toString().split('\n'); - for(var line in arr) { + for (var line in arr) { var lineArr = line.split(': On '); - if(lineArr.length > 1) { + if (lineArr.length > 1) { var id = lineArr[0]; var content = lineArr[1]; - if(content.contains(data.message!)) { + if (content.contains(data.message!)) { shell.write(' && git stash$apply $id'); + exist = true; break; } } } } + + if (exist) { + process = await ProcessExecutor.start(shell, printStderr: false); + } else { + return await complete(0, command); + } } - var process = await ProcessExecutor.start(shell, printStderr: false); - return await completeProcess(process, command); + return await completeProcess(process, command, passExitCodes: [1]); } } From 8f51c57df2fca0b13e139736baa9970b5320ea8b Mon Sep 17 00:00:00 2001 From: leedongmyung Date: Fri, 29 Nov 2024 22:29:06 +0900 Subject: [PATCH 7/7] =?UTF-8?q?git=20stash=20success=20=ED=8C=90=EB=B3=84?= =?UTF-8?q?=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/oto/commands/file/file_diff_check.dart | 72 ++++++++-------------- lib/oto/commands/git/git.dart | 9 ++- lib/oto/data/command_data.dart | 1 + lib/oto/data/command_data.g.dart | 4 +- 4 files changed, 35 insertions(+), 51 deletions(-) diff --git a/lib/oto/commands/file/file_diff_check.dart b/lib/oto/commands/file/file_diff_check.dart index 92a3f62..13216fe 100644 --- a/lib/oto/commands/file/file_diff_check.dart +++ b/lib/oto/commands/file/file_diff_check.dart @@ -22,55 +22,42 @@ class FileDiffCheck extends Command { var fileName = getUniqueFileName(data.paths.join(';')); var tempDir = Directory.systemTemp; - var cacheFolder = Directory('${tempDir.path}/oto/${getUniqueFileName(currentDir.path)}'); - if(!cacheFolder.existsSync()) - { + var cacheFolder = + Directory('${tempDir.path}/oto/${getUniqueFileName(currentDir.path)}'); + if (!cacheFolder.existsSync()) { cacheFolder.createSync(recursive: true); } var cacheFile = File('${cacheFolder.path}/$fileName'); var paths = data.paths; print('Cache Path: ${cacheFile.path}, Exist: ${cacheFile.existsSync()}'); - if(paths.isEmpty) - { + if (paths.isEmpty) { throw Exception('The paths is Empty.'); - } - else - { - if(cacheFile.existsSync()) - { - var cachedMap = jsonDecode(cacheFile.readAsStringSync()) as Map; + } else { + if (cacheFile.existsSync()) { + var cachedMap = + jsonDecode(cacheFile.readAsStringSync()) as Map; var filesHashMap = await getFilesHashMap(paths); - if(cachedMap.length == filesHashMap.length) - { - for(var pair in filesHashMap.entries) - { - if(cachedMap.containsKey(pair.key)) - { + if (cachedMap.length == filesHashMap.length) { + for (var pair in filesHashMap.entries) { + if (cachedMap.containsKey(pair.key)) { var cachedHash = cachedMap[pair.key]; - if(cachedHash != pair.value) - { + if (cachedHash != pair.value) { await saveDiffData(cacheFile, paths); diff = true; break; } - } - else - { + } else { await saveDiffData(cacheFile, paths); diff = true; break; } } - } - else - { + } else { await saveDiffData(cacheFile, paths); diff = true; } - } - else - { + } else { await saveDiffData(cacheFile, paths); diff = true; } @@ -80,41 +67,33 @@ class FileDiffCheck extends Command { return await complete(exitCode, command); } - Future saveDiffData(File cacheFile, List paths) async - { + Future saveDiffData(File cacheFile, List paths) async { var cachedMap = await getFilesHashMap(paths); var jsonString = jsonEncode(cachedMap); await cacheFile.writeAsString(jsonString); return simpleFuture; } - String getUniqueFileName(String seed) - { + String getUniqueFileName(String seed) { var fileName = generateMd5(seed); - if(fileName.length > 150) - { + if (fileName.length > 150) { fileName = fileName.substring(0, 150); } return fileName; } - Future> getFilesHashMap(List paths) async - { + Future> getFilesHashMap(List paths) async { var c = Completer>(); var cachedMap = {}; - for(var path in paths) - { + for (var path in paths) { var file = File(path); var type = file.statSync().type; - switch(type) - { + switch (type) { case FileSystemEntityType.directory: var dir = Directory(path); var files = dir.listSync(); - for(var child in files) - { - if(child is File) - { + for (var child in files) { + if (child is File) { await setCachedMapHash(cachedMap, File(child.path)); } } @@ -130,8 +109,7 @@ class FileDiffCheck extends Command { return c.future; } - Future setCachedMapHash(Map cachedMap, File file) async - { + Future setCachedMapHash(Map cachedMap, File file) async { cachedMap[file.path] = await FileHasher.hash(file); return simpleFuture; } @@ -143,4 +121,4 @@ class FileDiffCheck extends Command { var digest = md5.convert(content); return hex.encode(digest.bytes); } -} \ No newline at end of file +} diff --git a/lib/oto/commands/git/git.dart b/lib/oto/commands/git/git.dart index 8c2d3a3..c7ef572 100644 --- a/lib/oto/commands/git/git.dart +++ b/lib/oto/commands/git/git.dart @@ -134,9 +134,12 @@ class GitStashPush extends Command { : (data.includeUntracked! ? " -u" : ""); var message = data.message == null ? "" : " -m '${data.message}'"; shell.write(' && git stash push$includeUntracked$message'); - var process = await ProcessExecutor.start(shell, printStderr: false); - - return await completeProcess(process, command); + var process = await ProcessExecutor.run(shell); + if (data.setSuccess != null) { + setProperty( + data.setSuccess!, process.stdout.toString().contains('Saved')); + } + return await complete(process.exitCode, command); } } diff --git a/lib/oto/data/command_data.dart b/lib/oto/data/command_data.dart index b257df8..995e901 100644 --- a/lib/oto/data/command_data.dart +++ b/lib/oto/data/command_data.dart @@ -658,6 +658,7 @@ class DataGitStashPush extends DataParam { late bool? includeUntracked = true; late String? message; + late String? setSuccess; factory DataGitStashPush.fromJson(Map json) => _$DataGitStashPushFromJson(json); diff --git a/lib/oto/data/command_data.g.dart b/lib/oto/data/command_data.g.dart index 10198d1..dd59c1e 100644 --- a/lib/oto/data/command_data.g.dart +++ b/lib/oto/data/command_data.g.dart @@ -1132,7 +1132,8 @@ DataGitStashPush _$DataGitStashPushFromJson(Map json) => ..setExitCode = json['setExitCode'] as String? ..showPrint = json['showPrint'] as bool? ..includeUntracked = json['includeUntracked'] as bool? - ..message = json['message'] as String?; + ..message = json['message'] as String? + ..setSuccess = json['setSuccess'] as String?; Map _$DataGitStashPushToJson(DataGitStashPush instance) => { @@ -1143,6 +1144,7 @@ Map _$DataGitStashPushToJson(DataGitStashPush instance) => 'showPrint': instance.showPrint, 'includeUntracked': instance.includeUntracked, 'message': instance.message, + 'setSuccess': instance.setSuccess, }; DataGitStashApply _$DataGitStashApplyFromJson(Map json) =>