From aa008eeea99c1fbe66ee044616001bef3c040681 Mon Sep 17 00:00:00 2001 From: masakih Date: Mon, 12 Oct 2015 10:08:27 +0900 Subject: [PATCH] =?utf8?q?=E3=83=AD=E3=82=AF=E3=82=99=E7=94=A8Command?= =?utf8?q?=E3=82=92=E4=BD=BF=E7=94=A8=E3=81=99=E3=82=8B=E3=82=88=E3=81=86?= =?utf8?q?=E3=81=AB=E3=81=97=E3=81=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- KCD/HMJSONCommand.m | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/KCD/HMJSONCommand.m b/KCD/HMJSONCommand.m index 60faf71a..71f6782c 100644 --- a/KCD/HMJSONCommand.m +++ b/KCD/HMJSONCommand.m @@ -8,6 +8,10 @@ #import "HMJSONCommand.h" +#import "HMIgnoreCommand.h" +#import "HMUnknownComand.h" +#import "HMFailedCommand.h" + #import "HMAppDelegate.h" #import "HMServerDataStore.h" @@ -46,6 +50,13 @@ static NSMutableArray *registeredCommands = nil; { HMJSONCommand *command = nil; + if(!apiResult.json) { + command = [HMFailedCommand new]; + command.api = apiResult.api; + command.arguments = apiResult.parameter; + command.json = apiResult.json; + return command; + } #if ENABLE_JSON_LOG HMJSONViewCommand *viewCommand = [HMJSONViewCommand new]; viewCommand.api = apiResult.api; @@ -74,6 +85,31 @@ static NSMutableArray *registeredCommands = nil; return command; } } +#if ENABLE_JSON_LOG + if(command == viewCommand) command = nil; +#endif + if(!command) { + if([HMIgnoreCommand canExcuteAPI:apiResult.api]) { + command = [HMIgnoreCommand new]; + command.api = apiResult.api; + command.arguments = apiResult.parameter; + command.json = apiResult.json; + +#if ENABLE_JSON_LOG_HANDLED_API + command = [HMCompositCommand compositCommandWithCommands:command, viewCommand, nil]; +#endif + } + } + if(!command) { + command = [HMUnknownComand new]; + command.api = apiResult.api; + command.arguments = apiResult.parameter; + command.json = apiResult.json; + +#if ENABLE_JSON_LOG_HANDLED_API + command = [HMCompositCommand compositCommandWithCommands:command, viewCommand, nil]; +#endif + } return command; } -- 2.11.0