Skip to content

Commit

Permalink
Merge pull request #862 from yast/improve_view_anymsg
Browse files Browse the repository at this point in the history 
Improve view anymsg
  • Loading branch information
@jreidinger
jreidinger committed Oct 26, 2018
2 parents 30f40d3 + 7c06ac6 commit 3503988
Show file tree
Hide file tree
Showing 7 changed files with 510 additions and 261 deletions.
8 changes: 7 additions & 1 deletion library/system/src/Makefile.am
View file
Expand Up @@ -36,7 +36,13 @@ ylib_DATA = \
lib/yast2/target_file.rb \
lib/yast2/system_time.rb

ylibclientsdir = @ylibdir@/yast2/clients
ylibclients_DATA = \
lib/yast2/clients/view_anymsg.rb

EXTRA_DIST = $(module_DATA) $(client_DATA) $(ynclude_DATA) $(scrconf_DATA) $(desktop_DATA) $(ylib_DATA)



EXTRA_DIST = $(module_DATA) $(client_DATA) $(ynclude_DATA) $(scrconf_DATA) $(desktop_DATA) $(ylib_DATA) $(ylibclients_DATA)

include $(top_srcdir)/Makefile.am.common
260 changes: 1 addition & 259 deletions library/system/src/clients/view_anymsg.rb
View file
Expand Up @@ -21,265 +21,7 @@
# you may find current contact information at www.novell.com
#
# ***************************************************************************
# view_anymsg.ycp
#
# small script for easy /var/log/* and /proc/* viewing
#
# Author: Klaus Kaempf <kkaempf@suse.de>
#
# $Id$

require "yast/core_ext"

# Reads a \n separated list of filenames from
# /var/lib/YaST2/filenames
# Lines starting with "#" are ignored (comments)
# A line starting with "*" is taken as the default filename, the "*" is stripped
#
# All files are listed in an editable combo box, where the user can
# easily switch between files and even add a new file
#
# At finish, the list of filenames is written back to
# /var/lib/YaST2/filenames
# adapting the default line (starting with "*") accordingly.
#
# The default is either given as WFM::Args(0) or is the file last viewed.
module Yast
class ViewAnymsgClient < Client
using Yast::CoreExt::AnsiString

# [String] Default list of log files
DEFAULT_FILENAMES = [
"/var/log/boot.log",
"/var/log/messages",
"/var/log/YaST2/y2log"
].freeze

def main
Yast.import "UI"
textdomain "base"

Yast.import "CommandLine"
Yast.import "Directory"
Yast.import "FileUtils"
Yast.import "Label"

@vardir = Directory.vardir

# Check if the filename list is present
if !FileUtils.Exists(Ops.add(@vardir, "/filenames"))
SCR.Execute(
path(".target.bash"),
Ops.add(
Ops.add(
Ops.add(Ops.add("/bin/cp ", Directory.ydatadir), "/filenames "),
@vardir
),
"/filenames"
)
)
end

# get filename list
@filenames = Convert.to_string(
SCR.Read(path(".target.string"), Ops.add(@vardir, "/filenames"))
)

@filenames ||= ""

# convert \n separated string to ycp list.

@all_files = Builtins.splitstring(@filenames, "\n")
@all_files |= DEFAULT_FILENAMES

@set_default = false
@combo_files = []

# check if default given as argument

@filename = ""
if Ops.greater_than(Builtins.size(WFM.Args), 0) &&
Ops.is_string?(WFM.Args(0))
@filename = Convert.to_string(WFM.Args(0))
if @filename != ""
@combo_files = [Item(Id(@filename), @filename, true)]
@set_default = true
end
end

# the command line description map
@cmdline = { "id" => "view_anymsg" }
return CommandLine.Run(@cmdline) if @filename == "help"

# build up ComboBox

Builtins.foreach(@all_files) do |name|
# empty lines or lines starting with "#" are ignored
if name != "" && Builtins.substring(name, 0, 1) != "#"
# the default is either given via WFM::Args() -> filename != ""
# or by a filename starting with "*"
if Builtins.substring(name, 0, 1) == "*"
name = Builtins.substring(name, 1) # strip leading "*"
if name != @filename # do not add it twice
@combo_files = Builtins.add(
@combo_files,
Item(Id(name), name, !@set_default)
)
end
if !@set_default
@filename = name if @filename == ""
@set_default = true
end
elsif name != @filename # do not add it twice
@combo_files = Builtins.add(@combo_files, Item(Id(name), name))
end
end
end

if !@set_default && @filename != ""
@all_files = Builtins.add(@all_files, Ops.add("*", @filename))
@combo_files = Builtins.add(
@combo_files,
Item(Id(@filename), @filename)
)
end

# set up dialogue

UI.OpenDialog(
Opt(:decorated, :defaultsize),
VBox(
HSpacing(70), # force width
HBox(
HSpacing(1.0),
ComboBox(
Id(:custom_file),
Opt(:editable, :notify, :hstretch),
"",
@combo_files
),
HStretch()
),
VSpacing(0.3),
VWeight(
1,
HBox(
VSpacing(18), # force height
HSpacing(0.7),
LogView(
Id(:log),
"",
3, # height
0
), # number of lines to show
HSpacing(0.7)
)
),
VSpacing(0.3),
PushButton(Id(:ok), Label.OKButton),
VSpacing(0.3)
)
)

@go_on = true

# wait until user clicks "OK"
# check if ComboBox selected and change view accordingly

while @go_on

# read file content
file_content = SCR.Read(path(".target.string"), @filename)

if file_content
# replace invalid byte sequences with Unicode "replacement character"
file_content.scrub!("�")
# remove ANSI color escape sequences
file_content.remove_ansi_sequences
# remove remaining ASCII control characters (ASCII 0-31 and 127 (DEL))
# except new line (LF = 0xa) and carriage return (CR = 0xd)
file_content.tr!("\u0000-\u0009\u000b\u000c\u000e-\u001f\u007f", "")
else
file_content = _("File not found.")
end

# Fill the LogView with file content
UI.ChangeWidget(Id(:log), :Value, file_content)

heading = Builtins.sformat(_("System Log (%1)"), @filename)
UI.ChangeWidget(Id(:log), :Label, heading)

# wait for user input

@ret = Convert.to_symbol(UI.UserInput)

# clicked "OK" -> exit

if @ret == :ok
@go_on = false
elsif @ret == :cancel # close window
UI.CloseDialog
return true
elsif @ret == :custom_file
# adapt to combo box settings

@new_file = Convert.to_string(
UI.QueryWidget(Id(:custom_file), :Value)
)
@filename = @new_file if !@new_file.nil?
else
Builtins.y2milestone("bad UserInput (%1)", @ret)
end
end

# write new list of filenames

@new_files = []
@set_default = false

# re-build list to get new default correct
Builtins.foreach(@all_files) do |file|
if Builtins.substring(file, 0, 1) == "*"
old_default = Builtins.substring(file, 1) # strip leading "*"
if old_default == @filename # default unchanged
@new_files = Builtins.add(@new_files, file)
@set_default = true # new default
else
@new_files = Builtins.add(@new_files, old_default)
end
elsif file != ""
if file == @filename # mark new default
@new_files = Builtins.add(@new_files, Ops.add("*", @filename))
@set_default = true
else
@new_files = Builtins.add(@new_files, file)
end
end
end
# if we don't have a default by now, it wasn't in the list before
# so add it here.

if !@set_default && @filename != ""
@new_files = Builtins.add(@new_files, Ops.add("*", @filename))
end

@new_files = Builtins.toset(@new_files)

# convert ycp list back to \n separated string

@filenames = Ops.add(Builtins.mergestring(@new_files, "\n"), "\n")

SCR.Write(
path(".target.string"),
Ops.add(@vardir, "/filenames"),
@filenames
)

UI.CloseDialog

true
end
end
end
require "yast2/clients/view_anymsg"

Yast::ViewAnymsgClient.new.main

0 comments on commit 3503988

Please sign in to comment.