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

B #2565: Fix some issues with CLI pagination

Browse Source
This commit is contained in:
Ruben S. Montero 2019-01-26 03:14:07 +01:00
parent 16e717ce90
commit 429ff8901d
2 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/cli/cli_helper.rb
View File

@ -303,7 +303,7 @@ module CLIHelper
begin
if options[:csv]
puts CSV.generate_line(@default_columns)
puts CSV.generate_line(@default_columns) if !options[:noheader]
res_data.each {|l| puts CSV.generate_line(l) }
else
res_data.each{|l|

22
src/cli/one_helper.rb
View File

@ -516,11 +516,13 @@ EOT
# List pool functions
#-----------------------------------------------------------------------
def start_pager
pager = ENV['ONE_PAGER'] || 'less'
pager = ENV['ONE_PAGER'] || 'more'
# Start pager, defaults to less
p_r, p_w = IO.pipe
Signal.trap('PIPE', 'SIG_IGN')
lpid = fork do
$stdin.reopen(p_r)
@ -531,7 +533,7 @@ EOT
exec([pager, pager])
end
# Send listing to pager pipe
$stdout.close
$stdout = p_w.dup
@ -547,6 +549,9 @@ EOT
begin
Process.wait(lpid)
rescue Interrupt
Process.kill("TERM", lpid)
Process.wait(lpid)
rescue Errno::ECHILD
end
end
@ -558,12 +563,11 @@ EOT
elements = 0
page = ""
pool.each {|e|
elements += 1
pool.each {|e|
elements += 1
page << e.to_xml(true) << "\n"
}
else
pname = pool.pool_name
ename = pool.element_name
@ -585,8 +589,8 @@ EOT
# output
#-----------------------------------------------------------------------
def list_pool_table(table, pool, options, filter_flag)
if $stdout.isatty and (!options.key?:no_pager)
size = $stdout.winsize[0] - 1
if $stdout.isatty and (!options.key?:no_pager)
size = $stdout.winsize[0] - 1
# ----------- First page, check if pager is needed -------------
rc = pool.get_page(size, 0)
@ -662,8 +666,8 @@ EOT
# List pool in XML format, pagination is used in interactive output
#-----------------------------------------------------------------------
def list_pool_xml(pool, options, filter_flag)
if $stdout.isatty
size = $stdout.winsize[0] - 1
if $stdout.isatty
size = $stdout.winsize[0] - 1
# ----------- First page, check if pager is needed -------------
rc = pool.get_page(size, 0)