From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from localhost (localhost [127.0.0.1]) by turing.freelists.org (Avenir Technologies Mail Multiplex) with ESMTP id 789192887F for ; Fri, 30 Aug 2019 17:48:50 -0400 (EDT) Received: from turing.freelists.org ([127.0.0.1]) by localhost (turing.freelists.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id a_uaR9qDmPGH for ; Fri, 30 Aug 2019 17:48:50 -0400 (EDT) Received: from mail-lj1-f195.google.com (mail-lj1-f195.google.com [209.85.208.195]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by turing.freelists.org (Avenir Technologies Mail Multiplex) with ESMTPS id 1C9FD2887B for ; Fri, 30 Aug 2019 17:48:50 -0400 (EDT) Received: by mail-lj1-f195.google.com with SMTP id e27so7735073ljb.7 for ; Fri, 30 Aug 2019 14:48:50 -0700 (PDT) From: Cyrill Gorcunov Subject: [tarantool-patches] [PATCH 3/5] box/console: Refactor command handling Date: Sat, 31 Aug 2019 00:48:06 +0300 Message-Id: <20190830214808.17422-4-gorcunov@gmail.com> In-Reply-To: <20190830214808.17422-1-gorcunov@gmail.com> References: <20190830214808.17422-1-gorcunov@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: tarantool-patches-bounce@freelists.org Errors-to: tarantool-patches-bounce@freelists.org Reply-To: tarantool-patches@freelists.org List-Help: List-Unsubscribe: List-software: Ecartis version 1.0.0 List-Id: tarantool-patches List-Subscribe: List-Owner: List-post: List-Archive: To: tml Cc: Alexander Turenko , Konstantin Osipov , Kirill Yukhin , Cyrill Gorcunov We will need to parse and verify "\set" commands in remote console text-wire protocol thus to not duplicate the code lets factor helper out for reuse sake. Part-of #3834 --- src/box/lua/console.lua | 37 +++++++++++++++++++++++++++++++------ 1 file changed, 31 insertions(+), 6 deletions(-) diff --git a/src/box/lua/console.lua b/src/box/lua/console.lua index 5ca5cad1f..006748d93 100644 --- a/src/box/lua/console.lua +++ b/src/box/lua/console.lua @@ -150,11 +150,16 @@ local function output_save(fmt, opts) } end -local function format(status, ...) +local function current_output() local d = box.session.storage.console_output_format if d == nil then - d = default_output_format + return default_output_format end + return d +end + +local function format(status, ...) + local d = current_output() return output_handlers[d["fmt"]](status, d["opts"], ...) end @@ -245,21 +250,40 @@ local operators = { q = quit } -local function preprocess(storage, line) +local function parse_operators(line) local items = {} for item in string.gmatch(line, '([^%s]+)') do items[#items + 1] = item end if #items == 0 then - return help_wrapper() + return 0, nil end if operators[items[1]] == nil then + return #items, nil + end + return #items, items +end + +local function preprocess(storage, line) + local nr_items, items = parse_operators(line) + if nr_items == 0 then + return help_wrapper() + end + if items == nil then local msg = "Invalid command \\%s. Type \\help for help." return format(false, msg:format(items[1])) end return operators[items[1]](storage, unpack(items)) end +local function get_command(line) + -- All commands start with the escape symbol + if line:sub(1, 1) == '\\' then + return line:sub(2) + end + return nil +end + -- -- Evaluate command on local instance -- @@ -267,8 +291,9 @@ local function local_eval(storage, line) if not line then return nil end - if line:sub(1, 1) == '\\' then - return preprocess(storage, line:sub(2)) + local command = get_command(line) + if command then + return preprocess(storage, command) end if storage.language == 'sql' then return format(pcall(box.execute, line)) -- 2.20.1