summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRalph Amissah <ralph@amissah.com>2013-03-15 02:37:46 +0000
committerRalph Amissah <ralph@amissah.com>2013-03-15 02:37:46 +0000
commite5d62092dce8927fa042c892372f7b5542508650 (patch)
treec277d59413112ea7adf4d1e05aa4d940a613ac22
parentv4: version & changelog (diff)
downloadsisu-e5d62092dce8927fa042c892372f7b5542508650.zip
sisu-e5d62092dce8927fa042c892372f7b5542508650.tar.xz
v4: harvest, authors, topics, terminal info
-rw-r--r--data/doc/sisu/CHANGELOG_v42
-rw-r--r--lib/sisu/v4/harvest_authors.rb4
-rw-r--r--lib/sisu/v4/harvest_topics.rb4
3 files changed, 6 insertions, 4 deletions
diff --git a/data/doc/sisu/CHANGELOG_v4 b/data/doc/sisu/CHANGELOG_v4
index a1e4cbf..63339a5 100644
--- a/data/doc/sisu/CHANGELOG_v4
+++ b/data/doc/sisu/CHANGELOG_v4
@@ -28,6 +28,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_4.0.14.orig.tar.xz
sisu_4.0.14.orig.tar.xz
sisu_4.0.14-1.dsc
+* v4: harvest, authors, topics, terminal info
+
%% 4.0.13.orig.tar.xz (2013-03-13:10/3)
http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_4.0.13
http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/sisu_4.0.13-1
diff --git a/lib/sisu/v4/harvest_authors.rb b/lib/sisu/v4/harvest_authors.rb
index 4a11b2e..80aee26 100644
--- a/lib/sisu/v4/harvest_authors.rb
+++ b/lib/sisu/v4/harvest_authors.rb
@@ -69,7 +69,6 @@ module SiSU_HarvestAuthors
@file_list=opt.files
end
def songsheet
- puts 'authors:'
idx_array={}
@opt.f_pths.each do |y|
lang_hash_file_array={}
@@ -198,7 +197,8 @@ module SiSU_HarvestAuthors
file="#{harvest_pth}/authors.#{lng}.html"
end
FileUtils::mkdir_p(harvest_pth) unless FileTest.directory?(harvest_pth)
- puts "file://#{file}"
+ fileinfo=(@opt.cmd =~/[vVM]/) ? ("file://#{file}") : ''
+ SiSU_Screen::Ansi.new(@opt.cmd,"harvest authors (#{@opt.files.length} files)",fileinfo).dark_grey_title_hi unless @opt.cmd =~/q/
@output[lng][:html]=File.new(file,'w')
end
end
diff --git a/lib/sisu/v4/harvest_topics.rb b/lib/sisu/v4/harvest_topics.rb
index 0397847..fda71e7 100644
--- a/lib/sisu/v4/harvest_topics.rb
+++ b/lib/sisu/v4/harvest_topics.rb
@@ -71,7 +71,6 @@ module SiSU_HarvestTopics
@file_list=opt.files
end
def songsheet
- puts 'topics:'
idx_array={}
@opt.f_pths.each do |y|
lang_hash_file_array={}
@@ -473,7 +472,8 @@ module SiSU_HarvestTopics
file="#{harvest_pth}/topics.#{lng}.html"
end
FileUtils::mkdir_p(harvest_pth) unless FileTest.directory?(harvest_pth)
- puts "file://#{file}"
+ fileinfo=(@opt.cmd =~/[vVM]/) ? ("file://#{file}") : ''
+ SiSU_Screen::Ansi.new(@opt.cmd,"harvest topics(#{@opt.files.length} files)",fileinfo).dark_grey_title_hi unless @opt.cmd =~/q/
@output[lng][:html]=File.new(file,'w')
if @opt.cmd.inspect =~/[M]/
@output[lng][:html_mnt]=File.new("#{@env.path.pwd}/topics.html",'w')