From fbbae1ca038094e60e8f3659b405be9b3cbc30e5 Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Fri, 30 Apr 2010 19:55:31 -0400 Subject: manifest, expand on description of book indexes in manifest --- lib/sisu/v2/manifest.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/sisu/v2/manifest.rb') diff --git a/lib/sisu/v2/manifest.rb b/lib/sisu/v2/manifest.rb index 85881263..9f0f2513 100644 --- a/lib/sisu/v2/manifest.rb +++ b/lib/sisu/v2/manifest.rb @@ -196,7 +196,7 @@ module SiSU_Manifest summarize(id,file,img) end if FileTest.file?("#{@base_path}/#{@md.fn[:book_index]}")==true - id,file='HTML, index',@md.fn[:book_index] + id,file='HTML, (book type) index',@md.fn[:book_index] summarize(id,file) end if FileTest.file?("#{@base_path}/#{@md.fn[:concordance]}")==true -- cgit v1.2.3 From d9763aebaf71cf9629fdcf3c0e8818a1edb2b528 Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Sat, 1 May 2010 01:44:04 -0400 Subject: reduce screen output unless some verbose flag (such as -v) is used --- lib/sisu/v2/manifest.rb | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'lib/sisu/v2/manifest.rb') diff --git a/lib/sisu/v2/manifest.rb b/lib/sisu/v2/manifest.rb index 9f0f2513..829ce03b 100644 --- a/lib/sisu/v2/manifest.rb +++ b/lib/sisu/v2/manifest.rb @@ -84,8 +84,11 @@ module SiSU_Manifest browser=@env.program.console_web_browser webserv_url=@env.path.url.output_tell url_html="#{webserv_url}/#{@md.fnb}/#{@md.fn[:manifest]}" - tell=SiSU_Screen::Ansi.new(@opt.cmd,'Manifest',"#{xbrowser} #{url_html}") - tell.green_hi_blue unless @opt.cmd =~/q/ + unless @opt.cmd =~/q/ + @opt.cmd=~/[MVvz]/ \ + ? SiSU_Screen::Ansi.new(@opt.cmd,'Manifest',"#{xbrowser} #{url_html}").green_hi_blue \ + : SiSU_Screen::Ansi.new(@opt.cmd,'Manifest',@opt.fns).green_title_hi + end tell=SiSU_Screen::Ansi.new(@opt.cmd,"#{browser} #{url_html}") tell.grey_tab if @opt.cmd =~/v/i data=SiSU_HTML::Source::Html_environment.new(@particulars).tuned_file_instructions -- cgit v1.2.3 From 67e49a2b278b1512fb39a33a779f68a1389f9849 Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Mon, 3 May 2010 19:09:54 -0400 Subject: ansi, screen info related, arranging --- lib/sisu/v2/manifest.rb | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to 'lib/sisu/v2/manifest.rb') diff --git a/lib/sisu/v2/manifest.rb b/lib/sisu/v2/manifest.rb index 829ce03b..c8dd3753 100644 --- a/lib/sisu/v2/manifest.rb +++ b/lib/sisu/v2/manifest.rb @@ -83,14 +83,13 @@ module SiSU_Manifest xbrowser=@env.program.web_browser browser=@env.program.console_web_browser webserv_url=@env.path.url.output_tell - url_html="#{webserv_url}/#{@md.fnb}/#{@md.fn[:manifest]}" unless @opt.cmd =~/q/ + url_html="#{webserv_url}/#{@md.fnb}/#{@md.fn[:manifest]}" @opt.cmd=~/[MVvz]/ \ ? SiSU_Screen::Ansi.new(@opt.cmd,'Manifest',"#{xbrowser} #{url_html}").green_hi_blue \ : SiSU_Screen::Ansi.new(@opt.cmd,'Manifest',@opt.fns).green_title_hi + SiSU_Screen::Ansi.new(@opt.cmd,"#{browser} #{url_html}").grey_tab if @opt.cmd =~/v/i end - tell=SiSU_Screen::Ansi.new(@opt.cmd,"#{browser} #{url_html}") - tell.grey_tab if @opt.cmd =~/v/i data=SiSU_HTML::Source::Html_environment.new(@particulars).tuned_file_instructions Output_Info.new(@md).check_output(data) rescue; SiSU_Errors::Info_error.new($!,$@,@opt.cmd,@opt.fns).error @@ -137,8 +136,7 @@ module SiSU_Manifest dgst =if @dg =~/^sha(?:2|256)$/; sys.sha256("#{@base_path_src}/#{file}") else sys.md5("#{@base_path_src}/#{file}") end - tell=SiSU_Screen::Ansi.new(@md.cmd,"#{dgst[1]} #{file}") - tell.warn if @md.cmd =~/[vVM]/ + SiSU_Screen::Ansi.new(@md.cmd,"#{dgst[1]} #{file}").warn if @md.cmd =~/[vVM]/ size=(File.size("#{@base_path_src}/#{file}")/1024.00).to_s kb=/([0-9]+\.[0-9]{0,1})/m.match(size)[1] @manifest[:txt] << "#{file} #{id} #{kb}\n" @@ -150,8 +148,7 @@ module SiSU_Manifest dgst =if @dg =~/^sha(?:2|256)$/; sys.sha256("#{@base_path_pod}/#{file}") else sys.md5("#{@base_path_pod}/#{file}") end - tell=SiSU_Screen::Ansi.new(@md.cmd,"#{dgst[1]} #{file}") - tell.warn if @md.cmd =~/[vVM]/ + SiSU_Screen::Ansi.new(@md.cmd,"#{dgst[1]} #{file}").warn if @md.cmd =~/[vVM]/ size=(File.size("#{@base_path_pod}/#{file}")/1024.00).to_s kb=/([0-9]+\.[0-9]{0,1})/m.match(size)[1] @manifest[:txt] << "#{file} #{id} #{kb}\n" -- cgit v1.2.3