diff --git a/lib/oto/commands/command.dart b/lib/oto/commands/command.dart index cbee057..fb2771d 100644 --- a/lib/oto/commands/command.dart +++ b/lib/oto/commands/command.dart @@ -375,8 +375,7 @@ abstract class Command { { return await execute(command); } - on Exception catch (e) - { + on Exception { return await exeHandle!.pipelineFail!.execute(); } } diff --git a/lib/oto/commands/file/delete.dart b/lib/oto/commands/file/delete.dart index f66c9b5..f129af6 100644 --- a/lib/oto/commands/file/delete.dart +++ b/lib/oto/commands/file/delete.dart @@ -52,7 +52,7 @@ class Delete extends Command { } print('======================================================'); } - } on Exception catch (e) { + } on Exception { rethrow; } return complete(0, command); diff --git a/lib/oto/commands/process/process.dart b/lib/oto/commands/process/process.dart index c27189b..513493d 100644 --- a/lib/oto/commands/process/process.dart +++ b/lib/oto/commands/process/process.dart @@ -13,7 +13,7 @@ class ProcessPortUse extends Command { var process = await findUsePortPid(int.parse(data.port)); var pid = process?.pid.toString(); setProperty(data.setPid, pid); - } on Exception catch (e) { + } on Exception { rethrow; } return complete(0, command); diff --git a/lib/oto/commands/uploader/ftp.dart b/lib/oto/commands/uploader/ftp.dart index 761d4df..d3cb7c0 100644 --- a/lib/oto/commands/uploader/ftp.dart +++ b/lib/oto/commands/uploader/ftp.dart @@ -2,7 +2,6 @@ import 'dart:async'; import 'dart:io'; import 'package:ftpconnect/ftpconnect.dart'; // ignore: implementation_imports -import 'package:ftpconnect/src/ftp_entry.dart'; import 'package:dart_framework/utils/path.dart'; import 'package:oto_cli/oto/commands/command.dart'; diff --git a/lib/oto/commands/util/print.dart b/lib/oto/commands/util/print.dart index 6c61f33..03f2253 100644 --- a/lib/oto/commands/util/print.dart +++ b/lib/oto/commands/util/print.dart @@ -1,5 +1,4 @@ -import 'package:oto_cli/cli/cli.dart'; import 'package:oto_cli/oto/commands/command.dart'; import 'package:oto_cli/oto/data/command_data.dart'; diff --git a/lib/oto/commands/util/string_util.dart b/lib/oto/commands/util/string_util.dart index 69e2e13..a11a520 100644 --- a/lib/oto/commands/util/string_util.dart +++ b/lib/oto/commands/util/string_util.dart @@ -15,8 +15,7 @@ class StringSub extends Command { text = text.substring(startIndex, lastIndex); await setProperty(data.setValue, text); } - on Exception catch(e) - { + on Exception { rethrow; } @@ -36,8 +35,7 @@ class StringReplace extends Command { text = text.replaceAll(data.from, data.to); await setProperty(data.setValue, text); } - on Exception catch(e) - { + on Exception { rethrow; } diff --git a/lib/oto/commands/web/web.dart b/lib/oto/commands/web/web.dart index bf40942..311956f 100644 --- a/lib/oto/commands/web/web.dart +++ b/lib/oto/commands/web/web.dart @@ -4,6 +4,7 @@ import 'package:oto_cli/oto/commands/command.dart'; import 'package:oto_cli/oto/data/command_data.dart'; import 'dart:io'; import 'package:http/http.dart' as http; +// ignore: depend_on_referenced_packages import 'package:http_parser/src/media_type.dart'; class WebBase extends Command { @@ -23,6 +24,10 @@ class WebBase extends Command { if ((response.statusCode < 300 && response.statusCode >= 200) || data.successCodes!.contains(response.statusCode)) { exitCode = 0; + if(data.setResponse != null) { + var responseBody = await response.stream.bytesToString(); + await setProperty(data.setResponse!, responseBody); + } } else { exitCode = response.statusCode; } diff --git a/lib/oto/data/command_data.dart b/lib/oto/data/command_data.dart index 24ed508..acc7b37 100644 --- a/lib/oto/data/command_data.dart +++ b/lib/oto/data/command_data.dart @@ -64,6 +64,7 @@ class DataSimpleCommand extends DataParam { factory DataSimpleCommand.fromJson(Map json) => _$DataSimpleCommandFromJson(json); + @override Map toJson() => _$DataSimpleCommandToJson(this); } @@ -76,6 +77,7 @@ class DataPrint extends DataParam { factory DataPrint.fromJson(Map json) => _$DataPrintFromJson(json); + @override Map toJson() => _$DataPrintToJson(this); } @@ -95,6 +97,7 @@ class DataSetValue extends DataParam { factory DataSetValue.fromJson(Map json) => _$DataSetValueFromJson(json); + @override Map toJson() => _$DataSetValueToJson(this); } @@ -113,6 +116,7 @@ class DataAppDataCreator extends DataParam { factory DataAppDataCreator.fromJson(Map json) => _$DataAppDataCreatorFromJson(json); + @override Map toJson() => _$DataAppDataCreatorToJson(this); } @@ -127,6 +131,7 @@ class DataBuildMSBuild extends DataParam { factory DataBuildMSBuild.fromJson(Map json) => _$DataBuildMSBuildFromJson(json); + @override Map toJson() => _$DataBuildMSBuildToJson(this); } @@ -139,6 +144,7 @@ class DataBuildDart extends DataParam { factory DataBuildDart.fromJson(Map json) => _$DataBuildDartFromJson(json); + @override Map toJson() => _$DataBuildDartToJson(this); } @@ -180,6 +186,7 @@ class DataBuildDotNet extends DataParam { factory DataBuildDotNet.fromJson(Map json) => _$DataBuildDotNetFromJson(json); + @override Map toJson() => _$DataBuildDotNetToJson(this); } @@ -200,6 +207,7 @@ class DataBuildiOS extends DataParam { factory DataBuildiOS.fromJson(Map json) => _$DataBuildiOSFromJson(json); + @override Map toJson() => _$DataBuildiOSToJson(this); } @@ -214,6 +222,7 @@ class DataCodeSign extends DataParam { factory DataCodeSign.fromJson(Map json) => _$DataCodeSignFromJson(json); + @override Map toJson() => _$DataCodeSignToJson(this); } @@ -226,6 +235,7 @@ class DataCodeSignVerify extends DataParam { factory DataCodeSignVerify.fromJson(Map json) => _$DataCodeSignVerifyFromJson(json); + @override Map toJson() => _$DataCodeSignVerifyToJson(this); } @@ -243,6 +253,7 @@ class DataProductBuild extends DataParam { factory DataProductBuild.fromJson(Map json) => _$DataProductBuildFromJson(json); + @override Map toJson() => _$DataProductBuildToJson(this); } @@ -260,6 +271,7 @@ class DataNotarize extends DataParam { factory DataNotarize.fromJson(Map json) => _$DataNotarizeFromJson(json); + @override Map toJson() => _$DataNotarizeToJson(this); } @@ -275,6 +287,7 @@ class DataArchiveiOS extends DataParam { factory DataArchiveiOS.fromJson(Map json) => _$DataArchiveiOSFromJson(json); + @override Map toJson() => _$DataArchiveiOSToJson(this); } @@ -289,6 +302,7 @@ class DataExportiOS extends DataParam { factory DataExportiOS.fromJson(Map json) => _$DataExportiOSFromJson(json); + @override Map toJson() => _$DataExportiOSToJson(this); } @@ -308,6 +322,7 @@ class DataPublishiOS extends DataParam { factory DataPublishiOS.fromJson(Map json) => _$DataPublishiOSFromJson(json); + @override Map toJson() => _$DataPublishiOSToJson(this); } @@ -325,6 +340,7 @@ class DataUploader extends DataParam { factory DataUploader.fromJson(Map json) => _$DataUploaderFromJson(json); + @override Map toJson() => _$DataUploaderToJson(this); } @@ -344,6 +360,7 @@ class DataCopy extends DataFile { factory DataCopy.fromJson(Map json) => _$DataCopyFromJson(json); + @override Map toJson() => _$DataCopyToJson(this); } @@ -356,6 +373,7 @@ class DataDelete extends DataFile { factory DataDelete.fromJson(Map json) => _$DataDeleteFromJson(json); + @override Map toJson() => _$DataDeleteToJson(this); } @@ -368,6 +386,7 @@ class DataRename extends DataFile { factory DataRename.fromJson(Map json) => _$DataRenameFromJson(json); + @override Map toJson() => _$DataRenameToJson(this); } @@ -381,6 +400,7 @@ class DataFileDiffCheck extends DataParam { factory DataFileDiffCheck.fromJson(Map json) => _$DataFileDiffCheckFromJson(json); + @override Map toJson() => _$DataFileDiffCheckToJson(this); } @@ -394,6 +414,7 @@ class DataFileRead extends DataParam { factory DataFileRead.fromJson(Map json) => _$DataFileReadFromJson(json); + @override Map toJson() => _$DataFileReadToJson(this); } @@ -407,6 +428,7 @@ class DataFileWrite extends DataParam { factory DataFileWrite.fromJson(Map json) => _$DataFileWriteFromJson(json); + @override Map toJson() => _$DataFileWriteToJson(this); } @@ -419,6 +441,7 @@ class DataDirectoryCreate extends DataParam { factory DataDirectoryCreate.fromJson(Map json) => _$DataDirectoryCreateFromJson(json); + @override Map toJson() => _$DataDirectoryCreateToJson(this); } @@ -433,6 +456,7 @@ class DataSlackSender extends DataParam { factory DataSlackSender.fromJson(Map json) => _$DataSlackSenderFromJson(json); + @override Map toJson() => _$DataSlackSenderToJson(this); } @@ -469,6 +493,7 @@ class DataJira extends DataParam { factory DataJira.fromJson(Map json) => _$DataJiraFromJson(json); + @override Map toJson() => _$DataJiraToJson(this); } @@ -482,6 +507,7 @@ class DataJiraUser extends DataParam { factory DataJiraUser.fromJson(Map json) => _$DataJiraUserFromJson(json); + @override Map toJson() => _$DataJiraUserToJson(this); } @@ -495,6 +521,7 @@ class DataZip extends DataParam { factory DataZip.fromJson(Map json) => _$DataZipFromJson(json); + @override Map toJson() => _$DataZipToJson(this); } @@ -507,6 +534,7 @@ class DataShell extends DataParam { factory DataShell.fromJson(Map json) => _$DataShellFromJson(json); + @override Map toJson() => _$DataShellToJson(this); } @@ -518,6 +546,7 @@ class DataShellFile extends DataParam { factory DataShellFile.fromJson(Map json) => _$DataShellFileFromJson(json); + @override Map toJson() => _$DataShellFileToJson(this); } @@ -530,6 +559,7 @@ class DataGit extends DataParam { factory DataGit.fromJson(Map json) => _$DataGitFromJson(json); + @override Map toJson() => _$DataGitToJson(this); } @@ -542,6 +572,7 @@ class DataGitPush extends DataParam { factory DataGitPush.fromJson(Map json) => _$DataGitPushFromJson(json); + @override Map toJson() => _$DataGitPushToJson(this); } @@ -555,6 +586,7 @@ class DataGitCheckout extends DataParam { factory DataGitCheckout.fromJson(Map json) => _$DataGitCheckoutFromJson(json); + @override Map toJson() => _$DataGitCheckoutToJson(this); } @@ -567,6 +599,7 @@ class DataGitCount extends DataParam { factory DataGitCount.fromJson(Map json) => _$DataGitCountFromJson(json); + @override Map toJson() => _$DataGitCountToJson(this); } @@ -582,6 +615,7 @@ class DataGitRev extends DataParam { factory DataGitRev.fromJson(Map json) => _$DataGitRevFromJson(json); + @override Map toJson() => _$DataGitRevToJson(this); } @@ -594,6 +628,7 @@ class DataGitHub extends DataParam { factory DataGitHub.fromJson(Map json) => _$DataGitHubFromJson(json); + @override Map toJson() => _$DataGitHubToJson(this); } @@ -611,6 +646,7 @@ class DataGitHubPullRequestCreate extends DataParam { factory DataGitHubPullRequestCreate.fromJson(Map json) => _$DataGitHubPullRequestCreateFromJson(json); + @override Map toJson() => _$DataGitHubPullRequestCreateToJson(this); } @@ -627,6 +663,7 @@ class DataGitHubPullRequestList extends DataParam { factory DataGitHubPullRequestList.fromJson(Map json) => _$DataGitHubPullRequestListFromJson(json); + @override Map toJson() => _$DataGitHubPullRequestListToJson(this); } @@ -640,6 +677,7 @@ class DataGitHubPullRequestClose extends DataParam { factory DataGitHubPullRequestClose.fromJson(Map json) => _$DataGitHubPullRequestCloseFromJson(json); + @override Map toJson() => _$DataGitHubPullRequestCloseToJson(this); } @@ -652,6 +690,7 @@ class DataProtobuf extends DataParam { factory DataProtobuf.fromJson(Map json) => _$DataProtobufFromJson(json); + @override Map toJson() => _$DataProtobufToJson(this); } @@ -665,6 +704,7 @@ class DataJsonReader extends DataParam { factory DataJsonReader.fromJson(Map json) => _$DataJsonReaderFromJson(json); + @override Map toJson() => _$DataJsonReaderToJson(this); } @@ -678,6 +718,7 @@ class DataJsonReaderFile extends DataParam { factory DataJsonReaderFile.fromJson(Map json) => _$DataJsonReaderFileFromJson(json); + @override Map toJson() => _$DataJsonReaderFileToJson(this); } @@ -716,6 +757,7 @@ class DataAwsCli extends DataParam { factory DataAwsCli.fromJson(Map json) => _$DataAwsCliFromJson(json); + @override Map toJson() => _$DataAwsCliToJson(this); } @@ -729,6 +771,7 @@ class DataDocker extends DataParam { factory DataDocker.fromJson(Map json) => _$DataDockerFromJson(json); + @override Map toJson() => _$DataDockerToJson(this); } @@ -741,6 +784,7 @@ class DataGradle extends DataParam { factory DataGradle.fromJson(Map json) => _$DataGradleFromJson(json); + @override Map toJson() => _$DataGradleToJson(this); } @@ -756,6 +800,7 @@ class DataStringSub extends DataParam { factory DataStringSub.fromJson(Map json) => _$DataStringSubFromJson(json); + @override Map toJson() => _$DataStringSubToJson(this); } @@ -771,6 +816,7 @@ class DataStringReplace extends DataParam { factory DataStringReplace.fromJson(Map json) => _$DataStringReplaceFromJson(json); + @override Map toJson() => _$DataStringReplaceToJson(this); } @@ -784,9 +830,11 @@ class DataWebBase extends DataParam { late Map? headers = {}; late Map? fields = {}; late List? successCodes; + late String? setResponse; factory DataWebBase.fromJson(Map json) => _$DataWebBaseFromJson(json); + @override Map toJson() => _$DataWebBaseToJson(this); } @@ -801,6 +849,7 @@ class DataWebFile extends DataWebBase { factory DataWebFile.fromJson(Map json) => _$DataWebFileFromJson(json); + @override Map toJson() => _$DataWebFileToJson(this); } @@ -814,6 +863,7 @@ class DataProcessPortUse extends DataParam { factory DataProcessPortUse.fromJson(Map json) => _$DataProcessPortUseFromJson(json); + @override Map toJson() => _$DataProcessPortUseToJson(this); } @@ -827,6 +877,7 @@ class DataProcessRun extends DataParam { factory DataProcessRun.fromJson(Map json) => _$DataProcessRunFromJson(json); + @override Map toJson() => _$DataProcessRunToJson(this); } @@ -839,5 +890,6 @@ class DataProcessKill extends DataParam { factory DataProcessKill.fromJson(Map json) => _$DataProcessKillFromJson(json); + @override Map toJson() => _$DataProcessKillToJson(this); } diff --git a/lib/oto/data/command_data.g.dart b/lib/oto/data/command_data.g.dart index 3585a8a..8be6f47 100644 --- a/lib/oto/data/command_data.g.dart +++ b/lib/oto/data/command_data.g.dart @@ -1300,7 +1300,8 @@ DataWebBase _$DataWebBaseFromJson(Map json) => DataWebBase() ..fields = (json['fields'] as Map?)?.map( (k, e) => MapEntry(k, e as String), ) - ..successCodes = json['successCodes'] as List?; + ..successCodes = json['successCodes'] as List? + ..setResponse = json['setResponse'] as String?; Map _$DataWebBaseToJson(DataWebBase instance) => { @@ -1313,6 +1314,7 @@ Map _$DataWebBaseToJson(DataWebBase instance) => 'headers': instance.headers, 'fields': instance.fields, 'successCodes': instance.successCodes, + 'setResponse': instance.setResponse, }; DataWebFile _$DataWebFileFromJson(Map json) => DataWebFile() @@ -1331,6 +1333,7 @@ DataWebFile _$DataWebFileFromJson(Map json) => DataWebFile() (k, e) => MapEntry(k, e as String), ) ..successCodes = json['successCodes'] as List? + ..setResponse = json['setResponse'] as String? ..filePart = json['filePart'] as String? ..fileMimeType = json['fileMimeType'] as String? ..files = (json['files'] as List?)?.map((e) => e as String).toList(); @@ -1346,6 +1349,7 @@ Map _$DataWebFileToJson(DataWebFile instance) => 'headers': instance.headers, 'fields': instance.fields, 'successCodes': instance.successCodes, + 'setResponse': instance.setResponse, 'filePart': instance.filePart, 'fileMimeType': instance.fileMimeType, 'files': instance.files, diff --git a/lib/oto/pipeline/pipeline_condition.dart b/lib/oto/pipeline/pipeline_condition.dart index 4375f05..e97d38b 100644 --- a/lib/oto/pipeline/pipeline_condition.dart +++ b/lib/oto/pipeline/pipeline_condition.dart @@ -1,8 +1,6 @@ // ignore_for_file: unnecessary_cast, unnecessary_null_comparison import 'package:dart_framework/core/app_data_manager.dart'; -import 'package:dart_framework/utils/system_util.dart'; -import 'package:oto_cli/cli/cli.dart'; import 'package:oto_cli/oto/commands/command.dart'; import 'package:oto_cli/oto/data/pipeline_data.dart'; import 'package:oto_cli/oto/pipeline/pipeline.dart';