shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2025-03-25 02:50:08 +03:00
Code Releases Wiki Activity

F #2506: improve CLI filtering matching (#4376)

Browse Source 
New operator has been added for filtering in the CLI.

The new operator '~' will match sub keys, not exact, e.g:

If NAME is 'testing' with --filter NAME=tes wont't match but NAME~tes yes
This commit is contained in:
Alejandro Huertas Herrero 2020-03-23 12:17:31 +01:00 committed by GitHub
parent bd4cd69353
commit 9c75165de2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/cli/cli_helper.rb
View File

@ -19,6 +19,9 @@ require 'csv'
# CLI Helper
module CLIHelper
# Available operators for filtering operations
FILTER_OPS = %w[= != < <= > >= ~]
# CLI general options
LIST = {
:name => 'list',
@ -55,7 +58,10 @@ module CLIHelper
:large => '--filter x,y,z',
:format => Array,
:description => "Filter data. An array is specified with\n" <<
' ' * 31 << 'column=value pairs.'
' ' * 31 << 'column=value pairs.' <<
' ' * 31 << "Valid operators #{FILTER_OPS.join(',')}" <<
' ' * 31 << 'e.g. NAME=test (match name with test)' <<
' ' * 31 << 'NAME~test (match test, te, tes..)'
}
OPERATOR = {
@ -802,7 +808,7 @@ module CLIHelper
# @param data [Array] Array with data to filter
# @param options [Hash] Object with CLI user options
def filter_data!(data, options)
operators = /(=|!=|<|<=|>|>=)/
operators = /(#{FILTER_OPS.join('|')})/
filter = options[:filter]
if options.key?(:operator)
@ -825,7 +831,7 @@ module CLIHelper
:index => index
}
else
CLIHelper.fail("Column '#{left}' not found")
CLIHelper.fail("Column '#{m[1]}' not found")
end
else
CLIHelper.fail("Expression '#{s}' incorrect")
@ -836,7 +842,14 @@ module CLIHelper
pass = true
stems.each do |s|
s[:operator] == '=' ? op = '==' : op = s[:operator]
case s[:operator]
when '='
op = '=='
when '~'
op = 'include?'
else
op = s[:operator]
end
if d[s[:index]].public_send(op, s[:right])
if log_operator == 'OR'