From d9763aebaf71cf9629fdcf3c0e8818a1edb2b528 Mon Sep 17 00:00:00 2001
From: Ralph Amissah <ralph@amissah.com>
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/epub.rb | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

(limited to 'lib/sisu/v2/epub.rb')

diff --git a/lib/sisu/v2/epub.rb b/lib/sisu/v2/epub.rb
index e6ab1e12..ecc30424 100644
--- a/lib/sisu/v2/epub.rb
+++ b/lib/sisu/v2/epub.rb
@@ -86,9 +86,13 @@ module SiSU_EPUB
         loc=@env.path.url.output_tell
         tool=if @opt.cmd =~/z/;   "#{@env.program.epub_viewer} #{loc}/epub/#{@fnb}.epub"
         elsif @opt.cmd =~/[MVv]/; "#{@env.program.epub_viewer} #{loc}/epub/#{@fnb}.epub"
-        else                 ''
+        else                      @opt.fns
+        end
+        unless @opt.cmd =~/q/
+          @opt.cmd=~/[MVvz]/ \
+          ? SiSU_Screen::Ansi.new(@opt.cmd,'EPUB',tool).green_hi_blue \
+          : SiSU_Screen::Ansi.new(@opt.cmd,'EPUB',tool).green_title_hi
         end
-        SiSU_Screen::Ansi.new(@opt.cmd,'EPUB',tool).green_hi_blue unless @opt.cmd =~/q/
         SiSU_Screen::Ansi.new(@opt.cmd,@opt.fns,"#{loc}/epub/#{@fnb}.epub").flow if @opt.cmd =~/[MV]/
         @env.path.epub_bld #(@md)
         @env.path.epub_cp_images(@md)
@@ -195,7 +199,9 @@ module SiSU_EPUB
         @tell=SiSU_Screen::Ansi.new(@md.cmd) if @md
       end
       def songsheet #extracts toc for scroll & seg
-        SiSU_Screen::Ansi.new(@md.cmd,'Toc').txt_grey unless @md.cmd =~/q/
+        unless @md.cmd =~/q/
+          SiSU_Screen::Ansi.new(@md.cmd,'Toc').txt_grey if @md.cmd =~/[MVv]/
+        end
         toc=nil
         @@firstseg=nil
         @@toc={ :seg=>[],:seg_mini=>[],:scr=>[],:ncx=>[],:opf=>[] }
@@ -491,7 +497,9 @@ module SiSU_EPUB
       def in_common
         toc_shared=[]
         segtoc=[]
-        SiSU_Screen::Ansi.new(@md.cmd,'Scroll & Segtoc').txt_grey unless @md.cmd =~/q/
+        unless @md.cmd =~/q/
+          SiSU_Screen::Ansi.new(@md.cmd,'Scroll & Segtoc').txt_grey if @md.cmd =~/[MVv]/
+        end
         format_head_toc=SiSU_EPUB_Format::Head_toc.new(@md)
         dochead=format_head_toc.head
         dochead.gsub!(/toc\.(html)/,'doc.\1') #kludge
-- 
cgit v1.2.3